Changeset 140 in tspsg-svn for trunk/src

Timestamp:

Sep 29, 2010, 11:54:39 PM (14 years ago)

Author:

laleppa

Message:

Fixed some compilation errors on some platforms intorduced in the previous build...

Location:

trunk/src

Files:

• mainwindow.cpp (modified) (1 diff)
• settingsdialog.cpp (modified) (5 diffs)

trunk/src/mainwindow.cpp

@@ -1051 +1051 @@
                 QApplication::restoreOverrideCursor();
         }
+#else
+        Q_UNUSED(silent)
 #endif
         settings->setValue("Check4Updates/LastAttempt", QDate::currentDate().toString(Qt::ISODate));

trunk/src/settingsdialog.cpp

@@ -56 +56 @@
         lineHorizontal->setPalette(p);
 
+// Layout helpers
+QBoxLayout *box;
+QHBoxLayout *hbox;
 #ifndef QT_NO_PRINTER
         cbHQGraph = new QCheckBox(bgWhite);
@@ -65 +68 @@
         cbHQGraph->setCursor(QCursor(Qt::PointingHandCursor));
 
-QBoxLayout *box = static_cast<QBoxLayout *>(tabOutput->layout());
-QHBoxLayout *hbox1 = new QHBoxLayout();
-        hbox1->addSpacing(10);
-        hbox1->addWidget(cbHQGraph);
-        box->insertLayout(box->indexOf(cbShowGraph) + 1, hbox1);
+        box = static_cast<QBoxLayout *>(tabOutput->layout());
+        hbox = new QHBoxLayout();
+        hbox->addSpacing(10);
+        hbox->addWidget(cbHQGraph);
+        box->insertLayout(box->indexOf(cbShowGraph) + 1, hbox);
         connect(cbShowGraph, SIGNAL(toggled(bool)), cbHQGraph, SLOT(setEnabled(bool)));
 #endif
@@ -94 +97 @@
 
                 box = static_cast<QBoxLayout *>(tabGeneral->layout());
-                hbox1 = new QHBoxLayout();
-                hbox1->setSpacing(0);
-                hbox1->addWidget(cbCheck4Updates);
-                hbox1->addWidget(spinUpdateCheckInterval);
-                hbox1->addStretch();
-                box->insertLayout(box->indexOf(cbUseNativeDialogs) + 1, hbox1);
+                hbox = new QHBoxLayout();
+                hbox->setSpacing(0);
+                hbox->addWidget(cbCheck4Updates);
+                hbox->addWidget(spinUpdateCheckInterval);
+                hbox->addStretch();
+                box->insertLayout(box->indexOf(cbUseNativeDialogs) + 1, hbox);
         } else
                 cbCheck4Updates = NULL;
@@ -133 +136 @@
         setLayout(vbox1);
 #else // HANDHELD
-        // Layout helper elements
-QVBoxLayout *vbox;
-QHBoxLayout *hbox;
+QVBoxLayout *vbox; // Layout helper
 
 #ifdef Q_OS_WIN32
@@ -191 +192 @@
         hbox->addWidget(bgWhite);
 
-#ifdef QT_NO_PRINTER
-QBoxLayout *box;
-#endif
         box = static_cast<QBoxLayout *>(tabGeneral->layout());
         box->insertWidget(box->indexOf(cbUseNativeDialogs) + 1, cbSaveState);