Changeset 141 in tspsg-svn for trunk/src/settingsdialog.cpp

Timestamp:

Oct 3, 2010, 2:01:00 PM (14 years ago)

Author:

laleppa

Message:

+ Added support for Simulator from Nokia Qt SDK

• Made some Maemo related tweaks
• Removed ids for unsupported OSs from os.h (i.e., MSDOS, OS/2)

File:

• trunk/src/settingsdialog.cpp (modified) (13 diffs)

trunk/src/settingsdialog.cpp

@@ -109 +109 @@
 QVBoxLayout *vbox1; // Layout helper
 
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
         // On screens with small height when SIP is shown and the window is resized
         // there is not enought space for all elements.
@@ -120 +120 @@
 #else
         buttons->insertStretch(buttons->indexOf(buttonHelp) + 1);
-#endif // Q_OS_WINCE_WM
+#endif // Q_WS_WINCE_WM
 
         bgWhite->layout()->setMargin(0);
@@ -128 +128 @@
         vbox1->setMargin(0);
         vbox1->setSpacing(0);
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
         vbox1->addWidget(scrollArea);
 #else
         vbox1->addWidget(bgWhite);
-#endif // Q_OS_WINCE_WM
+#endif // Q_WS_WINCE_WM
         vbox1->addWidget(bgGrey);
         setLayout(vbox1);
@@ -138 +138 @@
 QVBoxLayout *vbox; // Layout helper
 
-#ifdef Q_OS_WIN32
+#ifdef Q_WS_WIN32
         if (QtWin::isCompositionEnabled()) {
                 cbUseTranslucency = new QCheckBox(bgWhite);
@@ -148 +148 @@
                 cbUseTranslucency->setCursor(QCursor(Qt::PointingHandCursor));
         }
-#endif // Q_OS_WIN32
+#endif // Q_WS_WIN32
 
         cbSaveState = new QCheckBox(bgWhite);
@@ -194 +194 @@
         box = static_cast<QBoxLayout *>(tabGeneral->layout());
         box->insertWidget(box->indexOf(cbUseNativeDialogs) + 1, cbSaveState);
-#ifdef Q_OS_WIN32
+#ifdef Q_WS_WIN32
         if (QtWin::isCompositionEnabled())
                 box->insertWidget(box->indexOf(cbUseNativeDialogs) + 1, cbUseTranslucency);
-#endif // Q_OS_WIN32
+#endif // Q_WS_WIN32
 
         // Inserting label for hints to the bottom part (with grey bg)
@@ -211 +211 @@
 #endif // HANDHELD
 
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_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_OS_WINCE_WM
+#endif // Q_WS_WINCE_WM
         connect(spinRandMin, SIGNAL(valueChanged(int)), SLOT(spinRandMinValueChanged(int)));
         connect(buttonFont, SIGNAL(clicked()), SLOT(buttonFontClicked()));
@@ -230 +230 @@
         cbSaveLastUsed->setChecked(settings->value("SaveLastUsed", DEF_SAVE_LAST_USED).toBool());
         cbUseNativeDialogs->setChecked(settings->value("UseNativeDialogs", DEF_USE_NATIVE_DIALOGS).toBool());
-#ifdef Q_OS_WIN32
+#ifdef Q_WS_WIN32
         if (QtWin::isCompositionEnabled())
                 cbUseTranslucency->setChecked(settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool());
-#endif // Q_OS_WIN32
+#endif // Q_WS_WIN32
 #ifndef HANDHELD
         cbSaveState->setChecked(settings->value("SavePos", DEF_SAVEPOS).toBool());
@@ -298 +298 @@
 #else
         adjustSize();
-#endif // Q_OS_WINCE_WM
+#endif // Q_WS_WINCE_WM
 }
 
@@ -349 +349 @@
         settings->setValue("SaveLastUsed", cbSaveLastUsed->isChecked());
         settings->setValue("UseNativeDialogs", cbUseNativeDialogs->isChecked());
-#ifdef Q_OS_WIN32
+#ifdef Q_WS_WIN32
         if (QtWin::isCompositionEnabled()) {
 bool old = settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool();
@@ -358 +358 @@
                 settings->setValue("UseTranslucency", cbUseTranslucency->isChecked());
         }
-#endif // Q_OS_WIN32
+#endif // Q_WS_WIN32
 #ifndef HANDHELD
         settings->setValue("SavePos", cbSaveState->isChecked());
@@ -421 +421 @@
 }
 
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
 void SettingsDialog::desktopResized(int screen)
 {
@@ -453 +453 @@
         QWidget::showEvent(ev);
 }
-#endif // Q_OS_WINCE_WM
+#endif // Q_WS_WINCE_WM
 
 void SettingsDialog::spinRandMinValueChanged(int val) {