Changeset 4b6ae6b
- Timestamp:
- 09/24/13 23:14:58 (9 years ago)
- Branches:
- master, qt5
- Children:
- 54b69e2
- Parents:
- d942dc3
- Location:
- src
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
src/app/app.pro
rd942dc3 r4b6ae6b 3 3 TARGET = confclerk 4 4 DESTDIR = ../bin 5 QT += sql xml network 5 QT += sql xml network widgets 6 6 CONFIG(maemo5) { 7 7 QT += maemo5 -
src/gui/eventdialog.cpp
rd942dc3 r4b6ae6b 39 39 QString info; 40 40 // title 41 info.append(QString("<h1>%1</h1>\n").arg( Qt::escape(event.title())));41 info.append(QString("<h1>%1</h1>\n").arg(event.title().toHtmlEscaped())); 42 42 43 43 // persons 44 44 info += QString("<h2>%1</h2>\n").arg(tr("Persons")); 45 45 QStringList persons = event.persons(); 46 for (int i = 0; i != persons.size(); ++i) persons[i] = Qt::escape(persons[i]);46 for (int i = 0; i != persons.size(); ++i) persons[i] = persons[i].toHtmlEscaped(); 47 47 info += QString("<p>%1</p>\n").arg(persons.join(", ")); 48 48 … … 64 64 if (url.isEmpty() || url == "http://") continue; 65 65 if (name.isEmpty()) name = url; 66 info += QString("<li><a href=\"%1\">%2</a></li>\n").arg( Qt::escape(url), Qt::escape(name));66 info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(url.toHtmlEscaped(), name.toHtmlEscaped()); 67 67 } 68 68 info += QString("</ul>\n"); -
src/gui/gui.pro
rd942dc3 r4b6ae6b 6 6 QT += sql \ 7 7 xml \ 8 network 8 network \ 9 widgets 9 10 QMAKE_CLEAN += ../bin/libgui.a 10 11 … … 87 88 } 88 89 90 OTHER_FILES += \ 91 test.qml 92 -
src/gui/mainwindow.h
rd942dc3 r4b6ae6b 21 21 #define MAINWINDOW_H 22 22 23 #include <Qt Gui/QMainWindow>23 #include <QtWidgets> 24 24 25 25 #include "ui_mainwindow.h" -
src/gui/searchhead.h
rd942dc3 r4b6ae6b 21 21 #define SEARCHHEAD_H 22 22 23 #include <Qt Gui/QWidget>23 #include <QtWidgets> 24 24 #include <QDebug> 25 25 #include "ui_searchhead.h" -
src/mvc/conferencemodel.h
rd942dc3 r4b6ae6b 53 53 void reinit() 54 54 { 55 beginResetModel(); 55 56 conferences = Conference::getAll(); 56 reset();57 endResetModel(); 57 58 } 58 59 -
src/mvc/delegate.cpp
rd942dc3 r4b6ae6b 215 215 option.rect.y()+option.rect.height()-fmBig.descent()); 216 216 painter->setFont(fontBig); 217 painter->drawText(titlePointF, qVariantValue<QString>(index.data()));217 painter->drawText(titlePointF,index.data().value<QString>()); 218 218 } 219 219 -
src/mvc/delegate.h
rd942dc3 r4b6ae6b 21 21 #define DELEGATE_H 22 22 23 #include <Qt Gui>23 #include <QtWidgets> 24 24 25 25 class Delegate : public QItemDelegate -
src/mvc/eventmodel.cpp
rd942dc3 r4b6ae6b 45 45 void EventModel::createTimeGroups() 46 46 { 47 beginResetModel(); 48 47 49 mGroups.clear(); 48 50 mParents.clear(); … … 91 93 mGroups.last().setTitle(mEvents); 92 94 93 reset();95 endResetModel(); 94 96 } 95 97 … … 175 177 if (!parent.isValid()) 176 178 { 177 return createIndex(row, column, 0);179 return createIndex(row, column, (quintptr) 0); 178 180 } 179 181 else if (parent.internalId() == 0) … … 200 202 Event * event = static_cast<Event*>(index.internalPointer()); 201 203 202 return createIndex(mParents[event->id()], 0, 0);204 return createIndex(mParents[event->id()], 0, (quintptr) 0); 203 205 } 204 206 … … 229 231 void EventModel::clearModel() 230 232 { 233 beginResetModel(); 231 234 mGroups.clear(); 232 235 mEvents.clear(); 233 236 mParents.clear(); 234 235 reset(); 237 endResetModel(); 236 238 } 237 239 -
src/mvc/mvc.pro
rd942dc3 r4b6ae6b 4 4 DESTDIR = ../bin 5 5 CONFIG += static 6 QT += sql 6 QT += sql \ 7 widgets 7 8 QMAKE_CLEAN += ../bin/libmvc.a 8 9 -
src/sql/sqlengine.cpp
rd942dc3 r4b6ae6b 24 24 #include <QVariant> 25 25 #include <QDateTime> 26 #include <QStandardPaths> 26 27 27 28 #include <QDir> 28 #include <QDesktopServices>29 29 #include "sqlengine.h" 30 30 #include "track.h" … … 37 37 38 38 SqlEngine::SqlEngine(QObject *aParent): QObject(aParent) { 39 QDir dbPath(Q DesktopServices::storageLocation(QDesktopServices::DataLocation));39 QDir dbPath(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); 40 40 dbFilename = dbPath.absoluteFilePath("ConfClerk.sqlite"); 41 41 }
Note: See TracChangeset
for help on using the changeset viewer.