Changeset 69 in tspsg-svn

Timestamp:

Nov 2, 2009, 9:44:17 AM (15 years ago)

Author:

laleppa

Message:

Made MainWindow::closeEvent() private.

Location:

trunk/src

Files:

• mainwindow.cpp (modified) (3 diffs)
• mainwindow.h (modified) (2 diffs)

trunk/src/mainwindow.cpp

@@ -83 +83 @@
         connect(spinCities,SIGNAL(valueChanged(int)),this,SLOT(spinCitiesValueChanged(int)));
         setCentralWidget(tabWidget);
+#ifndef Q_OS_WINCE
 QRect rect = geometry();
-#ifndef Q_OS_WINCE
         if (settings->value("SavePos",false).toBool()) {
                 // Loading of saved window state
@@ -113 +113 @@
         }
         setWindowModified(false);
-}
-
-/*!
- * \brief Handles Main Window close event.
- * \param event Close event.
- *
- *  Checks whether or not a current task was saved and asks for saving if not.
- *  Saves TSPSG settings.
- */
-void MainWindow::closeEvent(QCloseEvent *event)
-{
-        if (!maybeSave()) {
-                event->ignore();
-                return;
-        }
-        settings->setValue("NumCities",spinCities->value());
-#ifndef Q_OS_WINCE
-        // Saving windows state
-        if (settings->value("SavePos",false).toBool()) {
-                settings->beginGroup("MainWindow");
-                settings->setValue("Maximized",isMaximized());
-                if (!isMaximized()) {
-                        settings->setValue("Size",size());
-                        settings->setValue("Position",pos());
-                }
-                settings->endGroup();
-        }
-#endif // Q_OS_WINCE
-        QMainWindow::closeEvent(event);
 }
 
@@ -467 +438 @@
                         taskView->resizeRowToContents(k);
                 }
+}
+
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+        if (!maybeSave()) {
+                event->ignore();
+                return;
+        }
+        settings->setValue("NumCities",spinCities->value());
+#ifndef Q_OS_WINCE
+        // Saving windows state
+        if (settings->value("SavePos",false).toBool()) {
+                settings->beginGroup("MainWindow");
+                settings->setValue("Maximized",isMaximized());
+                if (!isMaximized()) {
+                        settings->setValue("Size",size());
+                        settings->setValue("Position",pos());
+                }
+                settings->endGroup();
+        }
+#endif // Q_OS_WINCE
+        QMainWindow::closeEvent(event);
 }
 

trunk/src/mainwindow.h

@@ -47 +47 @@
 public:
         MainWindow(QWidget *parent = 0);
-        void closeEvent(QCloseEvent *);
 
 private slots:
@@ -87 +86 @@
         CTSPModel *tspmodel;
 
+        void closeEvent(QCloseEvent *);
         void enableSolutionActions(bool enable = true);
         void initDocStyleSheet();