Changeset 89e5214692 in tspsg for src/settingsdialog.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/settingsdialog.cpp (modified) (5 diffs)

src/settingsdialog.cpp

@@ -128 +128 @@
     bgWhite->layout()->setMargin(0);
 
-#ifdef Q_WS_S60
+#ifdef Q_OS_SYMBIAN
     // On Symbian buttons are moved to a native bar so Help button is
     // left alone. This causes it to be more to the middle instead of
@@ -217 +217 @@
 #endif // HANDHELD
 
-#ifdef Q_WS_WINCE_WM
+#ifdef Q_OS_WINCE_WM
     // We need to react to SIP show/hide and resize the window appropriately
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(desktopResized(int)));
-#endif // Q_WS_WINCE_WM
+#endif // Q_OS_WINCE_WM
     connect(spinRandMin, SIGNAL(valueChanged(int)), SLOT(spinRandMinValueChanged(int)));
     connect(buttonFont, SIGNAL(clicked()), SLOT(buttonFontClicked()));
@@ -325 +325 @@
 #else
     adjustSize();
-#endif // Q_WS_WINCE_WM
+#endif // Q_OS_WINCE_WM
 }
 
@@ -512 +512 @@
 }
 
-#ifdef Q_WS_WINCE_WM
+#ifdef Q_OS_WINCE_WM
 void SettingsDialog::desktopResized(int screen)
 {
@@ -544 +544 @@
     QWidget::showEvent(ev);
 }
-#endif // Q_WS_WINCE_WM
+#endif // Q_OS_WINCE_WM
 
 void SettingsDialog::spinRandMinValueChanged(int val) {