diff options
| -rw-r--r-- | src/autodimm.cpp | 4 | ||||
| -rw-r--r-- | src/blacklisteditdialog.cpp | 14 | ||||
| -rw-r--r-- | src/configuredialog.cpp | 76 | ||||
| -rw-r--r-- | src/countdowndialog.cpp | 6 | ||||
| -rw-r--r-- | src/dbusInterface.cpp | 20 | ||||
| -rw-r--r-- | src/detaileddialog.cpp | 42 | ||||
| -rw-r--r-- | src/hardware.cpp | 38 | ||||
| -rw-r--r-- | src/hardware.h | 4 | ||||
| -rw-r--r-- | src/hardware_battery.cpp | 2 | ||||
| -rw-r--r-- | src/inactivity.cpp | 24 | ||||
| -rw-r--r-- | src/infodialog.cpp | 2 | ||||
| -rw-r--r-- | src/logviewer.cpp | 4 | ||||
| -rw-r--r-- | src/screen.cpp | 40 | ||||
| -rw-r--r-- | src/tdepowersave.cpp | 172 | ||||
| -rw-r--r-- | src/tdepowersave.h | 4 |
15 files changed, 226 insertions, 226 deletions
diff --git a/src/autodimm.cpp b/src/autodimm.cpp index 6ecea42..5eb6f24 100644 --- a/src/autodimm.cpp +++ b/src/autodimm.cpp @@ -37,7 +37,7 @@ autodimm::autodimm(screen *disp) : inactivity(disp) { lastIdleTime = 0; checkActivity = new TQTimer( this ); - connect( checkActivity, TQT_SIGNAL(timeout()), this, TQT_SLOT(pollActivity())); + connect( checkActivity, TQ_SIGNAL(timeout()), this, TQ_SLOT(pollActivity())); kdDebugFuncOut(trace); } @@ -65,7 +65,7 @@ void autodimm::startCheckForActivity() { } /*! - * \b TQT_SLOT to call check if the user is active again. + * \b Slot to call check if the user is active again. */ void autodimm::pollActivity() { kdDebugFuncIn(trace); diff --git a/src/blacklisteditdialog.cpp b/src/blacklisteditdialog.cpp index 475670a..9b50929 100644 --- a/src/blacklisteditdialog.cpp +++ b/src/blacklisteditdialog.cpp @@ -80,7 +80,7 @@ blacklistEditDialog::~blacklistEditDialog() } /*! - * SLOT: called if the 'ok' button clicked. This TQT_SLOT emit + * Slot called if the 'ok' button clicked. This slot emit * \ref config_finished() and close the dialog. */ void blacklistEditDialog::buttonOk_released() { @@ -94,7 +94,7 @@ void blacklistEditDialog::buttonOk_released() { /*! - * SLOT: called if the 'cancel' button clicked. This TQT_SLOT close + * Slot called if the 'cancel' button clicked. This slot close * the dialog. */ void blacklistEditDialog::buttonCancel_released(){ @@ -104,7 +104,7 @@ void blacklistEditDialog::buttonCancel_released(){ /*! - * SLOT: called if the 'remove' button clicked. The TQT_SLOT try to remove + * Slot called if the 'remove' button clicked. The slot try to remove * the selected item from the TQListBox and the TQStringList \ref blacklist . */ void blacklistEditDialog::pB_remove_released(){ @@ -124,8 +124,8 @@ void blacklistEditDialog::pB_remove_released(){ /*! - * SLOT: called if the 'add' button clicked. The TQT_SLOT try to add the string from - * the TQLineEdit lE_blacklist to the TQListBox and the TQStringList \ref blacklist . + * Slot called if the 'add' button clicked. The slot try to add the string from + * the TQLineEdit lE_blacklist to the TQListBox and the TQStringList \ref blacklist. */ void blacklistEditDialog::pB_add_released(){ @@ -155,7 +155,7 @@ void blacklistEditDialog::pB_add_released(){ /*! - * SLOT: called if a item in the TQListBox lB_blacklist is selected. + * Slot called if a item in the TQListBox lB_blacklist is selected. * Here we enable the remove button pB_remove . */ void blacklistEditDialog::lB_blacklist_currentChanged(){ @@ -165,7 +165,7 @@ void blacklistEditDialog::lB_blacklist_currentChanged(){ /*! - * SLOT: called if the input-line in the dialog is modified. Here we enable + * Slot called if the input-line in the dialog is modified. Here we enable * the add button pB_add . */ void blacklistEditDialog::lE_blacklist_textChanged(){ diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index d453ce6..73392be 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -905,7 +905,7 @@ void ConfigureDialog::saveGeneralSettings() { /* ---- START monitor changes SECTION ---- */ /*! - * SLOT: Called if a value within the Tab 'General Settings' is changed. + * Slot called if a value within the Tab 'General Settings' is changed. */ void ConfigureDialog::general_valueChanged(){ kdDebugFuncIn(trace); @@ -928,7 +928,7 @@ void ConfigureDialog::general_valueChanged(){ } /*! - * SLOT: Called if a value within the Tab 'Scheme Settings' is changed. + * Slot called if a value within the Tab 'Scheme Settings' is changed. */ void ConfigureDialog::scheme_valueChanged(){ kdDebugFuncIn(trace); @@ -942,7 +942,7 @@ void ConfigureDialog::scheme_valueChanged(){ } /*! - * SLOT: called if the current scheme in the TQListBox listBox_schemes is + * Slot called if the current scheme in the TQListBox listBox_schemes is * changed/ a other scheme was selected. */ void ConfigureDialog::listBox_schemes_currentChanged(){ @@ -977,7 +977,7 @@ void ConfigureDialog::listBox_schemes_currentChanged(){ /* ---- START BUTTON SECTION ---- */ /*! - * SLOT: called if the 'Apply' button is clicked. + * Slot called if the 'Apply' button is clicked. */ void ConfigureDialog::buttonApply_clicked(){ kdDebugFuncIn(trace); @@ -995,7 +995,7 @@ void ConfigureDialog::buttonApply_clicked(){ } /*! - * SLOT: called if the 'Cancel' button is clicked. + * Slot called if the 'Cancel' button is clicked. */ void ConfigureDialog::buttonCancel_clicked(){ kdDebugFuncOut(trace); @@ -1017,7 +1017,7 @@ void ConfigureDialog::buttonCancel_clicked(){ } /*! - * SLOT: called if the 'OK' button is clicked. + * Slot called if the 'OK' button is clicked. */ void ConfigureDialog::buttonOk_clicked(){ kdDebugFuncIn(trace); @@ -1030,7 +1030,7 @@ void ConfigureDialog::buttonOk_clicked(){ } /*! - * SLOT: called if the 'Help' button is clicked. + * Slot called if the 'Help' button is clicked. */ void ConfigureDialog::buttonHelp_clicked(){ kdDebugFuncIn(trace); @@ -1045,7 +1045,7 @@ void ConfigureDialog::buttonHelp_clicked(){ /* ---- START SCHEME ADD/DELETE SECTION ---- */ /*! - * SLOT: called if the 'New' scheme button is clicked. + * Slot called if the 'New' scheme button is clicked. */ void ConfigureDialog::pB_newScheme_clicked(){ kdDebugFuncIn(trace); @@ -1091,7 +1091,7 @@ void ConfigureDialog::pB_newScheme_clicked(){ } /*! - * SLOT: called if the 'Delete' scheme button is clicked. + * Slot called if the 'Delete' scheme button is clicked. */ void ConfigureDialog::pB_deleteScheme_clicked(){ kdDebugFuncIn(trace); @@ -1129,7 +1129,7 @@ void ConfigureDialog::pB_deleteScheme_clicked(){ /* ---- START SCREENSAVER SECTION ---- */ /*! - * SLOT: called if TQCheckBox cB_specificSettings is toggled. + * Slot called if TQCheckBox cB_specificSettings is toggled. * \param state boolean, true if toggled on * false if toggled off */ @@ -1157,7 +1157,7 @@ void ConfigureDialog::cB_specificSettings_toggled(bool state){ } /*! - * SLOT: called if TQCheckBox cB_disable_Ss is toggled. + * Slot called if TQCheckBox cB_disable_Ss is toggled. * \param state boolean, true if toggled on * false if toggled off */ @@ -1177,7 +1177,7 @@ void ConfigureDialog::cB_disable_Ss_toggled(bool state){ /* ---- START DPMS SECTION ---- */ /*! - * SLOT: called if TQCheckBox cB_SpecificPM is toggled. + * Slot called if TQCheckBox cB_SpecificPM is toggled. * \param state boolean, true if toggled on * false if toggled offtrue */ @@ -1202,7 +1202,7 @@ void ConfigureDialog::cB_SpecificPM_toggled(bool state){ } /*! - * SLOT: called if TQCheckBox cB_disablePM is toggled. + * Slot called if TQCheckBox cB_disablePM is toggled. * \param state boolean, true if toggled on * false if toggled off */ @@ -1223,7 +1223,7 @@ void ConfigureDialog::cB_disablePM_toggled(bool state){ } /*! - * SLOT: called if the standby TQSpinBoxes for DPMS timout is changed. + * Slot called if the standby TQSpinBoxes for DPMS timout is changed. */ void ConfigureDialog::sB_standby_valueChanged() { kdDebugFuncIn(trace); @@ -1240,7 +1240,7 @@ void ConfigureDialog::sB_standby_valueChanged() { } /*! - * SLOT: called if the suspend TQSpinBoxes for DPMS timout is changed. + * Slot called if the suspend TQSpinBoxes for DPMS timout is changed. */ void ConfigureDialog::sB_suspend_valueChanged() { kdDebugFuncIn(trace); @@ -1261,7 +1261,7 @@ void ConfigureDialog::sB_suspend_valueChanged() { } /*! - * SLOT: called if the powerOff TQSpinBoxes for DPMS timout is changed. + * Slot called if the powerOff TQSpinBoxes for DPMS timout is changed. */ void ConfigureDialog::sB_powerOff_valueChanged() { kdDebugFuncIn(trace); @@ -1337,7 +1337,7 @@ void ConfigureDialog::cB_autoSuspend_toggled( bool toggled ) { } /*! - * SLOT: called if a new item in cB_autoInactivity is selected. + * Slot called if a new item in cB_autoInactivity is selected. * \param selectedItem Integer, contains the ID of the new item in the * comboBox. */ @@ -1388,7 +1388,7 @@ void ConfigureDialog::cB_autoInactivity_activated( int selectedItem ) { } /*! - * SLOT: Called if the 'Enable scheme specific blacklist' is toggled. + * Slot called if the 'Enable scheme specific blacklist' is toggled. * \param toggled boolean, true if toggled on * false if toggled off */ @@ -1408,7 +1408,7 @@ void ConfigureDialog::cB_Blacklist_toggled( bool toggled ){ } /*! - * SLOT: Called if the 'edit blacklist' button is toggled. + * Slot called if the 'edit blacklist' button is toggled. */ void ConfigureDialog::pB_editBlacklistSuspend_clicked(){ kdDebugFuncIn(trace); @@ -1445,15 +1445,15 @@ void ConfigureDialog::pB_editBlacklistSuspend_clicked(){ } blacklistEDlgAS = new blacklistEditDialog(blacklist, _top_text, initialiseImport, this); - connect( blacklistEDlgAS, TQT_SIGNAL(config_finished(TQStringList)), this, - TQT_SLOT(saveSchemeSuspendBlacklist(TQStringList))); + connect( blacklistEDlgAS, TQ_SIGNAL(config_finished(TQStringList)), this, + TQ_SLOT(saveSchemeSuspendBlacklist(TQStringList))); blacklistEDlgAS->exec(); kdDebugFuncOut(trace); } /*! - * SLOT: Called if the signal config_finished(TQStringList) recieved + * Slot called if the signal config_finished(TQStringList) recieved * and the autosuspend blacklist is edited. * \param new_blacklist TQStringlist with the edited blacklisted processes */ @@ -1518,7 +1518,7 @@ void ConfigureDialog::cB_autoDimm_toggled( bool toggled ) { } /*! - * SLOT: Called if the 'Enable scheme specific blacklist' is toggled. + * Slot called if the 'Enable scheme specific blacklist' is toggled. * \param toggled boolean, true if toggled on * false if toggled off */ @@ -1538,7 +1538,7 @@ void ConfigureDialog::cB_BlacklistDimm_toggled( bool toggled ){ } /*! - * SLOT: Called if the 'edit blacklist' button for autodimm is toggled. + * Slot called if the 'edit blacklist' button for autodimm is toggled. */ void ConfigureDialog::pB_editBlacklistDimm_clicked(){ kdDebugFuncIn(trace); @@ -1575,15 +1575,15 @@ void ConfigureDialog::pB_editBlacklistDimm_clicked(){ } blacklistEDlgAD = new blacklistEditDialog(blacklist, _top_text, initialiseImport, this); - connect( blacklistEDlgAD, TQT_SIGNAL(config_finished(TQStringList)), this, - TQT_SLOT(saveSchemeDimmBlacklist(TQStringList))); + connect( blacklistEDlgAD, TQ_SIGNAL(config_finished(TQStringList)), this, + TQ_SLOT(saveSchemeDimmBlacklist(TQStringList))); blacklistEDlgAD->exec(); kdDebugFuncOut(trace); } /*! - * SLOT: Called if the signal config_finished(TQStringList) recieved + * Slot called if the signal config_finished(TQStringList) recieved * and the autdimm blacklist is edited. * \param new_blacklist TQStringlist with the edited blacklisted processes */ @@ -1605,7 +1605,7 @@ void ConfigureDialog::saveSchemeDimmBlacklist( TQStringList new_blacklist){ } /*! - * SLOT: Called if there \ref sB_autoDimmTime get changed + * Slot called if there \ref sB_autoDimmTime get changed * \param value Integer with the new value */ void ConfigureDialog::sB_autoDimmTime_valueChanged( int value ) { @@ -1634,18 +1634,18 @@ void ConfigureDialog::sB_autoDimmTime_valueChanged( int value ) { /* ---- END Autodimm SECTION ---- */ /* ---- START Brightness SECTION ---- */ -/*! \b SLOT: to enable the brigthness related widgets */ +/*! \b Slot: to enable the brigthness related widgets */ void ConfigureDialog::cB_Brightness_toggled( bool toggled ) { kdDebugFuncIn(trace); gB_Brightness->setEnabled(toggled); cB_Brightness->setChecked(toggled); - connect(brightnessSlider, TQT_SIGNAL(valueChanged (int)), this, TQT_SLOT(brightnessSlider_sliderMoved(int))); + connect(brightnessSlider, TQ_SIGNAL(valueChanged (int)), this, TQ_SLOT(brightnessSlider_sliderMoved(int))); kdDebugFuncOut(trace); } -/*! \b SLOT: to change the brightness if the slider is changed */ +/*! \b Slot: to change the brightness if the slider is changed */ void ConfigureDialog::brightnessSlider_sliderMoved( int new_value ) { kdDebugFuncIn(trace); @@ -1660,7 +1660,7 @@ void ConfigureDialog::brightnessSlider_sliderMoved( int new_value ) { kdDebugFuncOut(trace); } -/*! \b SLOT: to reset the brightness if the reset button clicked */ +/*! \b Slot: to reset the brightness if the reset button clicked */ void ConfigureDialog::pB_resetBrightness_clicked( ) { kdDebugFuncIn(trace); @@ -1676,7 +1676,7 @@ void ConfigureDialog::pB_resetBrightness_clicked( ) { /* ---- START battery level SECTION ---- */ /*! - * SLOT: called if the warning TQSpinBoxes for battery level is changed. + * Slot called if the warning TQSpinBoxes for battery level is changed. */ void ConfigureDialog::sB_batWarning_valueChanged() { kdDebugFuncIn(trace); @@ -1693,7 +1693,7 @@ void ConfigureDialog::sB_batWarning_valueChanged() { } /*! - * SLOT: called if the low TQSpinBoxes for battery level is changed. + * Slot called if the low TQSpinBoxes for battery level is changed. */ void ConfigureDialog::sB_batLow_valueChanged() { kdDebugFuncIn(trace); @@ -1714,7 +1714,7 @@ void ConfigureDialog::sB_batLow_valueChanged() { } /*! - * SLOT: called if the critical TQSpinBoxes for battery level is changed. + * Slot called if the critical TQSpinBoxes for battery level is changed. */ void ConfigureDialog::sB_batCritical_valueChanged() { kdDebugFuncIn(trace); @@ -1731,7 +1731,7 @@ void ConfigureDialog::sB_batCritical_valueChanged() { } /*! - * SLOT: called if the TQComboBox for the battery warning level action changed, + * Slot called if the TQComboBox for the battery warning level action changed, * used to hide/show the related TQSpinboxes if needed. */ void ConfigureDialog::cB_batWarning_activated() { @@ -1763,7 +1763,7 @@ void ConfigureDialog::cB_batLow_activated() { } /*! - * SLOT: called if the TQComboBox for the battery critical level action changed, + * Slot called if the TQComboBox for the battery critical level action changed, * used to hide/show the related TQSpinboxes if needed. */ void ConfigureDialog::cB_batCritical_activated() { @@ -1780,7 +1780,7 @@ void ConfigureDialog::cB_batCritical_activated() { /* ---- END battery level SECTION ---- */ -/*! \b SLOT: to open the KNotify config dialog */ +/*! \b Slot: to open the KNotify config dialog */ void ConfigureDialog::pB_configNotify_released( ) { kdDebugFuncIn(trace); diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp index 7cb86ef..70087f3 100644 --- a/src/countdowndialog.cpp +++ b/src/countdowndialog.cpp @@ -53,7 +53,7 @@ countDownDialog::countDownDialog( int timeout, TQWidget *parent, const char *nam timeOut = timeout; PROGRESS = new TQTimer(this); - connect(PROGRESS, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgress())); + connect(PROGRESS, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgress())); this->setCaption(i18n("TDEPowersave")); @@ -137,7 +137,7 @@ bool countDownDialog::showDialog() { } /*! - * \b TQT_SLOT to get the event if the 'Cancel' button was pressed. + * \b Slot to get the event if the 'Cancel' button was pressed. */ void countDownDialog::pB_cancel_pressed() { kdDebugFuncIn(trace); @@ -162,7 +162,7 @@ void countDownDialog::reject() { } /*! - * \b TQT_SLOT to handle the change of the progressbar. + * \b Slot to handle the change of the progressbar. */ void countDownDialog::updateProgress() { kdDebugFuncIn(trace); diff --git a/src/dbusInterface.cpp b/src/dbusInterface.cpp index fccafbc..b388a47 100644 --- a/src/dbusInterface.cpp +++ b/src/dbusInterface.cpp @@ -144,19 +144,19 @@ bool dbusInterface::initDBUS(){ if( !dBusConn.isConnected() ) { kdError() << "Failed to open connection to system message bus: " << dBusConn.lastError().message() << endl; - TQTimer::singleShot(4000, this, TQT_SLOT(reconnect())); + TQTimer::singleShot(4000, this, TQ_SLOT(reconnect())); return false; } // watcher for NameOwnerChanged signals dBusWatch = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn); - TQObject::connect(dBusWatch, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(dBusWatch, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); // watcher for Disconnect signal dBusLocal = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_LOCAL, DBUS_INTERFACE_LOCAL, dBusConn); - TQObject::connect(dBusLocal, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(dBusLocal, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); // find already running SystemD TQT_DBusProxy checkSystemD(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn); @@ -193,7 +193,7 @@ void dbusInterface::handleDBusSignal(const TQT_DBusMessage& msg) { && msg.interface() == DBUS_INTERFACE_LOCAL && msg.member() == "Disconnected" ) { close(); - TQTimer::singleShot(1000, this, TQT_SLOT(reconnect())); + TQTimer::singleShot(1000, this, TQ_SLOT(reconnect())); return; } @@ -290,8 +290,8 @@ void dbusInterface::onServiceRegistered(const TQString& service) { // watch session changes systemdSeat = new TQT_DBusProxy(SYSTEMD_LOGIN1_SERVICE, seat, DBUS_INTERFACE_PROPERTIES, dBusConn); - TQObject::connect(systemdSeat, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(systemdSeat, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); // inhibit systemd handling of power/sleep/hibernate/lid buttons // http://www.freedesktop.org/wiki/Software/systemd/inhibit @@ -342,8 +342,8 @@ void dbusInterface::onServiceRegistered(const TQString& service) { // watch session changes consolekitSeat = new TQT_DBusProxy(CK_SERVICE, seat, CK_SEAT_IFACE, dBusConn); - TQObject::connect(consolekitSeat, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(consolekitSeat, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); return; } } diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp index 69dc5f0..85de8bc 100644 --- a/src/detaileddialog.cpp +++ b/src/detaileddialog.cpp @@ -97,12 +97,12 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin BatteryFrame->adjustSize(); tl_powerConsDesc->hide(); tl_powerConsValue->hide(); - connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setBattery())); - connect(primaryBatteries, TQT_SIGNAL(batteryChanged()), this, TQT_SLOT(setBattery())); - connect(primaryBatteries, TQT_SIGNAL(batteryChargingStateChanged(int)), this, - TQT_SLOT(setPowerConsumption())); - connect(primaryBatteries, TQT_SIGNAL(batteryRateChanged()), this, - TQT_SLOT(setPowerConsumption())); + connect(hwinfo, TQ_SIGNAL(generalDataChanged()), this, TQ_SLOT(setBattery())); + connect(primaryBatteries, TQ_SIGNAL(batteryChanged()), this, TQ_SLOT(setBattery())); + connect(primaryBatteries, TQ_SIGNAL(batteryChargingStateChanged(int)), this, + TQ_SLOT(setPowerConsumption())); + connect(primaryBatteries, TQ_SIGNAL(batteryRateChanged()), this, + TQ_SLOT(setPowerConsumption())); setBattery(); setPowerConsumption(); } else { @@ -126,21 +126,21 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin } ProcessorFrame->adjustSize(); - connect(OkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeDetailedDlg())); - connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(setAC())); + connect(OkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeDetailedDlg())); + connect(hwinfo, TQ_SIGNAL(ACStatus(bool)), this, TQ_SLOT(setAC())); // TODO: replace event - //connect(pd, TQT_SIGNAL(schemeDataChanged()), this, TQT_SLOT(setInfos())); - connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setInfos())); + //connect(pd, TQ_SIGNAL(schemeDataChanged()), this, TQ_SLOT(setInfos())); + connect(hwinfo, TQ_SIGNAL(generalDataChanged()), this, TQ_SLOT(setInfos())); if (hwinfo->supportCPUFreq() || cpuInfo->cpuFreqHW) { // Check if cpufreq is available cpuInfo->getCPUMaxSpeed(); setProcessor(); - connect(hwinfo, TQT_SIGNAL(currentCPUFreqPolicyChanged()), this, TQT_SLOT(setInfos())); + connect(hwinfo, TQ_SIGNAL(currentCPUFreqPolicyChanged()), this, TQ_SLOT(setInfos())); } else { // .. if not, use cpu throttling if (!cpuInfo->getCPUThrottlingState() || numOfCPUs <= 1) { - connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setProcessorThrottling())); + connect(hwinfo, TQ_SIGNAL(generalDataChanged()), this, TQ_SLOT(setProcessorThrottling())); } setProcessorThrottling(); } @@ -158,7 +158,7 @@ detaileddialog::~detaileddialog() { } /*! - * \b TQT_SLOT called if the dialog is closed by the user. + * \b Slot called if the dialog is closed by the user. * We do some cleanups here. */ void detaileddialog::closeDetailedDlg() { @@ -169,7 +169,7 @@ void detaileddialog::closeDetailedDlg() { } /*! - * \b TQT_SLOT to set up the battery progress widgets. + * \b Slot to set up the battery progress widgets. */ void detaileddialog::setBattery() { kdDebugFuncIn(trace); @@ -270,7 +270,7 @@ void detaileddialog::setBattery() { } /*! - * \b TQT_SLOT to set up the Processor/CPU progress bar widgets. + * \b Slot to set up the Processor/CPU progress bar widgets. */ void detaileddialog::setPowerConsumption() { kdDebugFuncIn(trace); @@ -307,7 +307,7 @@ void detaileddialog::setPowerConsumption() { } /*! - * \b TQT_SLOT to set up the Processor/CPU progress bar widgets. + * \b Slot to set up the Processor/CPU progress bar widgets. */ void detaileddialog::setProcessor() { kdDebugFuncIn(trace); @@ -341,12 +341,12 @@ void detaileddialog::setProcessor() { ProcessorPBar[i]->setEnabled(false); } } - TQTimer::singleShot(333, this, TQT_SLOT(setProcessor())); + TQTimer::singleShot(333, this, TQ_SLOT(setProcessor())); kdDebugFuncOut(trace); } /*! - * \b TQT_SLOT to set up the Processor/CPU bar widgets for cpu throttling machines. + * \b Slot to set up the Processor/CPU bar widgets for cpu throttling machines. */ void detaileddialog::setProcessorThrottling() { kdDebugFuncOut(trace); @@ -384,14 +384,14 @@ void detaileddialog::setProcessorThrottling() { // currently there are no events we can use to get actual data // so we recheck data ever 2 secs to register changes in the // throttling state and if a CPU/core online state change - TQTimer::singleShot(2000, this, TQT_SLOT(setProcessorThrottling())); + TQTimer::singleShot(2000, this, TQ_SLOT(setProcessorThrottling())); } kdDebugFuncOut(trace); } /*! - * \b TQT_SLOT to set up the AC status within the Led widget. + * \b Slot to set up the AC status within the Led widget. */ void detaileddialog::setAC() { kdDebugFuncIn(trace); @@ -409,7 +409,7 @@ void detaileddialog::setAC() { } /*! - * \b TQT_SLOT to set all additional informtation as e.g. CPUFrequency policy + * \b Slot to set all additional informtation as e.g. CPUFrequency policy * or current scheme */ void detaileddialog::setInfos() { diff --git a/src/hardware.cpp b/src/hardware.cpp index ef1ba23..b098d9a 100644 --- a/src/hardware.cpp +++ b/src/hardware.cpp @@ -59,10 +59,10 @@ HardwareInfo::HardwareInfo() { // initialize connection to the TDE hardware library m_hwdevices = TDEGlobal::hardwareDevices(); - connect(m_hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareChangedEvent(TDEGenericDevice*))); + connect(m_hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(processHardwareChangedEvent(TDEGenericDevice*))); #ifdef USE_EVENT_DEVICES_DIRECTLY - connect(m_hwdevices, TQT_SIGNAL(eventDeviceKeyPressed(unsigned int, TDEEventDevice*)), this, TQT_SLOT(processKeyPressEvent(unsigned int, TDEEventDevice*))); + connect(m_hwdevices, TQ_SIGNAL(eventDeviceKeyPressed(unsigned int, TDEEventDevice*)), this, TQ_SLOT(processKeyPressEvent(unsigned int, TDEEventDevice*))); #endif // update everything the first time @@ -85,7 +85,7 @@ HardwareInfo::HardwareInfo() { // connect to D-Bus dbus_iface = new dbusInterface(); sessionIsActive = dbus_iface->checkActiveSession(); - connect(dbus_iface, TQT_SIGNAL(activeSessionChanged(bool)), this, TQT_SLOT(handleSessionState(bool))); + connect(dbus_iface, TQ_SIGNAL(activeSessionChanged(bool)), this, TQ_SLOT(handleSessionState(bool))); checkPowermanagement(); checkIsLaptop(); @@ -147,13 +147,13 @@ bool HardwareInfo::reinitHardwareInfos () { /*! - * \b TQT_SLOT called if the state of the current session change + * \b Slot called if the state of the current session change * \param state boolean represent the state of the session */ void HardwareInfo::handleSessionState( bool state ) { if( state != sessionIsActive ) { sessionIsActive = state; - TQTimer::singleShot(50, this, TQT_SLOT(emitSessionActiveState())); + TQTimer::singleShot(50, this, TQ_SLOT(emitSessionActiveState())); } } @@ -166,7 +166,7 @@ void HardwareInfo::processHardwareChangedEvent (TDEGenericDevice* device) { if (allUDIs.contains( device->uniqueID() )) { if (device->type() == TDEGenericDeviceType::PowerSupply) { - TQTimer::singleShot(50, this, TQT_SLOT(checkACAdapterState())); + TQTimer::singleShot(50, this, TQ_SLOT(checkACAdapterState())); } else if (device->type() == TDEGenericDeviceType::Battery) { // this is a battery event updateBatteryValues(device); @@ -174,11 +174,11 @@ void HardwareInfo::processHardwareChangedEvent (TDEGenericDevice* device) { TDEEventDevice* edevice = dynamic_cast<TDEEventDevice*>(device); if (edevice) { if (edevice->eventType() == TDEEventDeviceType::ACPILidSwitch) { - TQTimer::singleShot(50, this, TQT_SLOT(checkLidcloseState())); + TQTimer::singleShot(50, this, TQ_SLOT(checkLidcloseState())); } } } else if (device->type() == TDEGenericDeviceType::Backlight) { - TQTimer::singleShot(50, this, TQT_SLOT(checkBrightness())); + TQTimer::singleShot(50, this, TQ_SLOT(checkBrightness())); } // TODO: add needed code } else { @@ -201,20 +201,20 @@ void HardwareInfo::processKeyPressEvent(unsigned int keycode, TDEEventDevice* ed kdDebug() << "ButtonPressed event from TDE HW library " << endl; if (((edevice->eventType() == TDEEventDeviceType::ACPIPowerButton) || (edevice->eventType() == TDEEventDeviceType::ACPIOtherInput)) && (keycode == KEY_POWER)) { - TQTimer::singleShot(50, this, TQT_SLOT(emitPowerButtonPressed())); + TQTimer::singleShot(50, this, TQ_SLOT(emitPowerButtonPressed())); } else if (((edevice->eventType() == TDEEventDeviceType::ACPISuspendButton) || (edevice->eventType() == TDEEventDeviceType::ACPIOtherInput)) && (keycode == KEY_SLEEP)) { - TQTimer::singleShot(50, this, TQT_SLOT(emitSuspendButtonPressed())); + TQTimer::singleShot(50, this, TQ_SLOT(emitSuspendButtonPressed())); } else if (((edevice->eventType() == TDEEventDeviceType::ACPISuspendButton) || (edevice->eventType() == TDEEventDeviceType::ACPIOtherInput)) && (keycode == KEY_SUSPEND)) { - TQTimer::singleShot(50, this, TQT_SLOT(emitS2diskButtonPressed())); + TQTimer::singleShot(50, this, TQ_SLOT(emitS2diskButtonPressed())); } kdDebugFuncOut(trace); } /*! - * This TQT_SLOT is used to fetch the resume signal and multiplex. If needed some + * This slot is used to fetch the resume signal and multiplex. If needed some * actions after resume, do this here. * \param result integer with the result of the resume/suspend */ @@ -605,7 +605,7 @@ bool HardwareInfo::intialiseHWInfo() { if (!allUDIs.contains( hwdevice->uniqueID() )) { allUDIs.append( hwdevice->uniqueID() ); } - connect(edevice, TQT_SIGNAL(switchChanged()), this, TQT_SLOT(checkLidcloseState())); + connect(edevice, TQ_SIGNAL(switchChanged()), this, TQ_SLOT(checkLidcloseState())); checkLidcloseState(); } } @@ -622,7 +622,7 @@ bool HardwareInfo::intialiseHWInfo() { Battery *bat; for (bat = BatteryList.first(); bat; bat = BatteryList.next() ) { if (bat->getType() == BAT_PRIMARY) { - connect(bat, TQT_SIGNAL(changedBattery()),this, TQT_SLOT(updatePrimaryBatteries())); + connect(bat, TQ_SIGNAL(changedBattery()),this, TQ_SLOT(updatePrimaryBatteries())); } } @@ -631,7 +631,7 @@ bool HardwareInfo::intialiseHWInfo() { } /*! - * The function/TQT_SLOT checks the state of the AC adapter. + * The function/slot checks the state of the AC adapter. */ void HardwareInfo::checkACAdapterState() { kdDebugFuncIn(trace); @@ -722,10 +722,10 @@ void HardwareInfo::updatePrimaryBatteries () { if (primaryBatteries->getNumBatteries() < 1) { setPrimaryBatteriesWarningLevel(); primaryBatteries->refreshInfo( BatteryList ); - connect(primaryBatteries, TQT_SIGNAL(batteryChanged()), this, - TQT_SLOT(setPrimaryBatteriesChanges())); - connect(primaryBatteries, TQT_SIGNAL(batteryWarnState(int,int)), this, - TQT_SLOT(emitBatteryWARNState(int,int))); + connect(primaryBatteries, TQ_SIGNAL(batteryChanged()), this, + TQ_SLOT(setPrimaryBatteriesChanges())); + connect(primaryBatteries, TQ_SIGNAL(batteryWarnState(int,int)), this, + TQ_SLOT(emitBatteryWARNState(int,int))); } else { setPrimaryBatteriesWarningLevel(); primaryBatteries->refreshInfo( BatteryList ); diff --git a/src/hardware.h b/src/hardware.h index c7bc3eb..18207b9 100644 --- a/src/hardware.h +++ b/src/hardware.h @@ -333,10 +333,10 @@ private slots: //! check if brightness change is possible void checkBrightness(); - //! TQT_SLOT to forward signal about changed battery warning state + //! TQ_SLOT to forward signal about changed battery warning state void emitBatteryWARNState (int type, int state); - //! TQT_SLOT to handle resume and forward a signal for resume + //! TQ_SLOT to handle resume and forward a signal for resume void handleResumeSignal (int result); //! to emit signal for power button diff --git a/src/hardware_battery.cpp b/src/hardware_battery.cpp index 9d5c1a0..d68dfd4 100644 --- a/src/hardware_battery.cpp +++ b/src/hardware_battery.cpp @@ -73,7 +73,7 @@ Battery::Battery( TQString _udi ) { udi = _udi; - connect(m_hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(updateProperty(TDEGenericDevice*))); + connect(m_hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(updateProperty(TDEGenericDevice*))); initialized = false; diff --git a/src/inactivity.cpp b/src/inactivity.cpp index d22d7f8..ed35869 100644 --- a/src/inactivity.cpp +++ b/src/inactivity.cpp @@ -59,7 +59,7 @@ inactivity::inactivity(screen *disp) : display(disp), has_XSC_Extension = XScreenSaverQueryExtension( tqt_xdisplay(), &dummy, &dummy ); checkInactivity = new TQTimer( this ); - connect( checkInactivity, TQT_SIGNAL(timeout()), this, TQT_SLOT(check())); + connect( checkInactivity, TQ_SIGNAL(timeout()), this, TQ_SLOT(check())); kdDebugFuncOut(trace); } @@ -101,7 +101,7 @@ void inactivity::start( int timeToExpire, TQStringList blacked ) { } /*! - * \b TQT_SLOT to call check as recheck inactivity if before a running PID + * \b Slot to call check as recheck inactivity if before a running PID * request was detected. */ void inactivity::recheck() { @@ -113,14 +113,14 @@ void inactivity::recheck() { } /*! - * \b TQT_SLOT to call check without a recheck. + * \b Slot to call check without a recheck. */ void inactivity::check() { check(false); } /*! - * \b TQT_SLOT to check the current idle-time of the X-Server and if there + * \b Slot to check the current idle-time of the X-Server and if there * are blacklisted programs are running. If the through \ref timeToInactivity * defined time is expired, this function emit signal \ref inactivityTimeExpired() . * \param recheck boolean which define if this is a recheck or not. @@ -151,7 +151,7 @@ void inactivity::check( bool recheck ) { } else { //called if there is a getPIDs() is running - TQTimer::singleShot(500, this, TQT_SLOT(recheck())); + TQTimer::singleShot(500, this, TQ_SLOT(recheck())); } } else checkInactivity->start(CHECK_for_INACTIVITY, true); @@ -322,10 +322,10 @@ void inactivity::checkBlacklisted(){ proc = new TDEProcess; *proc << "pidof" << blacklist; - connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, - TQT_SLOT(getPIDs(TDEProcess *, char *, int))); - connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(getPIDsExited(TDEProcess *))); + connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, + TQ_SLOT(getPIDs(TDEProcess *, char *, int))); + connect( proc, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(getPIDsExited(TDEProcess *))); if (!proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { @@ -343,7 +343,7 @@ void inactivity::checkBlacklisted(){ /*! - * \b TQT_SLOT to get the return of the command pidof and parse this to set + * \b Slot to get the return of the command pidof and parse this to set * \ref blacklisted_running . * \param *proc pointer to the sending TDEProcess * \param *buffer the char pointer to the output of the process to stdout @@ -376,8 +376,8 @@ void inactivity::getPIDs(TDEProcess */*proc*/, char *buffer, int /*length*/) { /*! - * \b TQT_SLOT which called if the call of pidof is exited - * \param proc the KPocess which called this SLOT + * \b Slot which called if the call of pidof is exited + * \param proc the KProcess which called this slot */ void inactivity::getPIDsExited(TDEProcess *proc){ kdDebugFuncIn(trace); diff --git a/src/infodialog.cpp b/src/infodialog.cpp index 00a5790..2486855 100644 --- a/src/infodialog.cpp +++ b/src/infodialog.cpp @@ -108,7 +108,7 @@ bool infoDialog::dialogIsDisabled() { } /*! - * SLOT: called if the 'ok' button clicked. This TQT_SLOT sync the settings + * Slot called if the 'ok' button clicked. This slot sync the settings * and close the dialog. */ void infoDialog::ButtonOK_clicked() { diff --git a/src/logviewer.cpp b/src/logviewer.cpp index 2761e40..ce652b5 100644 --- a/src/logviewer.cpp +++ b/src/logviewer.cpp @@ -67,7 +67,7 @@ LogViewer::~LogViewer(){ } /*! - * SLOT: Called if the user click on 'Close' Button + * Slot called if the user click on 'Close' Button */ void LogViewer::pB_close_clicked() { @@ -75,7 +75,7 @@ void LogViewer::pB_close_clicked() { } /*! - * SLOT: Called if the user click on 'Save As ...' Button + * Slot called if the user click on 'Save As ...' Button */ void LogViewer::pB_save_clicked() { diff --git a/src/screen.cpp b/src/screen.cpp index ff298f1..da6f8dc 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -63,7 +63,7 @@ screen::screen() { screen_save_dcop_ref = DCOPRef( "kdesktop", "KScreensaverIface" ); check_xscreensaver_timer = new TQTimer( this ); - connect( check_xscreensaver_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(xscreensaver_ping() )); + connect( check_xscreensaver_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(xscreensaver_ping() )); SCREENSAVER_STATUS = checkScreenSaverStatus(); kdDebugFuncOut(trace); @@ -288,7 +288,7 @@ int screen::checkScreenSaverStatus() { gnomeScreensaverCheck = new TDEProcess; *gnomeScreensaverCheck << "gnome-screensaver-command" << "--query"; - connect( gnomeScreensaverCheck , TQT_SIGNAL(processExited(TDEProcess *)),TQT_SLOT(getGSExited(TDEProcess *))); + connect( gnomeScreensaverCheck , TQ_SIGNAL(processExited(TDEProcess *)),TQ_SLOT(getGSExited(TDEProcess *))); if(!gnomeScreensaverCheck->start(TDEProcess::NotifyOnExit)) { @@ -333,8 +333,8 @@ bool screen::checkScreenSaverActive() } /*! - * \b TQT_SLOT which called if the call of gnomescreensaver-command exited - * \param gnomecheckcommand the KPocess which called this SLOT + * \b Slot which called if the call of gnomescreensaver-command exited + * \param gnomecheckcommand the KProcess which called this slot */ void screen::getGSExited (TDEProcess *gnomecheckcommand) { kdDebugFuncIn(trace); @@ -485,8 +485,8 @@ xscreensaver: xscreensaver_lock = new TDEProcess; *xscreensaver_lock << "xscreensaver-command" << "-lock"; - connect(xscreensaver_lock, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(cleanProcess(TDEProcess*))); + connect(xscreensaver_lock, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(cleanProcess(TDEProcess*))); bool status = xscreensaver_lock->start(TDEProcess::DontCare); if(!status) @@ -503,8 +503,8 @@ xscreensaver: gnomescreensaver_lock = new TDEProcess; *gnomescreensaver_lock << "gnome-screensaver-command" << "--lock"; - connect(gnomescreensaver_lock, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(cleanProcess(TDEProcess*))); + connect(gnomescreensaver_lock, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(cleanProcess(TDEProcess*))); bool status = gnomescreensaver_lock->start(TDEProcess::DontCare); if(!status) { @@ -521,8 +521,8 @@ xscreensaver: xlock = new TDEProcess; *xlock << "xlock"; //<< "-mode" << "blank"; - connect(xlock, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(cleanProcess(TDEProcess*))); + connect(xlock, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(cleanProcess(TDEProcess*))); bool status = xlock->start(TDEProcess::DontCare); if(!status) { @@ -555,8 +555,8 @@ bool screen::lockScreen( TQString lock_withMethod ) { xlock = new TDEProcess; *xlock << "xlock"; - connect(xlock, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(cleanProcess(TDEProcess*))); + connect(xlock, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(cleanProcess(TDEProcess*))); bool status = xlock->start(TDEProcess::DontCare); if(!status) @@ -570,8 +570,8 @@ bool screen::lockScreen( TQString lock_withMethod ) { else if (lock_withMethod == "gnomescreensaver") { gnomescreensaver_lock = new TDEProcess; *gnomescreensaver_lock << "gnome-screensaver-command" << "--lock"; - connect(gnomescreensaver_lock, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(cleanProcess(TDEProcess*))); + connect(gnomescreensaver_lock, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(cleanProcess(TDEProcess*))); bool status = gnomescreensaver_lock->start(TDEProcess::DontCare); if(!status) @@ -605,8 +605,8 @@ xscreensaver: xscreensaver_lock = new TDEProcess; *xscreensaver_lock << "xscreensaver-command" << "-lock"; - connect(xscreensaver_lock, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(cleanProcess(TDEProcess*))); + connect(xscreensaver_lock, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(cleanProcess(TDEProcess*))); bool status = xscreensaver_lock->start(TDEProcess::DontCare); if(!status) @@ -688,8 +688,8 @@ bool screen::resetXScreensaver(){ xscreensaver_reset = new TDEProcess; *xscreensaver_reset << "xscreensaver-command" << "-restart"; - connect(xscreensaver_reset, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(cleanProcess(TDEProcess*))); + connect(xscreensaver_reset, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(cleanProcess(TDEProcess*))); bool status = xscreensaver_reset->start(TDEProcess::DontCare); if(!status) @@ -713,8 +713,8 @@ void screen::forceDPMSOff() { TDEProcess *xset = new TDEProcess; *xset << "xset" << "dpms" << "force" << "off"; - connect(xset, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(cleanProcess(TDEProcess*))); + connect(xset, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(cleanProcess(TDEProcess*))); if(!xset->start()) { delete xset; diff --git a/src/tdepowersave.cpp b/src/tdepowersave.cpp index 28ba46a..3519d45 100644 --- a/src/tdepowersave.cpp +++ b/src/tdepowersave.cpp @@ -103,33 +103,33 @@ tdepowersave::tdepowersave( bool force_acpi_check, bool trace_func ) : KSystemTr settings->batteryCriticalLevel); // connect to signals for changes - connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(update())); - connect(hwinfo, TQT_SIGNAL(primaryBatteryChanged()), this, TQT_SLOT(update())); - connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(handleACStatusChange (bool))); - connect(hwinfo, TQT_SIGNAL(resumed(int)), this, TQT_SLOT(forwardResumeSignal(int))); + connect(hwinfo, TQ_SIGNAL(generalDataChanged()), this, TQ_SLOT(update())); + connect(hwinfo, TQ_SIGNAL(primaryBatteryChanged()), this, TQ_SLOT(update())); + connect(hwinfo, TQ_SIGNAL(ACStatus(bool)), this, TQ_SLOT(handleACStatusChange (bool))); + connect(hwinfo, TQ_SIGNAL(resumed(int)), this, TQ_SLOT(forwardResumeSignal(int))); // connect to error messages - connect(autoSuspend, TQT_SIGNAL(displayErrorMsg(TQString)), this, TQT_SLOT(showErrorMessage(TQString))); + connect(autoSuspend, TQ_SIGNAL(displayErrorMsg(TQString)), this, TQ_SLOT(showErrorMessage(TQString))); // connect to events - connect(hwinfo, TQT_SIGNAL(lidclosetStatus(bool)), this, TQT_SLOT(handleLidEvent(bool))); - connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent())); - connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSuspendButtonEvent())); - connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent())); - connect(hwinfo, TQT_SIGNAL(batteryWARNState(int,int)), this, TQT_SLOT(notifyBatteryStatusChange (int,int))); - connect(hwinfo, TQT_SIGNAL(desktopSessionIsActive(bool)), this, TQT_SLOT (handleSessionState(bool))); - connect(autoSuspend, TQT_SIGNAL(inactivityTimeExpired()), this, TQT_SLOT(do_autosuspendWarn())); - connect(autoDimm, TQT_SIGNAL(inactivityTimeExpired()), this, TQT_SLOT(do_downDimm())); - connect(autoDimm, TQT_SIGNAL(UserIsActiveAgain()), this, TQT_SLOT(do_upDimm())); + connect(hwinfo, TQ_SIGNAL(lidclosetStatus(bool)), this, TQ_SLOT(handleLidEvent(bool))); + connect(hwinfo, TQ_SIGNAL(powerButtonPressed()), this, TQ_SLOT (handlePowerButtonEvent())); + connect(hwinfo, TQ_SIGNAL(sleepButtonPressed()), this, TQ_SLOT (handleSuspendButtonEvent())); + connect(hwinfo, TQ_SIGNAL(s2diskButtonPressed()), this, TQ_SLOT (handleS2DiskButtonEvent())); + connect(hwinfo, TQ_SIGNAL(batteryWARNState(int,int)), this, TQ_SLOT(notifyBatteryStatusChange (int,int))); + connect(hwinfo, TQ_SIGNAL(desktopSessionIsActive(bool)), this, TQ_SLOT (handleSessionState(bool))); + connect(autoSuspend, TQ_SIGNAL(inactivityTimeExpired()), this, TQ_SLOT(do_autosuspendWarn())); + connect(autoDimm, TQ_SIGNAL(inactivityTimeExpired()), this, TQ_SLOT(do_downDimm())); + connect(autoDimm, TQ_SIGNAL(UserIsActiveAgain()), this, TQ_SLOT(do_upDimm())); // connect to hotkeys m_globalAccel = new TDEGlobalAccel( this ); m_globalAccel->insert( "Power button", i18n( "Execute configured power button action"), TQString(), - TDEShortcut(TQString("XF86PowerOff")), TDEShortcut(TQString("XF86PowerOff")), this, TQT_SLOT( handlePowerButtonEvent() ) ); + TDEShortcut(TQString("XF86PowerOff")), TDEShortcut(TQString("XF86PowerOff")), this, TQ_SLOT( handlePowerButtonEvent() ) ); m_globalAccel->insert( "Suspend button", i18n( "Suspend configured power button action"), TQString(), - TDEShortcut(TQString("XF86Suspend")), TDEShortcut(TQString("XF86Suspend")), this, TQT_SLOT( handleSuspendButtonEvent() ) ); + TDEShortcut(TQString("XF86Suspend")), TDEShortcut(TQString("XF86Suspend")), this, TQ_SLOT( handleSuspendButtonEvent() ) ); m_globalAccel->insert( "Hibernate button", i18n( "Hibernate configured power button action"), TQString(), - TDEShortcut(TQString("XF86Suspend")), TDEShortcut(TQString("XF86Suspend")), this, TQT_SLOT( handleS2DiskButtonEvent() ) ); + TDEShortcut(TQString("XF86Suspend")), TDEShortcut(TQString("XF86Suspend")), this, TQ_SLOT( handleS2DiskButtonEvent() ) ); m_globalAccel->readSettings(); m_globalAccel->updateConnections(); @@ -148,10 +148,10 @@ tdepowersave::tdepowersave( bool force_acpi_check, bool trace_func ) : KSystemTr suspendType = "NULL"; BAT_WARN_ICON_Timer = new TQTimer(this); - connect(BAT_WARN_ICON_Timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(do_setIconBG())); + connect(BAT_WARN_ICON_Timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(do_setIconBG())); m_autoDimmTimer = new TQTimer(this); - connect(m_autoDimmTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(do_dimm())); + connect(m_autoDimmTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(do_dimm())); initMenu(); update(); @@ -184,27 +184,27 @@ void tdepowersave::initMenu() { CONFIGURE_ID = this->contextMenu()->insertItem(SmallIcon("configure", TQIconSet::Automatic), i18n("Configure TDEPowersave..."), - this, TQT_SLOT(showConfigureDialog())); + this, TQ_SLOT(showConfigureDialog())); CONFIGURE_EVENTS_ID = this->contextMenu()->insertItem(SmallIcon("knotify", TQIconSet::Automatic), i18n("Configure Notifications..."), - this, TQT_SLOT(showConfigureNotificationsDialog())); + this, TQ_SLOT(showConfigureNotificationsDialog())); #ifdef ENABLE_YAST_ENTRY YAST_MODULE_MENU_ID = this->contextMenu()->insertItem(SmallIcon("yast", TQIconSet::Automatic), i18n("Start YaST2 Power Management Module..."), - this, TQT_SLOT(do_config())); + this, TQ_SLOT(do_config())); #endif SLEEP_SEPARATOR_MENU_ID = this->contextMenu()->insertSeparator(); FREEZE_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_ram", TQIconSet::Automatic), - i18n("Freeze"), this, TQT_SLOT(do_freeze())); + i18n("Freeze"), this, TQ_SLOT(do_freeze())); STANDBY_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("stand_by", TQIconSet::Automatic), - i18n("Standby"), this, TQT_SLOT(do_standby())); + i18n("Standby"), this, TQ_SLOT(do_standby())); SUSPEND2RAM_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_ram", - TQIconSet::Automatic), i18n("Suspend"), this, TQT_SLOT(do_suspend2ram())); + TQIconSet::Automatic), i18n("Suspend"), this, TQ_SLOT(do_suspend2ram())); SUSPEND2DISK_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_disk", - TQIconSet::Automatic), i18n("Hibernate"), this, TQT_SLOT(do_suspend2disk())); + TQIconSet::Automatic), i18n("Hibernate"), this, TQ_SLOT(do_suspend2disk())); SUSPEND_HYBRID_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_disk", - TQIconSet::Automatic), i18n("Hybrid Suspend"), this, TQT_SLOT(do_suspend_hybrid())); + TQIconSet::Automatic), i18n("Hybrid Suspend"), this, TQ_SLOT(do_suspend_hybrid())); speed_menu = new TQPopupMenu(this, i18n("Set CPU Frequency Policy").utf8()); speed_menu->insertItem(i18n("Performance"), PERFORMANCE); @@ -214,21 +214,21 @@ void tdepowersave::initMenu() { CPUFREQ_SEPARATOR_MENU_ID = contextMenu()->insertSeparator(); CPUFREQ_MENU_ID = contextMenu()->insertItem(i18n("Set CPU Frequency Policy"), speed_menu); - connect(speed_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(do_setSpeedPolicy(int))); - connect(hwinfo, TQT_SIGNAL(currentCPUFreqPolicyChanged()), this, TQT_SLOT(updateCPUFreqMenu())); + connect(speed_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(do_setSpeedPolicy(int))); + connect(hwinfo, TQ_SIGNAL(currentCPUFreqPolicyChanged()), this, TQ_SLOT(updateCPUFreqMenu())); SCHEME_SEPARATOR_MENU_ID = contextMenu()->insertSeparator(); scheme_menu = new TQPopupMenu(this, i18n("Set Active Scheme").utf8()); SCHEME_MENU_ID = contextMenu()->insertItem(i18n("Set Active Scheme"), scheme_menu); - connect(scheme_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(do_setActiveScheme(int))); + connect(scheme_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(do_setActiveScheme(int))); // menu entry for the autosuspend disable checkbox, disabled by default, only // displayed if autosuspend for the current scheme is activated AUTOSUSPEND_SEPARATOR_MENU_ID = contextMenu()->insertSeparator(); AUTOSUSPEND_MENU_ID = this->contextMenu()->insertItem( i18n("Disable Actions on Inactivity"), - this,TQT_SLOT(do_setAutosuspend())); + this,TQ_SLOT(do_setAutosuspend())); this->contextMenu()->setItemVisible(AUTOSUSPEND_SEPARATOR_MENU_ID, false); this->contextMenu()->setItemVisible(AUTOSUSPEND_MENU_ID, false); @@ -237,10 +237,10 @@ void tdepowersave::initMenu() { // Create help submenu KHelpMenu *m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()); TDEPopupMenu *help = m_help->menu(); - help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents())); + help->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents())); this->contextMenu()->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), help); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(_quit())); kdDebugFuncOut(trace); } @@ -286,9 +286,9 @@ void tdepowersave::showConfigureDialog() { configDlg = new ConfigureDialog(config, hwinfo, settings); configDlg->show(); config_dialog_shown = true; - connect(configDlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(observeConfigDlg())); - connect(configDlg, TQT_SIGNAL(openHelp()), this, TQT_SLOT(slotHelp())); - connect(configDlg, TQT_SIGNAL(openKNotify()), this, TQT_SLOT(showConfigureNotificationsDialog())); + connect(configDlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(observeConfigDlg())); + connect(configDlg, TQ_SIGNAL(openHelp()), this, TQ_SLOT(slotHelp())); + connect(configDlg, TQ_SIGNAL(openKNotify()), this, TQ_SLOT(showConfigureNotificationsDialog())); } else { KPassivePopup::message(i18n("WARNING"), i18n("Cannot find any schemes."), @@ -520,7 +520,7 @@ void tdepowersave::updateTooltip(){ } /*! - * \b TQT_SLOT to starts the Yast2-power-management module. This called by the menuentry + * \b Slot to starts the Yast2-power-management module. This called by the menuentry * with ID \ref YAST_MODULE_MENU_ID, named "Start YaST2 Power Management Module". * It create a new TDEProcess and execute "/sbin/yast2 power-management" with tdesu. */ @@ -533,8 +533,8 @@ void tdepowersave::do_config(){ yast2 = new TDEProcess; *yast2 << "tdesu" << "--nonewdcop" << "/sbin/yast2" << "power-management"; - connect(yast2, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotConfigProcessExited(TDEProcess *))); + connect(yast2, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotConfigProcessExited(TDEProcess *))); if(!yast2->start(TDEProcess::NotifyOnExit)) { delete yast2; @@ -549,7 +549,7 @@ void tdepowersave::do_config(){ } /*! - * \b TQT_SLOT to open the tdepowersave help + * \b Slot to open the tdepowersave help */ void tdepowersave::slotHelp() { @@ -557,7 +557,7 @@ void tdepowersave::slotHelp() } /*! - * \b TQT_SLOT to open the tdepowersave About dialog + * \b Slot to open the tdepowersave About dialog */ void tdepowersave::slotAbout() { @@ -566,7 +566,7 @@ void tdepowersave::slotAbout() } /*! - * \b TQT_SLOT to set the icon background on/off if battery is in critical, low or warning-state. Within + * \b Slot to set the icon background on/off if battery is in critical, low or warning-state. Within * this function we set \ref icon_state_changed to true and call \ref redrawPixmap() to redraw the * kickerapplet icon and create a icon with blinking background. \n \n * The slot called by the TQTimer \ref BAT_WARN_ICON_Timer . The interval of the timer is defined @@ -582,7 +582,7 @@ void tdepowersave::do_setIconBG(){ } /*! - * \b TQT_SLOT to enable/disable the autosuspend. + * \b Slot to enable/disable the autosuspend. */ void tdepowersave::do_setAutosuspend(){ kdDebugFuncIn(trace); @@ -607,7 +607,7 @@ void tdepowersave::do_setAutosuspend(){ } /*! - * \b TQT_SLOT which called if the \ref configDlg is destroyed. We set within this SLOT + * \b Slot which called if the \ref configDlg is destroyed. We set within this slot * \ref config_dialog_shown to false. * TODO: check if we maybe should force here the current default scheme depending on the AC/battery state */ @@ -633,7 +633,7 @@ void tdepowersave::observeConfigDlg(){ } /*! - * \b TQT_SLOT which called from \ref do_config() if the 'tdesu yast2' TDEProcess exited. + * \b Slot which called from \ref do_config() if the 'tdesu yast2' TDEProcess exited. * This function control the return value and display if needed a errormessage on failure. */ void tdepowersave::slotConfigProcessExited(TDEProcess *proc){ @@ -664,7 +664,7 @@ void tdepowersave::slotConfigProcessExited(TDEProcess *proc){ } /*! - * \b TQT_SLOT to send the command for "suspend to disk" to TDE hardware library. + * \b Slot to send the command for "suspend to disk" to TDE hardware library. * If there is a error while "suspend to disk" the user get a messagebox. * This function need a power management backend in TDE hardware library for "suspend to disk". * \return boolean with the result of the operation @@ -720,7 +720,7 @@ bool tdepowersave::do_suspend2disk(){ } /*! - * \b TQT_SLOT to send the command for "hybrid suspend" to TDE hardware library. + * \b Slot to send the command for "hybrid suspend" to TDE hardware library. * If there is a error while "hybrid suspend" the user get a messagebox. * This function need a power management backend in TDE hardware library for "hybrid suspend". * \return boolean with the result of the operation @@ -776,7 +776,7 @@ bool tdepowersave::do_suspend_hybrid(){ } /*! - * \b TQT_SLOT to send the command for "suspend to RAM" to the TDE hardware library. + * \b Slot to send the command for "suspend to RAM" to the TDE hardware library. * If there is a error while "suspend to RAM" the user get a messagebox. * This function need a power management backend in TDE hardware library for "suspend to RAM". * \return boolean with the result of the operation @@ -832,7 +832,7 @@ bool tdepowersave::do_suspend2ram(){ } /*! - * \b TQT_SLOT to send the command for "freeze" to the TDE hardware library. + * \b Slot to send the command for "freeze" to the TDE hardware library. * If there is a error while "freeze" the user get e messagebox. * This function need a power management backend in TDE hardware library for "freeze". * \return boolean with the result of the operation @@ -887,7 +887,7 @@ bool tdepowersave::do_freeze(){ } /*! - * \b TQT_SLOT to send the command for "stand-by" to the TDE hardware library. + * \b Slot to send the command for "stand-by" to the TDE hardware library. * If there is a error while "stand-by" the user get e messagebox. * This function need a power management backend in TDE hardware library for "stand-by". * \return boolean with the result of the operation @@ -942,7 +942,7 @@ bool tdepowersave::do_standby(){ } /*! - * \b TQT_SLOT to send check if we should display the warning dialog and display + * \b Slot to send check if we should display the warning dialog and display * the dialog if needed or call directly autosuspend after the signal * \ref autosuspend::inactivityTimeExpired was recieved. */ @@ -1008,7 +1008,7 @@ void tdepowersave::do_autosuspendWarn() { countdown->setMessageText(message); - connect(countdown, TQT_SIGNAL(dialogClosed(bool)), this, TQT_SLOT(do_autosuspend(bool))); + connect(countdown, TQ_SIGNAL(dialogClosed(bool)), this, TQ_SLOT(do_autosuspend(bool))); countdown->showDialog(); } } @@ -1022,7 +1022,7 @@ void tdepowersave::do_autosuspendWarn() { } /*! - * \b TQT_SLOT to send the related suspend command for autosuspend + * \b Slot to send the related suspend command for autosuspend * \param cancel boolean with info if the autosuspend should get canceled * \return boolean with the result of the operation * \retval true if successful @@ -1065,7 +1065,7 @@ bool tdepowersave::do_autosuspend(bool cancel) { } /*! - * \b TQT_SLOT to dimm the display down to the configured level if the signal + * \b Slot to dimm the display down to the configured level if the signal * \ref autodimm::inactivityTimeExpired was recieved. * \param * \return boolean with the result of the operation @@ -1091,7 +1091,7 @@ void tdepowersave::do_downDimm() { } } else { // wait until the timer is stopped, try later! - TQTimer::singleShot(2000, this, TQT_SLOT(do_downDimm())); + TQTimer::singleShot(2000, this, TQ_SLOT(do_downDimm())); } } @@ -1099,7 +1099,7 @@ void tdepowersave::do_downDimm() { } /*! - * \b TQT_SLOT to dimm the display up to the configured level if the signal + * \b Slot to dimm the display up to the configured level if the signal * \ref autodimm::UserIsActiveAgain was recieved. * \param * \return boolean with the result of the operation @@ -1129,7 +1129,7 @@ void tdepowersave::do_upDimm() { setAutoDimm(false); } else { // wait until the timer is stopped, try later! - TQTimer::singleShot(2000, this, TQT_SLOT(do_downDimm())); + TQTimer::singleShot(2000, this, TQ_SLOT(do_downDimm())); } } @@ -1138,7 +1138,7 @@ void tdepowersave::do_upDimm() { /*! - * \b TQT_SLOT to dimm the display down + * \b Slot to dimm the display down * \return boolean with the result of the operation * \retval true if successful * \retval false else @@ -1304,7 +1304,7 @@ void tdepowersave::handleS2DiskButtonEvent() { } /*! - * \b TQT_SLOT to handle the lidclose event. If the screen get locked + * \b Slot to handle the lidclose event. If the screen get locked * depends on the user specific settings. * \param closed boolean with info if the lid is closed or not */ @@ -1362,7 +1362,7 @@ void tdepowersave::handleLidEvent( bool closed ){ } /*! - * \b TQT_SLOT to show the login dialog if the desktop was locked before the suspend. + * \b Slot to show the login dialog if the desktop was locked before the suspend. */ void tdepowersave::activateLoginScreen(){ kdDebugFuncIn(trace); @@ -1372,14 +1372,14 @@ void tdepowersave::activateLoginScreen(){ settings->load_general_settings(); if(settings->timeToFakeKeyAfterLock >= 0) { - TQTimer::singleShot(settings->timeToFakeKeyAfterLock, display, TQT_SLOT(fakeShiftKeyEvent())); + TQTimer::singleShot(settings->timeToFakeKeyAfterLock, display, TQ_SLOT(fakeShiftKeyEvent())); } kdDebugFuncOut(trace); } /*! - * \b TQT_SLOT to set the current suspend type for later use. + * \b Slot to set the current suspend type for later use. */ void tdepowersave::setSuspendType( TQString suspendtype){ kdDebugFuncIn(trace); @@ -1390,7 +1390,7 @@ void tdepowersave::setSuspendType( TQString suspendtype){ } /*! - * \b TQT_SLOT which called if tdepowersave is exited by the user. In this case the user + * \b Slot which called if tdepowersave is exited by the user. In this case the user * is asked through a yes/no box if "tdepowersave start automatically on log in" and the * result is written to the KDE configfile. */ @@ -1435,7 +1435,7 @@ void tdepowersave::_quit (){ } /*! - * \b TQT_SLOT called if the user select a 'CPU Frequency Policy' from the menu ( \ref CPUFREQ_MENU_ID ). + * \b Slot called if the user select a 'CPU Frequency Policy' from the menu ( \ref CPUFREQ_MENU_ID ). */ void tdepowersave::do_setSpeedPolicy(int menu_id){ if (trace) kdDebug() << funcinfo << "IN: " << "menu_id/set policy to: " << menu_id << endl; @@ -1453,7 +1453,7 @@ void tdepowersave::do_setSpeedPolicy(int menu_id){ } /*! - * \b TQT_SLOT called if the user select a scheme from the menu. If there is any errormessage + * \b Slot called if the user select a scheme from the menu. If there is any errormessage * while try to set the selected scheme, the user get a messagebox with info. */ void tdepowersave::do_setActiveScheme( int i ){ @@ -1799,7 +1799,7 @@ void tdepowersave::mousePressEvent(TQMouseEvent *qme){ } /*! - * \b TQT_SLOT called if the detaileddialog is closed. With this we prevent open + * \b Slot called if the detaileddialog is closed. With this we prevent open * the dialog twice, use this function to reset the used variables. */ void tdepowersave::closedetaileddialog() { @@ -1807,7 +1807,7 @@ void tdepowersave::closedetaileddialog() { } /*! - * \b TQT_SLOT used to display messeges in tdepowersave. This function + * \b Slot used to display messeges in tdepowersave. This function * block all messeges which we have in tdepowersave! */ void tdepowersave::showErrorMessage( TQString msg ){ @@ -1942,7 +1942,7 @@ void tdepowersave::setSchemeSettings(){ } /*! - * \b TQT_SLOT which called to set and start the autosuspend monitoring. + * \b Slot which called to set and start the autosuspend monitoring. * \param resumed boolean value which represent information if machine * currently back from suspend/standby */ @@ -1992,7 +1992,7 @@ void tdepowersave::setAutoSuspend( bool resumed ){ autoSuspend->stop(); delete autoSuspend; autoSuspend = new autosuspend(display); - connect(autoSuspend, TQT_SIGNAL(inactivityTimeExpired()), this, TQT_SLOT(do_autosuspendWarn())); + connect(autoSuspend, TQ_SIGNAL(inactivityTimeExpired()), this, TQ_SLOT(do_autosuspendWarn())); } if (settings->autoSuspendCountdown && (settings->autoSuspendCountdownTimeout > 0)) { @@ -2025,7 +2025,7 @@ void tdepowersave::setAutoSuspend( bool resumed ){ } /*! - * \b TQT_SLOT which called to set and start the autodimm monitoring. + * \b Slot which called to set and start the autodimm monitoring. * \param resumed boolean value which represent information if machine * currently back from suspend/standby */ @@ -2042,8 +2042,8 @@ void tdepowersave::setAutoDimm( bool resumed ){ autoDimm->stop(); delete autoDimm; autoDimm = new autodimm(display); - connect(autoDimm, TQT_SIGNAL(inactivityTimeExpired()), this, TQT_SLOT(do_downDimm())); - connect(autoDimm, TQT_SIGNAL(UserIsActiveAgain()), this, TQT_SLOT(do_upDimm())); + connect(autoDimm, TQ_SIGNAL(inactivityTimeExpired()), this, TQ_SLOT(do_downDimm())); + connect(autoDimm, TQ_SIGNAL(UserIsActiveAgain()), this, TQ_SLOT(do_upDimm())); } if (settings->autoDimmSBlistEnabled) { @@ -2063,7 +2063,7 @@ void tdepowersave::setAutoDimm( bool resumed ){ // -------- start KNotify functions ------------- // /*! - * \b TQT_SLOT called if a battery warning state reached and related signal recieved. + * \b Slot called if a battery warning state reached and related signal recieved. * Here we emit the related KNotify event, if not disabled. * \param type integer with the type of the battery * \param state integer represent the reached battery state @@ -2120,7 +2120,7 @@ void tdepowersave::notifyBatteryStatusChange ( int type, int state ) { "will go shutdown in 30 seconds") .arg(min/ 60).arg(min%60)); - TQTimer::singleShot(30000, this, TQT_SLOT(handleCriticalBatteryActionCall())); + TQTimer::singleShot(30000, this, TQ_SLOT(handleCriticalBatteryActionCall())); } else { if (!settings->disableNotifications) KNotifyClient::event(this->winId(), "battery_critical_event", @@ -2198,16 +2198,16 @@ void tdepowersave::handleActionCall ( action action, int value , bool checkAC, b } break; case GO_SUSPEND2RAM: - TQTimer::singleShot(100, this, TQT_SLOT(do_suspend2ram())); + TQTimer::singleShot(100, this, TQ_SLOT(do_suspend2ram())); break; case GO_SUSPEND2DISK: - TQTimer::singleShot(100, this, TQT_SLOT(do_suspend2disk())); + TQTimer::singleShot(100, this, TQ_SLOT(do_suspend2disk())); break; case GO_SUSPEND_HYBRID: - TQTimer::singleShot(100, this, TQT_SLOT(do_suspend_hybrid())); + TQTimer::singleShot(100, this, TQ_SLOT(do_suspend_hybrid())); break; case GO_FREEZE: - TQTimer::singleShot(100, this, TQT_SLOT(do_freeze())); + TQTimer::singleShot(100, this, TQ_SLOT(do_freeze())); break; case BRIGHTNESS: hwinfo->setBrightnessPercentage(value); @@ -2252,7 +2252,7 @@ void tdepowersave::handleActionCall ( action action, int value , bool checkAC, b } /*! - * \b TQT_SLOT called if ac stated changed. Here we emit the related KNotify event. + * \b Slot called if ac stated changed. Here we emit the related KNotify event. * and switch to the AC/battery scheme depending on the state of AC * \param acstate boolean represent the state of AC (true == AC plugged in ...) */ @@ -2290,7 +2290,7 @@ void tdepowersave::handleACStatusChange ( bool acstate , bool notifyEvent ) { } /*! - * \b TQT_SLOT called if scheme switched. Here we emit the related KNotify events + * \b Slot called if scheme switched. Here we emit the related KNotify events * if they are not disabled. */ void tdepowersave::notifySchemeSwitch() { @@ -2314,7 +2314,7 @@ void tdepowersave::notifySchemeSwitch() { } /*! - * \b TQT_SLOT called if the machine suspend. Here we emit the related KNotify events + * \b Slot called if the machine suspend. Here we emit the related KNotify events * if they are not disabled. */ void tdepowersave::notifySuspend( int suspendType ) { @@ -2356,7 +2356,7 @@ void tdepowersave::notifySuspend( int suspendType ) { } /*! - * \b TQT_SLOT called to independent handleResumeSignal() from event loop and + * \b Slot called to independent handleResumeSignal() from event loop and * to avoid problems with the QT3 D-Bus bindings */ void tdepowersave::forwardResumeSignal( int result ) { @@ -2364,13 +2364,13 @@ void tdepowersave::forwardResumeSignal( int result ) { resume_result = result; - TQTimer::singleShot(100, this, TQT_SLOT(handleResumeSignal())); + TQTimer::singleShot(100, this, TQ_SLOT(handleResumeSignal())); kdDebugFuncOut(trace); } /*! - * \b TQT_SLOT called if the machine suspend. Here we emit the related KNotify events + * \b Slot called if the machine suspend. Here we emit the related KNotify events * if they are not disabled. */ void tdepowersave::handleResumeSignal() { @@ -2493,7 +2493,7 @@ void tdepowersave::handleResumeSignal() { } /*! - * \b TQT_SLOT called if the state of the current session change + * \b Slot called if the state of the current session change * \param state boolean represent the state of the session * TODO: fix scheme handling * TODO: fix critical battery situations (see the todo file in the source) @@ -2896,7 +2896,7 @@ void tdepowersave::showDetailedDialog( ){ detailedIsShown = true; } - connect(detailedDlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(closedetaileddialog())); + connect(detailedDlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(closedetaileddialog())); kdDebugFuncOut(trace); } diff --git a/src/tdepowersave.h b/src/tdepowersave.h index 675850a..cb09e56 100644 --- a/src/tdepowersave.h +++ b/src/tdepowersave.h @@ -346,9 +346,9 @@ private slots: void do_downDimm(); //! called if the user get active again and the display should get dimmed up void do_upDimm(); - //! TQT_SLOT do do the dimmining for autodimm feature + //! TQ_SLOT do do the dimmining for autodimm feature void do_dimm(); - //! TQT_SLOT to set autodimm related stuff and start autodimm monitoring + //! TQ_SLOT to set autodimm related stuff and start autodimm monitoring void setAutoDimm( bool resumed ); //! to update the main menu of the kickerapplet |