author | drw <drw> | 2005-03-01 18:59:12 (UTC) |
---|---|---|
committer | drw <drw> | 2005-03-01 18:59:12 (UTC) |
commit | 09c95ae28f4500ae0bb81f6ed305f877950626e8 (patch) (side-by-side diff) | |
tree | 4a53904008c8fc27845bbf6763a1419105b8d5fc /noncore/settings/netsystemtime/mainwindow.cpp | |
parent | 2f2b707684582cfa97c96c5fabab2197a7c7f307 (diff) | |
download | opie-09c95ae28f4500ae0bb81f6ed305f877950626e8.zip opie-09c95ae28f4500ae0bb81f6ed305f877950626e8.tar.gz opie-09c95ae28f4500ae0bb81f6ed305f877950626e8.tar.bz2 |
Fix SIGSEV I created with last update
Diffstat (limited to 'noncore/settings/netsystemtime/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp index 486257f..01d9a98 100644 --- a/noncore/settings/netsystemtime/mainwindow.cpp +++ b/noncore/settings/netsystemtime/mainwindow.cpp @@ -72,10 +72,10 @@ MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) ); mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) ); Config config( "ntp" ); config.setGroup( "settings" ); - slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", FALSE ) ); - slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", FALSE ) ); + slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", false ) ); + slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", false ) ); mainWidget->setCurrentTab( tr( "Time" ) ); layout->addWidget( mainWidget ); @@ -127,12 +127,12 @@ void MainWindow::accept() disableScreenSaver << 0 << 0 << 0; } // Update the systemtime - timeTab->saveSettings( TRUE ); + timeTab->saveSettings( true ); // Save format options - formatTab->saveSettings( TRUE ); + formatTab->saveSettings( true ); // Save settings options settingsTab->saveSettings(); @@ -150,12 +150,12 @@ void MainWindow::accept() void MainWindow::reject() { // Reset time settings - timeTab->saveSettings( FALSE ); + timeTab->saveSettings( false ); // Send notifications but do not save settings - formatTab->saveSettings( FALSE ); + formatTab->saveSettings( false ); // Exit app qApp->quit(); } @@ -184,12 +184,12 @@ void MainWindow::runNTP() ntpTab->setStartTime( QDateTime::currentDateTime().toString() ); QString output = tr( "Running:\nntpdate " ); output.append( srv ); ntpTab->addNtpOutput( output ); + ntpTab->setNTPBtnEnabled( false ); } // Disable set time buttons & change app caption to indicate time update is happening - ntpTab->setNTPBtnEnabled( false ); timeTab->setNTPBtnEnabled( false ); setCaption( tr( "Retrieving time from network..." ) ); if ( !ntpProcess ) @@ -209,12 +209,14 @@ void MainWindow::runNTP() if ( !ret ) { QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) ); if ( ntpTabEnabled ) + { ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) ); + ntpTab->setNTPBtnEnabled( true ); + } // Re-enable set time buttons & change app caption to indicate time update is happening - ntpTab->setNTPBtnEnabled( true ); timeTab->setNTPBtnEnabled( true ); setCaption( tr( "SystemTime" ) ); } } @@ -278,15 +280,15 @@ void MainWindow::slotDisplayPredictTab( bool display ) } void MainWindow::slotGetNTPTime() { - ntpInteractive = TRUE; + ntpInteractive = true; runNTP(); } void MainWindow::slotTimerGetNTPTime() { - ntpInteractive = FALSE; + ntpInteractive = false; runNTP(); } void MainWindow::slotProbeNTPServer() @@ -308,8 +310,9 @@ void MainWindow::slotNtpFinished( OProcess *p ) QString output; QDateTime dt = QDateTime::currentDateTime(); // Re-enable set time buttons & change app caption to indicate time update is happening + if ( ntpTabEnabled ) ntpTab->setNTPBtnEnabled( true ); timeTab->setNTPBtnEnabled( true ); setCaption( tr( "SystemTime" ) ); @@ -333,9 +336,9 @@ void MainWindow::slotNtpFinished( OProcess *p ) Config config( "ntp" ); config.setGroup( "lookups" ); int lastLookup = config.readNumEntry( "time", 0 ); int lookupCount = config.readNumEntry( "count", 0 ); - bool lastNtp = config.readBoolEntry( "lastNtp", FALSE ); + bool lastNtp = config.readBoolEntry( "lastNtp", false ); int time = TimeConversion::toUTC( QDateTime::currentDateTime() ); config.writeEntry( "time", time ); // Calculate new time/time shift @@ -370,9 +373,9 @@ void MainWindow::slotNtpFinished( OProcess *p ) config.writeEntry( "secsSinceLast", secsSinceLast ); config.writeEntry( "timeShift", QString::number( timeShift ) ); config.setGroup( "lookups" ); config.writeEntry( "count", lookupCount ); - config.writeEntry( "lastNtp", TRUE ); + config.writeEntry( "lastNtp", true ); } } void MainWindow::slotNTPDelayChanged( int delay ) |