Changeset 89e5214692 in tspsg for src/mainwindow.h

Timestamp:

Sep 12, 2012, 6:50:04 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

197f54a2b9

Parents:

f48433245d

Message:

Replaced all Q_WS_xxx with Q_OS_xxx ifdefs where possible.

This is needed for compatibility with Qt 5.

File:

• src/mainwindow.h (modified) (6 diffs)

src/mainwindow.h

@@ -36 +36 @@
 #include "tspmodel.h"
 
-#ifdef Q_WS_WIN32
+#ifdef Q_OS_WIN32
     // Forward declaration. A real one is in shobjidl.h
     struct ITaskbarList3;
@@ -86 +86 @@
     void dataChanged();
     void dataChanged(const QModelIndex &tl, const QModelIndex &br);
-#ifdef Q_WS_WINCE_WM
+#ifdef Q_OS_WINCE_WM
     void changeEvent(QEvent *ev);
     void desktopResized(int screen);
-#endif // Q_WS_WINCE_WM
+#endif // Q_OS_WINCE_WM
     void numCitiesChanged(int nCities);
 #ifndef QT_NO_PRINTER
     void printPreview(QPrinter *printer);
 #endif // QT_NO_PRINTER
-#ifdef Q_WS_WIN32
+#ifdef Q_OS_WIN32
     void solverRoutePartFound(int n);
-#endif // Q_WS_WIN32
+#endif // Q_OS_WIN32
     void spinCitiesValueChanged(int nCities);
 
@@ -114 +114 @@
 #endif // QT_NO_PRINTER
     QAction *actionHelpCheck4Updates;
-#ifdef Q_WS_S60
+#ifdef Q_OS_SYMBIAN
     QAction *actionRightSoftKey;
 #endif
     QSettings *settings;
     CTSPModel *tspmodel;
-#ifdef Q_WS_WINCE_WM
+#ifdef Q_OS_WINCE_WM
     QRect currentGeometry;
-#endif // Q_WS_WINCE_WM
+#endif // Q_OS_WINCE_WM
 
-#ifdef Q_WS_WIN32
+#ifdef Q_OS_WIN32
     ITaskbarList3 *tl;
-#endif // Q_WS_WIN32
+#endif // Q_OS_WIN32
 
     // The solution graph SVG
@@ -154 +154 @@
     void outputMatrix(QTextCursor &cur, const TMatrix &matrix);
     void outputMatrix(QTextCursor &cur, const SStep &step);
-#ifdef Q_WS_S60
+#ifdef Q_OS_SYMBIAN
     void resizeEvent(QResizeEvent *ev);
-#endif // Q_WS_S60
+#endif // Q_OS_SYMBIAN
     void retranslateUi(bool all = true);
     bool saveTask();
@@ -165 +165 @@
 };
 
-#ifdef Q_WS_S60
+#ifdef Q_OS_SYMBIAN
 // A quickly hacked QMessageBox for Symbian that supports three buttons.
 class QSMessageBox: public QMessageBox {
@@ -175 +175 @@
     QSMessageBox(QWidget *parent = 0);
 };
-#endif // Q_WS_S60
+#endif // Q_OS_SYMBIAN
 
 #endif // MAINWINDOW_H