Remove additional unneeded tq method conversions

pull/1/head
Timothy Pearson 13 years ago
parent a6a8ad44b4
commit c36a2855c4

@ -164,7 +164,7 @@
* configure.in.in: Don't check any longer for PolicyKit * configure.in.in: Don't check any longer for PolicyKit
>= v0.4, simply check if libhal provide the following >= v0.4, simply check if libhal provide the following
function: libhal_tqdevice_is_caller_privileged() to check function: libhal_device_is_caller_privileged() to check
if KPowersave should use libhal or the old PolicyKit if KPowersave should use libhal or the old PolicyKit
D-Bus interface. D-Bus interface.
@ -401,7 +401,7 @@
* configure.in.in: Changed detection if we need to call * configure.in.in: Changed detection if we need to call
new PolicyKit/HAL instead of PolicyKit D-Bus daemon to new PolicyKit/HAL instead of PolicyKit D-Bus daemon to
check for libhal_tqdevice_is_caller_privileged() in libhal. check for libhal_device_is_caller_privileged() in libhal.
2007-08-13 Danny Kukawka <danny.kukawka@web.de> 2007-08-13 Danny Kukawka <danny.kukawka@web.de>
@ -707,17 +707,17 @@
2007-06-13 Danny Kukawka <danny.kukawka@web.de> 2007-06-13 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.cpp: Remove laptop_panel entry from the * src/hardware.cpp: Remove laptop_panel entry from the
QDict<QString> udis if no tqdevice with laptop_panel found. This QDict<QString> udis if no device with laptop_panel found. This
should prevent problems if the laptop panel tqdevice get removed should prevent problems if the laptop panel device get removed
from HAL. from HAL.
2007-06-13 Danny Kukawka <danny.kukawka@web.de> 2007-06-13 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.cpp: Added code to react if a latop panel tqdevice * src/hardware.cpp: Added code to react if a latop panel device
get added/remove. Added also all tqdevice_type values to the get added/remove. Added also all device_type values to the
switch of the HAL_DEVICE case. switch of the HAL_DEVICE case.
Removed several *.latin1() calls due to new usage of kdDebug(). Removed several *.latin1() calls due to new usage of kdDebug().
* src/hardware.h: Added new value to enum tqdevice_type for laptop * src/hardware.h: Added new value to enum device_type for laptop
panels (for brightness). panels (for brightness).
2007-06-13 Danny Kukawka <danny.kukawka@web.de> 2007-06-13 Danny Kukawka <danny.kukawka@web.de>
@ -2546,7 +2546,7 @@
* src/hardware.[cpp,h]: Added some new functions to get access * src/hardware.[cpp,h]: Added some new functions to get access
to battery list and the primary battery collection. to battery list and the primary battery collection.
Fixed bug in checkBrightness(), check always if the list of Fixed bug in checkBrightness(), check always if the list of
tqdevices is not empty before use them. devices is not empty before use them.
Fixed some minor bugs in debug messages Fixed some minor bugs in debug messages
2006-11-02 Danny Kukawka <danny.kukawka@web.de> 2006-11-02 Danny Kukawka <danny.kukawka@web.de>
@ -2617,9 +2617,9 @@
2006-10-25 Danny Kukawka <danny.kukawka@web.de> 2006-10-25 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.[cpp,h]: Added new function to check if we should * src/hardware.[cpp,h]: Added new function to check if we should
handle a special tqdevice (e.g. on a HAL_DEVICE::DeviceAdded handle a special device (e.g. on a HAL_DEVICE::DeviceAdded
event) and to get the type of the tqdevice (added a new enum event) and to get the type of the device (added a new enum
tqdevice_type). device_type).
Added some new Q_SIGNALS for: HAL error handling, data changes and Added some new Q_SIGNALS for: HAL error handling, data changes and
if the sleep button was pressed. if the sleep button was pressed.
@ -2823,9 +2823,9 @@
2006-10-19 Danny Kukawka <danny.kukawka@web.de> 2006-10-19 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.[cpp,h]: fixed intialiseHWInfo() to use only * src/hardware.[cpp,h]: fixed intialiseHWInfo() to use only
one QStringList for the tqdevices. Added new code to the func one QStringList for the devices. Added new code to the func
to collect the battery UDIs. to collect the battery UDIs.
Added code to store the UDIs of all tqdevices we handle and Added code to store the UDIs of all devices we handle and
want to monitor. This should allow us a finer grained filter want to monitor. This should allow us a finer grained filter
functions for HAL events. functions for HAL events.
* src/hardware_battery.[cpp,h]: Changed one constructor to * src/hardware_battery.[cpp,h]: Changed one constructor to
@ -3004,7 +3004,7 @@
* src/dbusHAL.[cpp,h]: code comments * src/dbusHAL.[cpp,h]: code comments
* src/hardware.[cpp,h]: addes some empty functions and a QDicr * src/hardware.[cpp,h]: addes some empty functions and a QDicr
for udis of tqdevices except batteries (e.g. AC, Lid, buttons ...) for udis of devices except batteries (e.g. AC, Lid, buttons ...)
* src/pdaemon.cpp: added comments about the state of port code * src/pdaemon.cpp: added comments about the state of port code
and functions to class dbusHAL and functions to class dbusHAL
@ -3054,7 +3054,7 @@
* src/Makefile.am: added dbusHAL class to make * src/Makefile.am: added dbusHAL class to make
* src/dbusHAL.[cpp,h]: Changed name of the class to dbusHAL and * src/dbusHAL.[cpp,h]: Changed name of the class to dbusHAL and
added connection to HAL and code to hold LibHalContext. The class added connection to HAL and code to hold LibHalContext. The class
contains now mew functions to search for tqdevices and to get tqdevice contains now mew functions to search for devices and to get device
information from HAL. Also added: new function to call information from HAL. Also added: new function to call
org.freedesktop.Hal.Device.SystemPowerManagement methodes on HAL org.freedesktop.Hal.Device.SystemPowerManagement methodes on HAL
via DBUS. via DBUS.

