Changeset 4b6ae6b

Timestamp:

09/24/13 23:14:58 (9 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

54b69e2

Parents:

d942dc3

Message:

Now the application compiles for QT5.

Note that the location of the database in Linux has changed from
~/.local/share/data/Toastfreeware/ConfClerk
to
~/.local/share/Toastfreeware/ConfClerk

Location:

src

Files:

• app/app.pro (modified) (1 diff)
• gui/eventdialog.cpp (modified) (2 diffs)
• gui/gui.pro (modified) (2 diffs)
• gui/mainwindow.h (modified) (1 diff)
• gui/searchhead.h (modified) (1 diff)
• mvc/conferencemodel.h (modified) (1 diff)
• mvc/delegate.cpp (modified) (1 diff)
• mvc/delegate.h (modified) (1 diff)
• mvc/eventmodel.cpp (modified) (5 diffs)
• mvc/mvc.pro (modified) (1 diff)
• sql/sqlengine.cpp (modified) (2 diffs)

src/app/app.pro

@@ -3 +3 @@
 TARGET = confclerk
 DESTDIR = ../bin
-QT += sql xml network
+QT += sql xml network widgets
 CONFIG(maemo5) {
     QT += maemo5

src/gui/eventdialog.cpp

@@ -39 +39 @@
     QString info;
     // title
-    info.append(QString("<h1>%1</h1>\n").arg(Qt::escape(event.title())));
+    info.append(QString("<h1>%1</h1>\n").arg(event.title().toHtmlEscaped()));
 
     // persons
     info += QString("<h2>%1</h2>\n").arg(tr("Persons"));
     QStringList persons = event.persons();
-    for (int i = 0; i != persons.size(); ++i) persons[i] = Qt::escape(persons[i]);
+    for (int i = 0; i != persons.size(); ++i) persons[i] = persons[i].toHtmlEscaped();
     info += QString("<p>%1</p>\n").arg(persons.join(", "));
 
@@ -64 +64 @@
         if (url.isEmpty() || url == "http://") continue;
         if (name.isEmpty()) name = url;
-        info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(Qt::escape(url), Qt::escape(name));
+        info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(url.toHtmlEscaped(), name.toHtmlEscaped());
     }
     info += QString("</ul>\n");

src/gui/gui.pro

@@ -6 +6 @@
 QT += sql \
     xml \
-    network
+    network \
+    widgets
 QMAKE_CLEAN += ../bin/libgui.a
 
@@ -87 +88 @@
 }
 
+OTHER_FILES += \
+    test.qml
+

src/gui/mainwindow.h

@@ -21 +21 @@
 #define MAINWINDOW_H
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets>
 
 #include "ui_mainwindow.h"

src/gui/searchhead.h

@@ -21 +21 @@
 #define SEARCHHEAD_H
 
-#include <QtGui/QWidget>
+#include <QtWidgets>
 #include <QDebug>
 #include "ui_searchhead.h"

src/mvc/conferencemodel.h

@@ -53 +53 @@
     void reinit()
     {
+        beginResetModel();
         conferences = Conference::getAll();
-        reset();
+        endResetModel();
     }
 

src/mvc/delegate.cpp

@@ -215 +215 @@
                 option.rect.y()+option.rect.height()-fmBig.descent());
         painter->setFont(fontBig);
-        painter->drawText(titlePointF,qVariantValue<QString>(index.data()));
+        painter->drawText(titlePointF,index.data().value<QString>());
     }
 

src/mvc/delegate.h

@@ -21 +21 @@
 #define DELEGATE_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 class Delegate : public QItemDelegate

src/mvc/eventmodel.cpp

@@ -45 +45 @@
 void EventModel::createTimeGroups()
 {
+    beginResetModel();
+
     mGroups.clear();
     mParents.clear();
@@ -91 +93 @@
     mGroups.last().setTitle(mEvents);
 
-    reset();
+    endResetModel();
 }
 
@@ -175 +177 @@
     if (!parent.isValid())
     {
-        return createIndex(row, column, 0);
+        return createIndex(row, column, (quintptr) 0);
     }
     else if (parent.internalId() == 0)
@@ -200 +202 @@
         Event * event = static_cast<Event*>(index.internalPointer());
 
-        return createIndex(mParents[event->id()], 0, 0);
+        return createIndex(mParents[event->id()], 0, (quintptr) 0);
     }
 
@@ -229 +231 @@
 void EventModel::clearModel()
 {
+    beginResetModel();
     mGroups.clear();
     mEvents.clear();
     mParents.clear();
-
-    reset();
+    endResetModel();
 }
 

src/mvc/mvc.pro

@@ -4 +4 @@
 DESTDIR = ../bin
 CONFIG += static
-QT += sql 
+QT += sql \
+    widgets
 QMAKE_CLEAN += ../bin/libmvc.a
 

src/sql/sqlengine.cpp

@@ -24 +24 @@
 #include <QVariant>
 #include <QDateTime>
+#include <QStandardPaths>
 
 #include <QDir>
-#include <QDesktopServices>
 #include "sqlengine.h"
 #include "track.h"
@@ -37 +37 @@
 
 SqlEngine::SqlEngine(QObject *aParent): QObject(aParent) {
-    QDir dbPath(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
+    QDir dbPath(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
     dbFilename = dbPath.absoluteFilePath("ConfClerk.sqlite");
 }