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

diff --git a/src/app/app.pro b/src/app/app.pro
index 57cd46fc588e443378db573518f309cfdc7784e1..80baf93608a7c6f9775d75816f9eabf8eeb0186b 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -2,7 +2,7 @@ include(../global.pri)
 TEMPLATE = app
 TARGET = confclerk
 DESTDIR = ../bin
 TEMPLATE = app
 TARGET = confclerk
 DESTDIR = ../bin

-QT += sql xml network
+QT += sql xml network widgets

 CONFIG(maemo5) {
     QT += maemo5
 }
 CONFIG(maemo5) {
     QT += maemo5
 }

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 6b51733b84e1fd45f6c9119f00678b2d22258ec9..4094d742200f0e2e5e44ca99780ceab41db4b599 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -38,12 +38,12 @@ EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialo
 
     QString info;
     // title
 
     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();
 
     // 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(", "));
 
     // abstract
     info += QString("<p>%1</p>\n").arg(persons.join(", "));
 
     // abstract


@@ -63,7 +63,7 @@ EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialo
         QString name(i.key());
         if (url.isEmpty() || url == "http://") continue;
         if (name.isEmpty()) name = url;
         QString name(i.key());
         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");
     eventInfoTextBrowser->setHtml(info);
     }
     info += QString("</ul>\n");
     eventInfoTextBrowser->setHtml(info);

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index f9f7028999d64ac2293e3622e97c50f554c754df..efffb45b642af50deeb83278e72551603a4f3455 100644 (file)
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -5,7 +5,8 @@ DESTDIR = ../bin
 CONFIG += static
 QT += sql \
     xml \
 CONFIG += static
 QT += sql \
     xml \

-    network
+    network \
+    widgets

 QMAKE_CLEAN += ../bin/libgui.a
 
 # module dependencies
 QMAKE_CLEAN += ../bin/libgui.a
 
 # module dependencies


@@ -86,3 +87,6 @@ CONFIG(maemo5) {
     QT += maemo5
 }
 
     QT += maemo5
 }
 

+OTHER_FILES += \
+    test.qml
+

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 488dede57c18d993638d1793dc03eae65c78beed..338a7a3669b6bcf5af2872efcd57bb5ee2b1e1df 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -20,7 +20,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 

-#include <QtGui/QMainWindow>
+#include <QtWidgets>

 
 #include "ui_mainwindow.h"
 
 
 #include "ui_mainwindow.h"
 

diff --git a/src/gui/searchhead.h b/src/gui/searchhead.h
index 5afacbfe59ed44b67cce369489bb9faac0973642..155e3ea401631e8fb0f15fb21ba12a552bda132b 100644 (file)
--- a/src/gui/searchhead.h
+++ b/src/gui/searchhead.h
@@ -20,7 +20,7 @@
 #ifndef SEARCHHEAD_H
 #define SEARCHHEAD_H
 
 #ifndef SEARCHHEAD_H
 #define SEARCHHEAD_H
 

-#include <QtGui/QWidget>
+#include <QtWidgets>

 #include <QDebug>
 #include "ui_searchhead.h"
 
 #include <QDebug>
 #include "ui_searchhead.h"
 

diff --git a/src/mvc/conferencemodel.h b/src/mvc/conferencemodel.h
index fe0f242214416c7267cd5721012f584a34768a4d..37cff64acefeefb8fc466d06064a05377bd02ace 100644 (file)
--- a/src/mvc/conferencemodel.h
+++ b/src/mvc/conferencemodel.h
@@ -52,8 +52,9 @@ private:
     // reinitialize list from database
     void reinit()
     {
     // reinitialize list from database
     void reinit()
     {

+        beginResetModel();

         conferences = Conference::getAll();
         conferences = Conference::getAll();

-        reset();
+        endResetModel();

     }
 
     QList<Conference> conferences;
     }
 
     QList<Conference> conferences;

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 5551be3e2b4c1395ffcf5114d0b9ebb0772a3b84..843720a2ac65c59c6e0e57c50d55b211f3108c84 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -214,7 +214,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
                 option.rect.x()+SPACER,
                 option.rect.y()+option.rect.height()-fmBig.descent());
         painter->setFont(fontBig);
                 option.rect.x()+SPACER,
                 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>());

     }
 
     painter->restore();
     }
 
     painter->restore();

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index e4f254989ea5a88fcec019aaa3b91a2e4a4c4d69..e0f60c41f5cfbcf1db7e568875d195532f376bd0 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -20,7 +20,7 @@
 #ifndef DELEGATE_H
 #define DELEGATE_H
 
 #ifndef DELEGATE_H
 #define DELEGATE_H
 