@ -125,8 +125,8 @@ Tue Jul 24 15:54:27 CEST 2007 - dkukawka@suse.de
section) to disable call SetPowerSave() on HAL. section) to disable call SetPowerSave() on HAL.
- Fixed Segmentation Fault from b.n.c bug #284622. - Fixed Segmentation Fault from b.n.c bug #284622.
- added arabic po-file from Youssef Chahibi <chahibi@gmail.com> - added arabic po-file from Youssef Chahibi <chahibi@gmail.com>
- fixed laptop panel/backlight tqdevice handling to react if a - fixed laptop panel/backlight device handling to react if a
tqdevice get added/removed to/from HAL device get added/removed to/from HAL
- use now kdebug/kdDebug() functions to debug instead of own - use now kdebug/kdDebug() functions to debug instead of own
macros, added --dbg-trace option to allow trace function entry macros, added --dbg-trace option to allow trace function entry
and leave points. and leave points.

@ -147,7 +147,7 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_SOCKET, ["$DBUS_SYSTEM_BUS_SOCKET"],
#check for PolicyKit version #check for PolicyKit version
LIBHAL_POLICYCHECK=no LIBHAL_POLICYCHECK=no
AC_CHECK_LIB([hal], [libhal_tqdevice_is_caller_privileged], [LIBHAL_POLICYCHECK=yes], [LIBHAL_POLICYCHECK=no]) AC_CHECK_LIB([hal], [libhal_device_is_caller_privileged], [LIBHAL_POLICYCHECK=yes], [LIBHAL_POLICYCHECK=no])
if test "x$LIBHAL_POLICYCHECK" = "xyes"; then if test "x$LIBHAL_POLICYCHECK" = "xyes"; then
AC_DEFINE([USE_LIBHAL_POLICYCHECK],1,[Set if should use libhal to check policy.]) AC_DEFINE([USE_LIBHAL_POLICYCHECK],1,[Set if should use libhal to check policy.])
fi fi

@ -205,7 +205,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>

@ -530,7 +530,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -637,7 +637,7 @@
<property name="text"> <property name="text">
<string>after:</string> <string>after:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -861,7 +861,7 @@
<property name="text"> <property name="text">
<string>after:</string> <string>after:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -1179,7 +1179,7 @@
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -1471,7 +1471,7 @@
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -1688,7 +1688,7 @@
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

