Changeset 79a7671 in confclerk_git

Timestamp:

08/30/17 21:15:52 (5 years ago)

Author:

gregor herrmann <gregor@…>

Branches:

master, qt5

Children:

30edeb7

Parents:

809b5e5

Message:

ifdef qt4 and qt5

Files:

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

confclerk.pro

@@ -4 +4 @@
 ISQT4 = $$find(QMAKEVERSION, ^[2-9])
 isEmpty( ISQT4 ) {
-        error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4");
+        error("Use the qmake include with Qt4.7 or greater, on Debian that is qmake-qt4");
 }
 

src/app/app.pro

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

src/gui/eventdialog.cpp

@@ -28 +28 @@
 #endif
 
+QString toHtmlEscaped(const QString& string) {
+#if QT_VERSION >= 0x050000
+    return string.toHtmlEscaped();
+#else
+    return Qt::escape(string);
+#endif
+}
+
 EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialog(parent), mConferenceId(conferenceId), mEventId(eventId) {
     setupUi(this);
@@ -39 +47 @@
     QString info;
     // title
-    info.append(QString("<h1>%1</h1>\n").arg(event.title().toHtmlEscaped()));
+    info.append(QString("<h1>%1</h1>\n").arg(toHtmlEscaped(event.title())));
 
     // persons
     info += QString("<h2>%1</h2>\n").arg(tr("Persons"));
     QStringList persons = event.persons();
-    for (int i = 0; i != persons.size(); ++i) persons[i] = persons[i].toHtmlEscaped();
+    for (int i = 0; i != persons.size(); ++i) persons[i] = toHtmlEscaped(persons[i]);
     info += QString("<p>%1</p>\n").arg(persons.join(", "));
 
@@ -72 +80 @@
         if (url.isEmpty() || url == "http://") continue;
         if (name.isEmpty()) name = url;
-        info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(url.toHtmlEscaped(), name.toHtmlEscaped());
+        info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(toHtmlEscaped(url), toHtmlEscaped(name));
     }
     info += QString("</ul>\n");

src/gui/gui.pro

@@ -6 +6 @@
 QT += sql \
     xml \
-    network \
-    widgets
+    network
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 QMAKE_CLEAN += ../bin/libgui.a
 

src/gui/mainwindow.h

@@ -21 +21 @@
 #define MAINWINDOW_H
 
+#include "qglobal.h"
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
+#else
+#include <QtGui/QMainWindow>
+#endif
 #include <QSslError>
 

src/gui/searchhead.h

@@ -21 +21 @@
 #define SEARCHHEAD_H
 
+#include "qglobal.h"
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
+#else
+#include <QtGui/QWidget>
+#endif
 #include <QDebug>
 #include "ui_searchhead.h"

src/mvc/delegate.h

@@ -21 +21 @@
 #define DELEGATE_H
 
+#include "qglobal.h"
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
+#else
+#include <QtGui>
+#endif
 
 class Delegate : public QItemDelegate

src/mvc/eventmodel.cpp

@@ -177 +177 @@
     if (!parent.isValid())
     {
-        return createIndex(row, column, (quintptr) 0);
+        return createIndex(row, column);
     }
     else if (parent.internalId() == 0)
@@ -202 +202 @@
         Event * event = static_cast<Event*>(index.internalPointer());
 
-        return createIndex(mParents[event->id()], 0, (quintptr) 0);
+        return createIndex(mParents[event->id()], 0);
     }
 

src/mvc/mvc.pro

@@ -4 +4 @@
 DESTDIR = ../bin
 CONFIG += static
-QT += sql \
-    widgets
+QT += sql
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 QMAKE_CLEAN += ../bin/libmvc.a
 

src/sql/sqlengine.cpp

@@ -24 +24 @@
 #include <QVariant>
 #include <QDateTime>
+#include "qglobal.h"
+#if QT_VERSION >= 0x050000
 #include <QStandardPaths>
+#else
+#include <QDesktopServices>
+#endif
 
 #include <QDir>
@@ -37 +42 @@
 
 SqlEngine::SqlEngine(QObject *aParent): QObject(aParent) {
+#if QT_VERSION >= 0x050000
     QDir dbPath(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
+#else
+    QDir dbPath(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
+#endif
     dbFilename = dbPath.absoluteFilePath("ConfClerk.sqlite");
 }