-#include <QtGui>
+#include <QtWidgets>

 
 class Delegate : public QItemDelegate
 {
 
 class Delegate : public QItemDelegate
 {

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 139d3301e1642d3fdbce0991325fbe164dcd8c1e..6b8d47bedc47fd72facab48ac6144ef9260c284f 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -44,6 +44,8 @@ void EventModel::Group::setTitle(const QList<Event>& mEvents) {
 // multiple of one hour.
 void EventModel::createTimeGroups()
 {
 // multiple of one hour.
 void EventModel::createTimeGroups()
 {

+    beginResetModel();
+

     mGroups.clear();
     mParents.clear();
     if (mEvents.empty()) return;
     mGroups.clear();
     mParents.clear();
     if (mEvents.empty()) return;


@@ -90,7 +92,7 @@ void EventModel::createTimeGroups()
     // the last group needs a title as well
     mGroups.last().setTitle(mEvents);
 
     // the last group needs a title as well
     mGroups.last().setTitle(mEvents);
 

-    reset();
+    endResetModel();

 }
 
 void EventModel::createTrackGroups() {
 }
 
 void EventModel::createTrackGroups() {


@@ -174,7 +176,7 @@ QModelIndex EventModel::index(int row, int column, const QModelIndex& parent) co
 
     if (!parent.isValid())
     {
 
     if (!parent.isValid())
     {

-        return createIndex(row, column, 0);
+        return createIndex(row, column, (quintptr) 0);

     }
     else if (parent.internalId() == 0)
     {
     }
     else if (parent.internalId() == 0)
     {


@@ -199,7 +201,7 @@ QModelIndex EventModel::parent(const QModelIndex & index) const
 
         Event * event = static_cast<Event*>(index.internalPointer());
 
 
         Event * event = static_cast<Event*>(index.internalPointer());
 

-        return createIndex(mParents[event->id()], 0, 0);
+        return createIndex(mParents[event->id()], 0, (quintptr) 0);

     }
 
     return QModelIndex();
     }
 
     return QModelIndex();


@@ -228,11 +230,11 @@ int EventModel::rowCount (const QModelIndex & parent) const
 
 void EventModel::clearModel()
 {
 
 void EventModel::clearModel()
 {

+    beginResetModel();

     mGroups.clear();
     mEvents.clear();
     mParents.clear();
     mGroups.clear();
     mEvents.clear();
     mParents.clear();

-
-    reset();
+    endResetModel();

 }
 
 
 }
 
 

diff --git a/src/mvc/mvc.pro b/src/mvc/mvc.pro
index f0d92d751ca7568e791569edede0ad7ecf2aee9b..bf4c275846bc06fa6246486e780778610280ebd8 100644 (file)
--- a/src/mvc/mvc.pro
+++ b/src/mvc/mvc.pro
@@ -3,7 +3,8 @@ TEMPLATE = lib
 TARGET = mvc
 DESTDIR = ../bin
 CONFIG += static
 TARGET = mvc
 DESTDIR = ../bin
 CONFIG += static

-QT += sql 
+QT += sql \
+    widgets

 QMAKE_CLEAN += ../bin/libmvc.a
 
 # module dependencies
 QMAKE_CLEAN += ../bin/libmvc.a
 
 # module dependencies

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 0c16ab779408741b824f2899cea1fd6ef3b6eb8d..d5245bec003248ffeef2cde6590196b49a3f0f2d 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -23,9 +23,9 @@
 #include <QSqlRecord>
 #include <QVariant>
 #include <QDateTime>
 #include <QSqlRecord>
 #include <QVariant>
 #include <QDateTime>

+#include <QStandardPaths>

 
 #include <QDir>
 
 #include <QDir>

-#include <QDesktopServices>

 #include "sqlengine.h"
 #include "track.h"
 #include "conference.h"
 #include "sqlengine.h"
 #include "track.h"
 #include "conference.h"


@@ -36,7 +36,7 @@ const QString DATE_FORMAT ("yyyy-MM-dd");
 const QString TIME_FORMAT ("hh:mm");
 
 SqlEngine::SqlEngine(QObject *aParent): QObject(aParent) {
 const QString TIME_FORMAT ("hh:mm");
 
 SqlEngine::SqlEngine(QObject *aParent): QObject(aParent) {

-    QDir dbPath(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
+    QDir dbPath(QStandardPaths::writableLocation(QStandardPaths::DataLocation));

     dbFilename = dbPath.absoluteFilePath("ConfClerk.sqlite");
 }
 
     dbFilename = dbPath.absoluteFilePath("ConfClerk.sqlite");
 }