@ -1074,7 +1074,7 @@ void ConfigureDialog::pB_deleteScheme_clicked(){
if (pB_deleteScheme->isEnabled()) { if (pB_deleteScheme->isEnabled()) {
int answer = KMessageBox::questionYesNo( this, i18n("Do you really want to delete the " int answer = KMessageBox::questionYesNo( this, i18n("Do you really want to delete the "
"%1 scheme?").tqarg(schemes[currentScheme]), "%1 scheme?").arg(schemes[currentScheme]),
i18n("Confirm delete scheme"), i18n("Confirm delete scheme"),
i18n("Delete"), i18n("Cancel")); i18n("Delete"), i18n("Cancel"));
if (answer == KMessageBox::Yes) { if (answer == KMessageBox::Yes) {

@ -142,7 +142,7 @@
<property name="textFormat"> <property name="textFormat">
<enum>AutoText</enum> <enum>AutoText</enum>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -114,7 +114,7 @@ bool countDownDialog::showDialog() {
if (!textLabel->text().isEmpty() && timeOut > 0) { if (!textLabel->text().isEmpty() && timeOut > 0) {
// init the progressbar // init the progressbar
progressBar->setFormat(i18n("%1 seconds").tqarg(remaining)); progressBar->setFormat(i18n("%1 seconds").arg(remaining));
progressBar->setPercentageVisible(true); progressBar->setPercentageVisible(true);
progressBar->setProgress(100); progressBar->setProgress(100);
progressBar->setEnabled(true); progressBar->setEnabled(true);
@ -160,7 +160,7 @@ void countDownDialog::updateProgress() {
int setTo = (int)((100.0/(float)timeOut)*(float)remaining); int setTo = (int)((100.0/(float)timeOut)*(float)remaining);
// set the progressBar // set the progressBar
progressBar->setFormat(i18n("%1 seconds").tqarg(remaining)); progressBar->setFormat(i18n("%1 seconds").arg(remaining));
progressBar->setPercentageVisible(true); progressBar->setPercentageVisible(true);
progressBar->setProgress(setTo); progressBar->setProgress(setTo);
progressBar->setEnabled(true); progressBar->setEnabled(true);

@ -1288,7 +1288,7 @@ filterFunction (DBusConnection *connection, DBusMessage *message, void */*data*/
if (dbus_message_get_args( message, &error, DBUS_TYPE_BOOLEAN, &active, DBUS_TYPE_INVALID )) { if (dbus_message_get_args( message, &error, DBUS_TYPE_BOOLEAN, &active, DBUS_TYPE_INVALID )) {
((dbusHAL*) myInstance)->emitMsgReceived( CONSOLEKIT_SESSION_ACTIVE, ((dbusHAL*) myInstance)->emitMsgReceived( CONSOLEKIT_SESSION_ACTIVE,
session, TQString("%1").tqarg((int)active)); session, TQString("%1").arg((int)active));
} else { } else {
if (dbus_error_is_set( &error )) dbus_error_free( &error ); if (dbus_error_is_set( &error )) dbus_error_free( &error );
} }

@ -92,7 +92,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop|AlignRight</set> <set>AlignTop|AlignRight</set>
</property> </property>
</widget> </widget>
@ -111,7 +111,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>
@ -322,7 +322,7 @@
<property name="text"> <property name="text">
<string>plugged in</string> <string>plugged in</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -351,7 +351,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

@ -78,9 +78,9 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
if ((primaryBatteries->getNumBatteries() > 1) && (i == 0)) if ((primaryBatteries->getNumBatteries() > 1) && (i == 0))
Label->setText( i18n( "Total:" )); Label->setText( i18n( "Total:" ));
else if ((primaryBatteries->getNumBatteries() > 1) && (i > 0)) else if ((primaryBatteries->getNumBatteries() > 1) && (i > 0))
Label->setText( i18n( "Battery %1" ).tqarg(i)); Label->setText( i18n( "Battery %1" ).arg(i));
else else
Label->setText( i18n( "Battery %1" ).tqarg(i + 1)); Label->setText( i18n( "Battery %1" ).arg(i + 1));
BatteryGridLayout->addWidget( Label, i , 0); BatteryGridLayout->addWidget( Label, i , 0);
@ -111,7 +111,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
for (int i = 0; i < numOfCPUs; i++) { for (int i = 0; i < numOfCPUs; i++) {
TQLabel *Label = new TQLabel(ProcessorFrame, "ProcessorLabel"); TQLabel *Label = new TQLabel(ProcessorFrame, "ProcessorLabel");
Label->setText( i18n( "Processor %1" ).tqarg(i + 1)); Label->setText( i18n( "Processor %1" ).arg(i + 1));
ProcessorGridLayout->addWidget( Label, i , 0); ProcessorGridLayout->addWidget( Label, i , 0);
KProgress *CPUPBar = new KProgress(ProcessorFrame, "ProcessorPBar"); KProgress *CPUPBar = new KProgress(ProcessorFrame, "ProcessorPBar");
@ -242,10 +242,10 @@ void detaileddialog::setBattery() {
// this should fix apm, where we have no time info if charging // this should fix apm, where we have no time info if charging
BatteryPBar[i]->setFormat("%p% " + i18n("charged")); BatteryPBar[i]->setFormat("%p% " + i18n("charged"));
} else if (_c_state == CHARGING) { } else if (_c_state == CHARGING) {
TQString temp = i18n("%1:%2 h until charged").tqarg(hours).tqarg(minutes); TQString temp = i18n("%1:%2 h until charged").arg(hours).arg(minutes);
BatteryPBar[i]->setFormat(temp); BatteryPBar[i]->setFormat(temp);
} else if (_c_state == DISCHARGING) { } else if (_c_state == DISCHARGING) {
TQString temp = i18n("%1:%2 h remaining").tqarg(hours).tqarg(minutes); TQString temp = i18n("%1:%2 h remaining").arg(hours).arg(minutes);
BatteryPBar[i]->setFormat(temp); BatteryPBar[i]->setFormat(temp);
} else { } else {
@ -355,7 +355,7 @@ void detaileddialog::setProcessorThrottling() {
if (throttling && cpuInfo->cpufreq_speed[i] > 0 && cpuInfo->cpu_throttling[i] >= 0) { if (throttling && cpuInfo->cpufreq_speed[i] > 0 && cpuInfo->cpu_throttling[i] >= 0) {
// get max cpu freq and set it to the max of the progressbar // get max cpu freq and set it to the max of the progressbar
ProcessorPBar[i]->setTotalSteps(100); ProcessorPBar[i]->setTotalSteps(100);
TQString ProgressString = TQString("%1% (%2 MHz)").tqarg(100 - cpuInfo->cpu_throttling[i]).tqarg(cpuInfo->cpufreq_speed[i]); TQString ProgressString = TQString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufreq_speed[i]);
ProcessorPBar[i]->setFormat(i18n(ProgressString.ascii())); ProcessorPBar[i]->setFormat(i18n(ProgressString.ascii()));
ProcessorPBar[i]->setProgress(100 - cpuInfo->cpu_throttling[i]); ProcessorPBar[i]->setProgress(100 - cpuInfo->cpu_throttling[i]);
ProcessorPBar[i]->setEnabled(true); ProcessorPBar[i]->setEnabled(true);

@ -57,20 +57,20 @@ class dummy {
dummy = i18n("activated"); dummy = i18n("activated");
dummy = i18n("deactivated"); dummy = i18n("deactivated");
dummy = i18n("do nothing"); dummy = i18n("do nothing");
dummy = i18n("Deactivate following tqdevices:"); dummy = i18n("Deactivate following devices:");
dummy = i18n("Activate following tqdevices"); dummy = i18n("Activate following devices");
dummy = i18n("Reactivate following tqdevices"); dummy = i18n("Reactivate following devices");
dummy = i18n("Deactivate following tqdevice classes:"); dummy = i18n("Deactivate following device classes:");
dummy = i18n("Activate following tqdevices classes"); dummy = i18n("Activate following devices classes");
dummy = i18n("Reactivate following tqdevice classes"); dummy = i18n("Reactivate following device classes");
dummy = i18n("If the scheme switched all tqdevices are again activated."); dummy = i18n("If the scheme switched all devices are again activated.");
dummy = i18n("This is a experimental feature."); dummy = i18n("This is a experimental feature.");
dummy = i18n("If you have problems with this feature, please report them."); dummy = i18n("If you have problems with this feature, please report them.");
dummy = i18n("Select one of the available tqdevices and click on "); dummy = i18n("Select one of the available devices and click on ");
dummy = i18n("Select one of the available tqdevice classes and click on "); dummy = i18n("Select one of the available device classes and click on ");
dummy = i18n("Select one or more of the available tqdevices and click on "); dummy = i18n("Select one or more of the available devices and click on ");
dummy = i18n("Select one or more of the available tqdevice classes and click on "); dummy = i18n("Select one or more of the available device classes and click on ");
dummy = i18n("Please note: If you e.g. deactivate a network tqdevice you may lose your " dummy = i18n("Please note: If you e.g. deactivate a network device you may lose your "
"internet connection."); "internet connection.");
dummy = i18n("<b>Note:</b> If you select this option, the computer will suspend or standby " dummy = i18n("<b>Note:</b> If you select this option, the computer will suspend or standby "
"if the current user is inactive for the defined time. <br><br> This feature " "if the current user is inactive for the defined time. <br><br> This feature "
@ -92,11 +92,11 @@ class dummy {
// for kpowersave.cpp: // for kpowersave.cpp:
dummy = i18n("Cannot connect to D-Bus. The D-Bus daemon may not be running."); dummy = i18n("Cannot connect to D-Bus. The D-Bus daemon may not be running.");
dummy = i18n("Scheme switched to %1. \n Deactivate following tqdevices: %2").tqarg("").tqarg(""); dummy = i18n("Scheme switched to %1. \n Deactivate following devices: %2").arg("").arg("");
dummy = i18n("Scheme switched to %1. \n Activate following tqdevices: %2").tqarg("").tqarg(""); dummy = i18n("Scheme switched to %1. \n Activate following devices: %2").arg("").arg("");
dummy = i18n("Report ..."); dummy = i18n("Report ...");
dummy = i18n("Suspend to RAM is not supported on your machine."); dummy = i18n("Suspend to RAM is not supported on your machine.");
dummy = i18n("Additionally, please mail the output of %1 to %2 . Thanks!").tqarg("").tqarg(""); dummy = i18n("Additionally, please mail the output of %1 to %2 . Thanks!").arg("").arg("");
dummy = i18n("Power consumption"); dummy = i18n("Power consumption");
// for screen.cpp // for screen.cpp
@ -116,12 +116,12 @@ class dummy {
dummy = i18n("Session active:"); dummy = i18n("Session active:");
// for countdowndialog.cpp // for countdowndialog.cpp
dummy = i18n("The display get dimmed down to %1% in: ").tqarg(30); dummy = i18n("The display get dimmed down to %1% in: ").arg(30);
// other ConsoleKit related stuff // other ConsoleKit related stuff
dummy = i18n("Could not call %1. The current desktop session is not active.").tqarg(""); dummy = i18n("Could not call %1. The current desktop session is not active.").arg("");
dummy = i18n("Could not set %1. The current desktop session is not active.").tqarg(""); dummy = i18n("Could not set %1. The current desktop session is not active.").arg("");
dummy = i18n("Stopped %1. The current desktop session is now inactive.").tqarg(""); dummy = i18n("Stopped %1. The current desktop session is now inactive.").arg("");
dummy = i18n("Restarted %1. The current desktop session is now active again.").tqarg(""); dummy = i18n("Restarted %1. The current desktop session is now active again.").arg("");
} }
}; };

@ -891,7 +891,7 @@ void HardwareInfo::checkLidcloseState() {
if (dbus_HAL->halGetPropertyBool(*udis["lidclose"] , "button.state.value", &_state )) { if (dbus_HAL->halGetPropertyBool(*udis["lidclose"] , "button.state.value", &_state )) {
if (_state != lidclose) { if (_state != lidclose) {
lidclose = _state; lidclose = _state;
emit lidcloseStatus( lidclose ); emit lidclosetStatus( lidclose );
} }
} else { } else {
lidclose = false; lidclose = false;

@ -364,7 +364,7 @@ signals:
//! signal the AC adapter //! signal the AC adapter
void ACStatus( bool ); void ACStatus( bool );
//! signal for the lidclose button //! signal for the lidclose button
void lidcloseStatus ( bool ); void lidclosetStatus ( bool );
//! signal for pressed the power button //! signal for pressed the power button
void powerButtonPressed (); void powerButtonPressed ();
//! signal for pressed sleep (suspend2ram) button //! signal for pressed sleep (suspend2ram) button

@ -106,7 +106,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

@ -106,7 +106,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0
connect(hwinfo, TQT_SIGNAL(dbusRunning(int)), this, TQT_SLOT(showDBusErrorMsg(int))); connect(hwinfo, TQT_SIGNAL(dbusRunning(int)), this, TQT_SLOT(showDBusErrorMsg(int)));
// connect to events // connect to events
connect(hwinfo, TQT_SIGNAL(lidcloseStatus(bool)), this, TQT_SLOT(handleLidEvent(bool))); connect(hwinfo, TQT_SIGNAL(lidclosetStatus(bool)), this, TQT_SLOT(handleLidEvent(bool)));
connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent())); connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent()));
connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSleepButtonEvent())); connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSleepButtonEvent()));
connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent())); connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent()));
@ -474,26 +474,26 @@ void kpowersave::updateTooltip(){
else if (minutes > 0){ else if (minutes > 0){
if (charging_state == CHARGING) if (charging_state == CHARGING)
tmp = i18n("Plugged in -- %1% charged (%2:%3 h until full " tmp = i18n("Plugged in -- %1% charged (%2:%3 h until full "
"charged)").tqarg(percent).tqarg(minutes / 60).tqarg(num3); "charged)").arg(percent).arg(minutes / 60).arg(num3);
else else
tmp = i18n("Plugged in -- %1% charged (%2:%3 remaining hours)") tmp = i18n("Plugged in -- %1% charged (%2:%3 remaining hours)")
.tqarg(percent).tqarg(minutes / 60).tqarg(num3); .arg(percent).arg(minutes / 60).arg(num3);
} }
else if (charging_state == CHARGING && hwinfo->hasAPM()) { else if (charging_state == CHARGING && hwinfo->hasAPM()) {
tmp = i18n("Plugged in -- %1% charged").tqarg(percent); tmp = i18n("Plugged in -- %1% charged").arg(percent);
} }
else{ else{
if (percent == -1) tmp = i18n("Plugged in -- no battery"); if (percent == -1) tmp = i18n("Plugged in -- no battery");
else tmp = i18n("Plugged in -- %1% charged").tqarg(percent); else tmp = i18n("Plugged in -- %1% charged").arg(percent);
} }
} }
} else{ } else{
if (minutes >= 0){ if (minutes >= 0){
tmp = i18n("Running on batteries -- %1% charged (%2:%3 hours remaining)") tmp = i18n("Running on batteries -- %1% charged (%2:%3 hours remaining)")
.tqarg(percent).tqarg(minutes / 60).tqarg(num3); .arg(percent).arg(minutes / 60).arg(num3);
} }
else { else {
tmp = i18n("Running on batteries -- %1% charged").tqarg(percent); tmp = i18n("Running on batteries -- %1% charged").arg(percent);
} }
} }
// add string whether battery is charging, but only if < 100% to avoid // add string whether battery is charging, but only if < 100% to avoid
@ -873,7 +873,7 @@ void kpowersave::do_autosuspendWarn() {
// TODO: rework this after translation round for openSUSE 10.3 ! // TODO: rework this after translation round for openSUSE 10.3 !
message = i18n("Inactivity detected.") + " " + message = i18n("Inactivity detected.") + " " +
i18n("To stop the %1 press the 'Cancel' button before the countdown " i18n("To stop the %1 press the 'Cancel' button before the countdown "
"expire.").tqarg(i18n("Autosuspend")) + "\n\n" + "expire.").arg(i18n("Autosuspend")) + "\n\n" +
i18n("The computer autosuspend in: "); i18n("The computer autosuspend in: ");
countdown->setMessageText(message); countdown->setMessageText(message);
@ -1104,13 +1104,13 @@ bool kpowersave::handleMounts( bool suspend ) {
_msg = "<qt>" + _msg = "<qt>" +
i18n("Could not umount external media before suspend/standby. \n " i18n("Could not umount external media before suspend/standby. \n "
"(Reason: %1)\n \n Would you like to continue suspend/standby " "(Reason: %1)\n \n Would you like to continue suspend/standby "
"anyway? \n(Warning: Continue suspend can cause data loss!)").tqarg(_e_msg) + "anyway? \n(Warning: Continue suspend can cause data loss!)").arg(_e_msg) +
"</qt>"; "</qt>";
_suspend = getSuspendString(calledSuspend); _suspend = getSuspendString(calledSuspend);
int answer = KMessageBox::questionYesNo( 0, _msg, int answer = KMessageBox::questionYesNo( 0, _msg,
i18n("Error while prepare %1").tqarg(_suspend), i18n("Error while prepare %1").arg(_suspend),
i18n("Suspend anyway"), i18n("Cancel suspend"), i18n("Suspend anyway"), i18n("Cancel suspend"),
"ignoreMountOnSuspend"); "ignoreMountOnSuspend");
@ -1306,7 +1306,7 @@ void kpowersave::do_setSpeedPolicy(int menu_id){
if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) { if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) {
KPassivePopup::message(i18n("WARNING"), KPassivePopup::message(i18n("WARNING"),
i18n("CPU Freq Policy %1 could not be set.").tqarg(speed_menu->text(menu_id)), i18n("CPU Freq Policy %1 could not be set.").arg(speed_menu->text(menu_id)),
SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 10000); SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 10000);
} else { } else {
hwinfo->checkCurrentCPUFreqPolicy(); hwinfo->checkCurrentCPUFreqPolicy();
@ -1335,7 +1335,7 @@ void kpowersave::do_setActiveScheme( int i ){
notifySchemeSwitch(); notifySchemeSwitch();
} else if (!settings->schemes[i]){ } else if (!settings->schemes[i]){
KPassivePopup::message( i18n("WARNING"), KPassivePopup::message( i18n("WARNING"),
i18n("Scheme %1 could not be activated.").tqarg(scheme_menu->text(i)), i18n("Scheme %1 could not be activated.").arg(scheme_menu->text(i)),
SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 5000); SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 5000);
} }
@ -1990,7 +1990,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) {
if (!settings->disableNotifications) if (!settings->disableNotifications)
KNotifyClient::event(this->winId(), "battery_warning_event", KNotifyClient::event(this->winId(), "battery_warning_event",
i18n("Battery state changed to WARNING -- remaining time: " i18n("Battery state changed to WARNING -- remaining time: "
"%1 hours and %2 minutes.").tqarg(min/60).tqarg(min%60)); "%1 hours and %2 minutes.").arg(min/60).arg(min%60));
// set/call related actions // set/call related actions
handleActionCall(settings->batteryWarningLevelAction, handleActionCall(settings->batteryWarningLevelAction,
settings->batteryWarningLevelActionValue); settings->batteryWarningLevelActionValue);
@ -1999,7 +1999,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) {
if (!settings->disableNotifications) if (!settings->disableNotifications)
KNotifyClient::event(this->winId(), "battery_low_event", KNotifyClient::event(this->winId(), "battery_low_event",
i18n("Battery state changed to LOW -- remaining time: " i18n("Battery state changed to LOW -- remaining time: "
"%1 hours and %2 minutes.").tqarg(min/60).tqarg(min%60)); "%1 hours and %2 minutes.").arg(min/60).arg(min%60));
// set/call related actions // set/call related actions
handleActionCall(settings->batteryLowLevelAction, handleActionCall(settings->batteryLowLevelAction,
settings->batteryLowLevelActionValue); settings->batteryLowLevelActionValue);
@ -2014,7 +2014,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) {
"Shut down your system or plug in the power " "Shut down your system or plug in the power "
"cable immediately. Otherwise the machine\n" "cable immediately. Otherwise the machine\n"
"will go shutdown in 30 seconds") "will go shutdown in 30 seconds")
.tqarg(min/ 60).tqarg(min%60)); .arg(min/ 60).arg(min%60));
TQTimer::singleShot(30000, this, TQT_SLOT(handleCriticalBatteryActionCall())); TQTimer::singleShot(30000, this, TQT_SLOT(handleCriticalBatteryActionCall()));
} else { } else {
@ -2024,7 +2024,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) {
"remaining time: %1 hours and %2 minutes.\n" "remaining time: %1 hours and %2 minutes.\n"
"Shut down your system or plug in the power " "Shut down your system or plug in the power "
"cable immediately.") "cable immediately.")
.tqarg(min/ 60).tqarg(min%60)); .arg(min/ 60).arg(min%60));
handleActionCall(settings->batteryCriticalLevelAction, handleActionCall(settings->batteryCriticalLevelAction,
settings->batteryCriticalLevelActionValue); settings->batteryCriticalLevelActionValue);
@ -2181,7 +2181,7 @@ void kpowersave::notifySchemeSwitch() {
eventType = "scheme_" + _scheme; eventType = "scheme_" + _scheme;
KNotifyClient::event( this->winId(), eventType, KNotifyClient::event( this->winId(), eventType,
i18n("Switched to scheme: %1").tqarg(i18n(_scheme.ascii())).ascii()); i18n("Switched to scheme: %1").arg(i18n(_scheme.ascii())).ascii());
} }
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
@ -2258,17 +2258,17 @@ void kpowersave::handleResumeSignal() {
switch (calledSuspend) { switch (calledSuspend) {
case SUSPEND2DISK: case SUSPEND2DISK:
KNotifyClient::event( this->winId(), "resume_from_suspend2disk_event", KNotifyClient::event( this->winId(), "resume_from_suspend2disk_event",
i18n("System is resumed from %1.").tqarg( i18n("System is resumed from %1.").arg(
i18n("Suspend to Disk"))); i18n("Suspend to Disk")));
break; break;
case SUSPEND2RAM: case SUSPEND2RAM:
KNotifyClient::event( this->winId(), "resume_from_suspend2ram_event", KNotifyClient::event( this->winId(), "resume_from_suspend2ram_event",
i18n("System is resumed from %1.").tqarg( i18n("System is resumed from %1.").arg(
i18n("Suspend to RAM"))); i18n("Suspend to RAM")));
break; break;
case STANDBY: case STANDBY:
KNotifyClient::event( this->winId(), "resume_from_standby_event", KNotifyClient::event( this->winId(), "resume_from_standby_event",
i18n("System is resumed from %1.").tqarg( i18n("System is resumed from %1.").arg(
i18n("Standby"))); i18n("Standby")));
break; break;
default: default:
@ -2297,7 +2297,7 @@ void kpowersave::handleResumeSignal() {
TQString msg; TQString msg;
msg = i18n("An unknown error occurred while %1. The errorcode is: '%2'"). msg = i18n("An unknown error occurred while %1. The errorcode is: '%2'").
tqarg(getSuspendString(calledSuspend)).tqarg(resume_result); arg(getSuspendString(calledSuspend)).arg(resume_result);
#if defined(DISTRO_IS_SUSE) || defined(DISTRO_IS_SLES_SLED) || defined(DISTRO_IS_PARDUS) #if defined(DISTRO_IS_SUSE) || defined(DISTRO_IS_SLES_SLED) || defined(DISTRO_IS_PARDUS)
// okay we know this system use pm-utils and log is under /var/log/pm-suspend.log // okay we know this system use pm-utils and log is under /var/log/pm-suspend.log
@ -2328,7 +2328,7 @@ void kpowersave::handleResumeSignal() {
#endif #endif
} }
#else #else
KMessageBox::error(0, msg, i18n("Error while %1").tqarg(getSuspendString(calledSuspend))); KMessageBox::error(0, msg, i18n("Error while %1").arg(getSuspendString(calledSuspend)));
#endif #endif
} }
// set back ... suspend is handled // set back ... suspend is handled

@ -390,7 +390,7 @@ private slots:
//! set for a battery status the related actions //! set for a battery status the related actions
void handleActionCall ( action action, int value, bool checkAC = false, bool batWarnCall = false ); void handleActionCall ( action action, int value, bool checkAC = false, bool batWarnCall = false );
//! this lock/reactivate the screen if a lidcloseStatus() signal is triggered //! this lock/reactivate the screen if a lidclosetStatus() signal is triggered
void handleLidEvent( bool closed ); void handleLidEvent( bool closed );
//! show the login dialog after locked the screen //! show the login dialog after locked the screen
void activateLoginScreen(); void activateLoginScreen();

@ -41,7 +41,7 @@
LogViewer::LogViewer( TQString filename, TQWidget *parent, const char *name) LogViewer::LogViewer( TQString filename, TQWidget *parent, const char *name)
:log_viewer(parent, name, false, WDestructiveClose ) { :log_viewer(parent, name, false, WDestructiveClose ) {
this->setCaption(i18n("KPowersave Logfile Viewer: %1").tqarg(filename)); this->setCaption(i18n("KPowersave Logfile Viewer: %1").arg(filename));
if (!TQFile::exists ( filename )) if (!TQFile::exists ( filename ))
return; return;

Loading…
Cancel
Save