diff options
| -rw-r--r-- | src/configuredialog.cpp | 2 | ||||
| -rw-r--r-- | src/configuredialog.h | 2 | ||||
| -rw-r--r-- | src/countdowndialog.cpp | 7 | ||||
| -rw-r--r-- | src/countdowndialog.h | 3 | ||||
| -rw-r--r-- | src/tdepowersave.cpp | 6 | ||||
| -rw-r--r-- | src/tdepowersave.h | 2 |
6 files changed, 7 insertions, 15 deletions
diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index e3567a5..a6763ec 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -988,7 +988,7 @@ void ConfigureDialog::buttonApply_clicked(){ } /*! - * SLOT: called if the 'Chancel' button is clicked. + * SLOT: called if the 'Cancel' button is clicked. */ void ConfigureDialog::buttonCancel_clicked(){ kdDebugFuncOut(trace); diff --git a/src/configuredialog.h b/src/configuredialog.h index 837866d..d9e3307 100644 --- a/src/configuredialog.h +++ b/src/configuredialog.h @@ -139,7 +139,7 @@ private slots: //! alled if the user click on 'Apply' Button void buttonApply_clicked(); - //! called if the user click on 'Chancel' Button + //! called if the user click on 'Cancel' Button void buttonCancel_clicked(); //! called if the user click on 'OK' Button void buttonOk_clicked(); diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp index 6393875..0037100 100644 --- a/src/countdowndialog.cpp +++ b/src/countdowndialog.cpp @@ -45,7 +45,6 @@ countDownDialog::countDownDialog( int timeout, TQWidget *parent, const char *nam :countdown_Dialog(parent, name, false, TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ) { kdDebugFuncIn(trace); - chancel = false; remaining = timeout; timeOut = timeout; @@ -61,7 +60,7 @@ countDownDialog::countDownDialog( int timeout, TQWidget *parent, const char *nam countDownDialog::~countDownDialog() { kdDebugFuncIn(trace); // no need to delete child widgets, TQt does it all for us - emit dialogClosed(chancel); + emit dialogClosed(remaining > 0); kdDebugFuncOut(trace); } @@ -140,7 +139,6 @@ void countDownDialog::pB_cancel_pressed() { if (PROGRESS->isActive()) PROGRESS->stop(); - chancel = true; close(); kdDebugFuncOut(trace); @@ -152,8 +150,6 @@ void countDownDialog::reject() { if (PROGRESS->isActive()) PROGRESS->stop(); - chancel = true; - countdown_Dialog::reject(); kdDebugFuncOut(trace); @@ -169,7 +165,6 @@ void countDownDialog::updateProgress() { if (PROGRESS->isActive()) PROGRESS->stop(); - chancel = false; close(); } else if ( remaining > 0) { int setTo = (int)((100.0/(float)timeOut)*(float)remaining); diff --git a/src/countdowndialog.h b/src/countdowndialog.h index ca1164c..c50b511 100644 --- a/src/countdowndialog.h +++ b/src/countdowndialog.h @@ -65,9 +65,6 @@ private: //! remaining time to show the dialog int remaining; - //! to store the info if the countdown was chanceled - bool chancel; - private slots: //! to update the progressbar diff --git a/src/tdepowersave.cpp b/src/tdepowersave.cpp index b9f6f1d..d214a3b 100644 --- a/src/tdepowersave.cpp +++ b/src/tdepowersave.cpp @@ -986,20 +986,20 @@ void tdepowersave::do_autosuspendWarn() { /*! * \b TQT_SLOT to send the related suspend command for autosuspend - * \param chancel boolean with info if the autosuspend should get canceled + * \param cancel boolean with info if the autosuspend should get canceled * \return boolean with the result of the operation * \retval true if successful * \retval false if command not supported or on any other error * \todo add check if the requested command is supported before send and * add message for this case to tell that maybe changed config! */ -bool tdepowersave::do_autosuspend(bool chancel) { +bool tdepowersave::do_autosuspend(bool cancel) { kdDebugFuncIn(trace); // TODO: check if this is really needed, it get called also on the suspend methodes autoSuspend->stop(); - if (!chancel) { + if (!cancel) { if(!settings->disableNotifications) { KNotifyClient::event( this->winId(), "autosuspend_event", i18n("System is going into suspend mode now")); diff --git a/src/tdepowersave.h b/src/tdepowersave.h index 90896f9..bb46fc0 100644 --- a/src/tdepowersave.h +++ b/src/tdepowersave.h @@ -326,7 +326,7 @@ private slots: //! show warning dialog or call autosuspend if signal \ref inactivity::inactivityTimeExpired() recieved void do_autosuspendWarn(); //! execute the autosuspend - bool do_autosuspend(bool chancel); + bool do_autosuspend(bool cancel); //! starts the Yast2-power-management module void do_config(); //! sets the new scheme with all settings |