Changeset 89e5214692 in tspsg for src/qtwin.cpp

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/qtwin.cpp (modified) (7 diffs)

src/qtwin.cpp

@@ -19 +19 @@
 #endif // Q_WS_X11
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 
 #include <qt_windows.h>
@@ -99 +99 @@
 bool QtWin::isCompositionEnabled()
 {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
     if (resolveLibs()) {
         HRESULT hr = S_OK;
@@ -124 +124 @@
 {
     Q_ASSERT(widget);
-    Q_UNUSED(widget);
-    Q_UNUSED(enable);
     bool result = false;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
     if (resolveLibs()) {
         DWM_BLURBEHIND bb = {0};
@@ -137 +135 @@
         widget->setAttribute(Qt::WA_TranslucentBackground, enable);
         widget->setAttribute(Qt::WA_NoSystemBackground, enable);
-#ifdef Q_WS_WIN
-        hr = pDwmEnableBlurBehindWindow(widget->winId(), &bb);
+#ifdef Q_OS_WIN32
+        hr = pDwmEnableBlurBehindWindow(HWND(widget->winId()), &bb);
         if (SUCCEEDED(hr)) {
             result = true;
@@ -171 +169 @@
 
     bool result = false;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
     if (resolveLibs()) {
         QLibrary dwmLib(QString::fromAscii("dwmapi"));
         HRESULT hr = S_OK;
         MARGINS m = {left, top, right, bottom};
-        hr = pDwmExtendFrameIntoClientArea(widget->winId(), &m);
+        hr = pDwmExtendFrameIntoClientArea(HWND(widget->winId()), &m);
         if (SUCCEEDED(hr)) {
             result = true;
@@ -196 +194 @@
     QColor resultColor = QApplication::palette().window().color();
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
     if (resolveLibs()) {
         DWORD color = 0;
@@ -210 +208 @@
 }
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 WindowNotifier *QtWin::windowNotifier()
 {