Changeset 54 in tspsg-svn for trunk/src/mainwindow.h

Timestamp:

Aug 9, 2009, 1:45:19 AM (15 years ago)

Author:

laleppa

Message:

• mainwindow.ui and mainwindow.ce.ui had differences only in printing actions and statusbar, so I merged them into one. Differences are now applied in source code. This will simplify Main Window maintenance.
• Changed #ifndef Q_OS_WINCE to #ifndef QT_NO_PRINTER where relevant.
• Now using method at() instead of operator [] in solving algorithm. This change dramatically decreased solution time (from 13 seconds to 10-40 milliseconds for 20 cities on my PC).
• Increased maximum number of cities to 30. Setting more makes no sense at this moment, because generated solution output is big and inserting it to QTextEdit takes veeeeery long time.
• Translations were updated.

File:

• trunk/src/mainwindow.h (modified) (3 diffs)

trunk/src/mainwindow.h

@@ -26 +26 @@
 
 #include "globals.h"
-#ifdef Q_OS_WINCE
-        #include "ui_mainwindow.ce.h"
-#else
-        #include "ui_mainwindow.h"
-#endif // Q_OS_WINCE
+#include "ui_mainwindow.h"
 #include "settingsdialog.h"
 #include "tspsolver.h"
@@ -54 +50 @@
         void actionHelpAboutTriggered();
         void dataChanged();
-#ifndef Q_OS_WINCE
+#ifndef QT_NO_PRINTER
         void printPreview(QPrinter *);
         void actionFilePrintPreviewTriggered();
         void actionFilePrintTriggered();
-#endif // Q_OS_WINCE
+#endif // QT_NO_PRINTER
         void buttonSolveClicked();
         void buttonRandomClicked();
@@ -67 +63 @@
 private:
         QSettings *settings;
-#ifndef Q_OS_WINCE
+#ifndef QT_NO_PRINTER
         QPrinter *printer;
-#endif // Q_OS_WINCE
+#endif // QT_NO_PRINTER
         CTSPModel *tspmodel;
         QString fileName;