Changeset 140 in tspsg-svn


Ignore:
Timestamp:
Sep 29, 2010, 11:54:39 PM (7 years ago)
Author:
laleppa
Message:

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

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/mainwindow.cpp

    r139 r140  
    10511051                QApplication::restoreOverrideCursor();
    10521052        }
     1053#else
     1054        Q_UNUSED(silent)
    10531055#endif
    10541056        settings->setValue("Check4Updates/LastAttempt", QDate::currentDate().toString(Qt::ISODate));
  • trunk/src/settingsdialog.cpp

    r139 r140  
    5656        lineHorizontal->setPalette(p);
    5757
     58// Layout helpers
     59QBoxLayout *box;
     60QHBoxLayout *hbox;
    5861#ifndef QT_NO_PRINTER
    5962        cbHQGraph = new QCheckBox(bgWhite);
     
    6568        cbHQGraph->setCursor(QCursor(Qt::PointingHandCursor));
    6669
    67 QBoxLayout *box = static_cast<QBoxLayout *>(tabOutput->layout());
    68 QHBoxLayout *hbox1 = new QHBoxLayout();
    69         hbox1->addSpacing(10);
    70         hbox1->addWidget(cbHQGraph);
    71         box->insertLayout(box->indexOf(cbShowGraph) + 1, hbox1);
     70        box = static_cast<QBoxLayout *>(tabOutput->layout());
     71        hbox = new QHBoxLayout();
     72        hbox->addSpacing(10);
     73        hbox->addWidget(cbHQGraph);
     74        box->insertLayout(box->indexOf(cbShowGraph) + 1, hbox);
    7275        connect(cbShowGraph, SIGNAL(toggled(bool)), cbHQGraph, SLOT(setEnabled(bool)));
    7376#endif
     
    9497
    9598                box = static_cast<QBoxLayout *>(tabGeneral->layout());
    96                 hbox1 = new QHBoxLayout();
    97                 hbox1->setSpacing(0);
    98                 hbox1->addWidget(cbCheck4Updates);
    99                 hbox1->addWidget(spinUpdateCheckInterval);
    100                 hbox1->addStretch();
    101                 box->insertLayout(box->indexOf(cbUseNativeDialogs) + 1, hbox1);
     99                hbox = new QHBoxLayout();
     100                hbox->setSpacing(0);
     101                hbox->addWidget(cbCheck4Updates);
     102                hbox->addWidget(spinUpdateCheckInterval);
     103                hbox->addStretch();
     104                box->insertLayout(box->indexOf(cbUseNativeDialogs) + 1, hbox);
    102105        } else
    103106                cbCheck4Updates = NULL;
     
    133136        setLayout(vbox1);
    134137#else // HANDHELD
    135         // Layout helper elements
    136 QVBoxLayout *vbox;
    137 QHBoxLayout *hbox;
     138QVBoxLayout *vbox; // Layout helper
    138139
    139140#ifdef Q_OS_WIN32
     
    191192        hbox->addWidget(bgWhite);
    192193
    193 #ifdef QT_NO_PRINTER
    194 QBoxLayout *box;
    195 #endif
    196194        box = static_cast<QBoxLayout *>(tabGeneral->layout());
    197195        box->insertWidget(box->indexOf(cbUseNativeDialogs) + 1, cbSaveState);
Note: See TracChangeset for help on using the changeset viewer.