Changeset b0dfe0844e in tspsg

Timestamp:

Sep 12, 2012, 7:56:15 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

2fcdd7bfdf

Parents:

0e473fbe88

Message:

Some Windows specific fixes to be compilable with Qt 5.

Location:

src

Files:

• mainwindow.cpp (modified) (12 diffs)
• qtwin.cpp (modified) (1 diff)

src/mainwindow.cpp

@@ -779 +779 @@
             tl = NULL;
         } else {
-            tl->SetProgressValue(winId(), 0, n * 2);
+            tl->SetProgressValue(HWND(winId()), 0, n * 2);
         }
     }
@@ -804 +804 @@
 #ifdef Q_OS_WIN32
             if (tl != NULL) {
-                tl->SetProgressState(winId(), TBPF_ERROR);
+                tl->SetProgressState(HWND(winId()), TBPF_ERROR);
             }
 #endif
@@ -816 +816 @@
 #ifdef Q_OS_WIN32
         if (tl != NULL)
-            tl->SetProgressState(winId(), TBPF_INDETERMINATE);
+            tl->SetProgressState(HWND(winId()), TBPF_INDETERMINATE);
 #endif
         QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -831 +831 @@
 #ifdef Q_OS_WIN32
         if (tl != NULL) {
-            tl->SetProgressState(winId(), TBPF_NOPROGRESS);
+            tl->SetProgressState(HWND(winId()), TBPF_NOPROGRESS);
             tl->Release();
             tl = NULL;
@@ -845 +845 @@
 #ifdef Q_OS_WIN32
     if (tl != NULL)
-        tl->SetProgressValue(winId(), spinCities->value(), spinCities->value() + solver.getTotalSteps() + 1);
+        tl->SetProgressValue(HWND(winId()), spinCities->value(), spinCities->value() + solver.getTotalSteps() + 1);
 #endif
 
@@ -915 +915 @@
 #ifdef Q_OS_WIN32
             if (tl != NULL)
-                tl->SetProgressState(winId(), TBPF_INDETERMINATE);
+                tl->SetProgressState(HWND(winId()), TBPF_INDETERMINATE);
 #endif
 #ifndef QT_NO_CONCURRENT
@@ -929 +929 @@
 #ifdef Q_OS_WIN32
             if (tl != NULL) {
-                tl->SetProgressState(winId(), TBPF_NOPROGRESS);
+                tl->SetProgressState(HWND(winId()), TBPF_NOPROGRESS);
                 tl->Release();
                 tl = NULL;
@@ -939 +939 @@
 #ifdef Q_OS_WIN32
         if (tl != NULL)
-            tl->SetProgressValue(winId(), spinCities->value() + n, spinCities->value() + solver.getTotalSteps() + 1);
+            tl->SetProgressValue(HWND(winId()), spinCities->value() + n, spinCities->value() + solver.getTotalSteps() + 1);
 #endif
 
@@ -986 +986 @@
 #ifdef Q_OS_WIN32
     if (tl != NULL)
-        tl->SetProgressValue(winId(), spinCities->value() + n, spinCities->value() + solver.getTotalSteps() + 1);
+        tl->SetProgressValue(HWND(winId()), spinCities->value() + n, spinCities->value() + solver.getTotalSteps() + 1);
 #endif
 
@@ -1049 +1049 @@
 #ifdef Q_OS_WIN32
     if (tl != NULL)
-        tl->SetProgressState(winId(), TBPF_INDETERMINATE);
+        tl->SetProgressState(HWND(winId()), TBPF_INDETERMINATE);
 #endif
 #ifndef QT_NO_CONCURRENT
@@ -1063 +1063 @@
 #ifdef Q_OS_WIN32
     if (tl != NULL) {
-        tl->SetProgressState(winId(), TBPF_NOPROGRESS);
+        tl->SetProgressState(HWND(winId()), TBPF_NOPROGRESS);
         tl->Release();
         tl = NULL;
@@ -1141 +1141 @@
 void MainWindow::solverRoutePartFound(int n)
 {
-    tl->SetProgressValue(winId(), n, spinCities->value() * 2);
+    tl->SetProgressValue(HWND(winId()), n, spinCities->value() * 2);
 }
 #endif // Q_OS_WIN32

src/qtwin.cpp

@@ -255 +255 @@
         }
     }
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     return QWidget::winEvent(message, result);
-}
-#endif
+#else
+    return QWidget::nativeEvent("windows_generic_MSG", message, result);
+#endif
+}
+#endif