Finish TQt4 port of kpowersave

This enables both Qt3 and Qt4 builds


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1228282 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
pull/1/head
tpearson 14 years ago
parent ba24506b3b
commit 4304e8d9da

@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains 0. This License applies to any program or other work which tqcontains
a notice placed by the copyright holder saying it may be distributed a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below, under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program" refers to any such program or work, and a "work based on the Program"
@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
The source code for a work means the preferred form of the work for The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any code means all the source code for all modules it tqcontains, plus any
associated interface definition files, plus the scripts used to associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include special exception, the source code distributed need not include

@ -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_device_is_caller_privileged() to check function: libhal_tqdevice_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_device_is_caller_privileged() in libhal. check for libhal_tqdevice_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 device with laptop_panel found. This QDict<QString> udis if no tqdevice with laptop_panel found. This
should prevent problems if the laptop panel device get removed should prevent problems if the laptop panel tqdevice 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 device * src/hardware.cpp: Added code to react if a latop panel tqdevice
get added/remove. Added also all device_type values to the get added/remove. Added also all tqdevice_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 device_type for laptop * src/hardware.h: Added new value to enum tqdevice_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>
@ -916,7 +916,7 @@
2007-04-10 Danny Kukawka <danny.kukawka@web.de> 2007-04-10 Danny Kukawka <danny.kukawka@web.de>
* src/logviewer.cpp: Include moc file. Fixed possible file * src/logviewer.cpp: Include tqmoc file. Fixed possible file
descriptor leak. descriptor leak.
2007-04-10 Laurent Montel <lmontel@mandriva.com> 2007-04-10 Laurent Montel <lmontel@mandriva.com>
@ -939,7 +939,7 @@
2007-04-10 Danny Kukawka <danny.kukawka@web.de> 2007-04-10 Danny Kukawka <danny.kukawka@web.de>
Moved all moc includes to end of cpp-files, added some code Moved all tqmoc includes to end of cpp-files, added some code
comments and smaller code formatting changes: comments and smaller code formatting changes:
* src/autosuspend.[cpp,h]: * src/autosuspend.[cpp,h]:
@ -955,7 +955,7 @@
2007-04-10 Laurent Montel <lmontel@mandriva.com> 2007-04-10 Laurent Montel <lmontel@mandriva.com>
Make moc files being included to speed up build and to fix some Make tqmoc files being included to speed up build and to fix some
parallel build issues: parallel build issues:
* src/autosuspend.cpp: * src/autosuspend.cpp:
@ -1010,7 +1010,7 @@
* src/hardware.[cpp,h]: Add new helper functions/SLOTS to * src/hardware.[cpp,h]: Add new helper functions/SLOTS to
forward the events for Power, Sleep and s2disk buttons and the forward the events for Power, Sleep and s2disk buttons and the
lidclose event. Changed current code to emit the signals not lidclose event. Changed current code to emit the Q_SIGNALS not
directly but to call a QTimer:singleShot() with the new SLOTS directly but to call a QTimer:singleShot() with the new SLOTS
instead. This should make the eventhandling from QT3 D-Bus instead. This should make the eventhandling from QT3 D-Bus
bindings independent from the event loop (including may bindings independent from the event loop (including may
@ -1255,7 +1255,7 @@
CPU usage. This happen because the QT D-Bus bindings wait for a CPU usage. This happen because the QT D-Bus bindings wait for a
result from the related KPowersave filter function (return a result from the related KPowersave filter function (return a
DBUS_HANDLER_RESULT_* to the bus). This happen also because the DBUS_HANDLER_RESULT_* to the bus). This happen also because the
signals in QT are only function calls which not are really emitted Q_SIGNALS in QT are only function calls which not are really emitted
to the QT event loop as assumed (the KMessageBox block the filter- to the QT event loop as assumed (the KMessageBox block the filter-
function). function).
Fixed this by use QTimer::SingleShot() to call the suspend, in the Fixed this by use QTimer::SingleShot() to call the suspend, in the
@ -1503,7 +1503,7 @@
* src/hardware_battery.cpp: Emit signal to monitor current * src/hardware_battery.cpp: Emit signal to monitor current
rate of battery. rate of battery.
* src/hardware_batteryCollection.[cpp,h]: Added some code to * src/hardware_batteryCollection.[cpp,h]: Added some code to
hold the current rate and the rate unit. Emit signals if the hold the current rate and the rate unit. Emit Q_SIGNALS if the
current rate change (don't emit general change signal, since current rate change (don't emit general change signal, since
this maybe produce useless calls in other parts of KPowersave this maybe produce useless calls in other parts of KPowersave
than only in the detailed dialog). than only in the detailed dialog).
@ -1528,8 +1528,8 @@
2007-01-23 Danny Kukawka <danny.kukawka@web.de> 2007-01-23 Danny Kukawka <danny.kukawka@web.de>
* src/configure_Dialog.ui: Added new slots to catch changes. * src/configure_Dialog.ui: Added new Q_SLOTS to catch changes.
* src/configuredialog.[cpp,h]: Implemented new slots to * src/configuredialog.[cpp,h]: Implemented new Q_SLOTS to
hide/show the QSpinboxes for the brightness settings in the hide/show the QSpinboxes for the brightness settings in the
battery tab of the general settings, depending of the selected battery tab of the general settings, depending of the selected
action. action.
@ -1590,8 +1590,8 @@
2007-01-23 Danny Kukawka <danny.kukawka@web.de> 2007-01-23 Danny Kukawka <danny.kukawka@web.de>
* src/configure_Dialog.ui: changed param of battery level * src/configure_Dialog.ui: changed param of battery level
QSpinBox slots (no param instead of int) QSpinBox Q_SLOTS (no param instead of int)
* src/configuredialog.[cpp,h]: Added slots to set the battery * src/configuredialog.[cpp,h]: Added Q_SLOTS to set the battery
level QSpinBoxes to correct values: warning > low > critical. level QSpinBoxes to correct values: warning > low > critical.
2007-01-22 Danny Kukawka <danny.kukawka@web.de> 2007-01-22 Danny Kukawka <danny.kukawka@web.de>
@ -1667,8 +1667,8 @@
2007-01-21 Danny Kukawka <danny.kukawka@web.de> 2007-01-21 Danny Kukawka <danny.kukawka@web.de>
* src/configure_Dialog.ui: Fixed layout and (re)added * src/configure_Dialog.ui: Fixed tqlayout and (re)added
slots for signals and actions. Q_SLOTS for Q_SIGNALS and actions.
2007-01-21 Danny Kukawka <danny.kukawka@web.de> 2007-01-21 Danny Kukawka <danny.kukawka@web.de>
@ -2036,7 +2036,7 @@
* src/hardware_battery.cpp: fixed handling if battery * src/hardware_battery.cpp: fixed handling if battery
get removed from the system. Don't forget to check the get removed from the system. Don't forget to check the
battery type if reset the battery. battery type if reset the battery.
Also fixed emit signals. Emit them first if have read Also fixed emit Q_SIGNALS. Emit them first if have read
the values from Hardware and filled the related variables. the values from Hardware and filled the related variables.
2006-11-18 Danny Kukawka <danny.kukawka@web.de> 2006-11-18 Danny Kukawka <danny.kukawka@web.de>
@ -2275,7 +2275,7 @@
all hardware information after a HAL or D-Bus restart. all hardware information after a HAL or D-Bus restart.
This should reduce the code and ensure that we do This should reduce the code and ensure that we do
always the same. always the same.
Fixed handling of signals if D-Bus restart related to Fixed handling of Q_SIGNALS if D-Bus restart related to
HAL and D-Bus itself status. HAL and D-Bus itself status.
* src/kpowersave.cpp: added a comment * src/kpowersave.cpp: added a comment
@ -2327,7 +2327,7 @@
be more generic and can be reused later for other be more generic and can be reused later for other
battery types. battery types.
* src/hardware_batteryCollection.[cpp,h]: changed * src/hardware_batteryCollection.[cpp,h]: changed
signals to emit also battery type. Q_SIGNALS to emit also battery type.
* src/kpowersave.cpp: changed debug msg and set the * src/kpowersave.cpp: changed debug msg and set the
battery warning level temporary in the constructor battery warning level temporary in the constructor
to HardwareInfo object. to HardwareInfo object.
@ -2415,7 +2415,7 @@
2006-11-05 Danny Kukawka <danny.kukawka@web.de> 2006-11-05 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.cpp: fixed connect to signals from the * src/hardware.cpp: fixed connect to Q_SIGNALS from the
primary battery collection. This should fix the applet primary battery collection. This should fix the applet
icon to show the correct battery fill level. icon to show the correct battery fill level.
@ -2466,7 +2466,7 @@
allow finder grained and easier refresh/handle of battery allow finder grained and easier refresh/handle of battery
information. information.
Fixed code to update battery information and connect to Fixed code to update battery information and connect to
related signals. related Q_SIGNALS.
2006-11-05 Danny Kukawka <danny.kukawka@web.de> 2006-11-05 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
devices is not empty before use them. tqdevices 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,10 +2617,10 @@
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 device (e.g. on a HAL_DEVICE::DeviceAdded handle a special tqdevice (e.g. on a HAL_DEVICE::DeviceAdded
event) and to get the type of the device (added a new enum event) and to get the type of the tqdevice (added a new enum
device_type). tqdevice_type).
Added some new 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.
2006-10-24 Danny Kukawka <danny.kukawka@web.de> 2006-10-24 Danny Kukawka <danny.kukawka@web.de>
@ -2676,7 +2676,7 @@
* src/hardware.cpp: removed todo, code comment update * src/hardware.cpp: removed todo, code comment update
* src/hardware_battery.[cpp,h]: Added variable to check if the * src/hardware_battery.[cpp,h]: Added variable to check if the
battery is inialised and added event handling including emit battery is inialised and added event handling including emit
related signals if something changed. related Q_SIGNALS if something changed.
Set crit_level as default to 2 as in old powersave config. Set crit_level as default to 2 as in old powersave config.
* src/hardware_batteryCollection.cpp: set crit_level as default * src/hardware_batteryCollection.cpp: set crit_level as default
to 2 as in old powersave config to 2 as in old powersave config
@ -2696,7 +2696,7 @@
call the related function to update the key. call the related function to update the key.
TODO: add code to check if really something was changed and TODO: add code to check if really something was changed and
emit some signals. emit some Q_SIGNALS.
2006-10-23 Danny Kukawka <danny.kukawka@web.de> 2006-10-23 Danny Kukawka <danny.kukawka@web.de>
@ -2731,12 +2731,12 @@
2006-10-22 Danny Kukawka <danny.kukawka@web.de> 2006-10-22 Danny Kukawka <danny.kukawka@web.de>
* src/hardware_batteryCollection.[cpp,h]: emit now also all * src/hardware_batteryCollection.[cpp,h]: emit now also all
the other signals for percentage, minutes, present batteries the other Q_SIGNALS for percentage, minutes, present batteries
and the charging state. and the charging state.
2006-10-22 Danny Kukawka <danny.kukawka@web.de> 2006-10-22 Danny Kukawka <danny.kukawka@web.de>
* src/hardware_batteryCollection.[cpp,h]: emit signals for * src/hardware_batteryCollection.[cpp,h]: emit Q_SIGNALS for
reached battery warning states. reached battery warning states.
2006-10-22 Danny Kukawka <danny.kukawka@web.de> 2006-10-22 Danny Kukawka <danny.kukawka@web.de>
@ -2751,7 +2751,7 @@
Added new members to get the number of present batteries and Added new members to get the number of present batteries and
to get the battery state. to get the battery state.
TODO: add signals and emit them. TODO: add Q_SIGNALS and emit them.
2006-10-20 Danny Kukawka <danny.kukawka@web.de> 2006-10-20 Danny Kukawka <danny.kukawka@web.de>
@ -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 devices. Added new code to the func one QStringList for the tqdevices. Added new code to the func
to collect the battery UDIs. to collect the battery UDIs.
Added code to store the UDIs of all devices we handle and Added code to store the UDIs of all tqdevices 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 devices except batteries (e.g. AC, Lid, buttons ...) for udis of tqdevices 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,14 +3054,14 @@
* 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 devices and to get device contains now mew functions to search for tqdevices and to get tqdevice
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.
2006-09-04 Danny Kukawka <danny.kukawka@web.de> 2006-09-04 Danny Kukawka <danny.kukawka@web.de>
Added new class to monitor HAL signals (DeviceAdded, DeviceRemoved, Added new class to monitor HAL Q_SIGNALS (DeviceAdded, DeviceRemoved,
PropertyModified, Condition) and Connect/Disconnect events via DBUS. PropertyModified, Condition) and Connect/Disconnect events via DBUS.
This class is not used atm in the code, but should replace the class This class is not used atm in the code, but should replace the class
@ -3787,7 +3787,7 @@
2006-03-13 Danny Kukawka <danny.kukawka@web.de> 2006-03-13 Danny Kukawka <danny.kukawka@web.de>
* src/detaileddialog.cpp: added slightly adopted patch from Timo * src/detaileddialog.cpp: added slightly adopted patch from Timo
Hoenig <thoenig@suse.de> to replace 'Mhz' with correct 'MHz' Hoenig <thoenig@suse.de> to tqreplace 'Mhz' with correct 'MHz'
* po/*.po, po/kpowersave.pot: updated translation files for this * po/*.po, po/kpowersave.pot: updated translation files for this
changes. changes.
@ -3936,7 +3936,7 @@
lidopen event (now reset screen settings to avoid problems after call lidopen event (now reset screen settings to avoid problems after call
xset on lidclose). Added call screen::forceDPMSOff() on lidclose to set xset on lidclose). Added call screen::forceDPMSOff() on lidclose to set
light on LCD off. Removed notification functions for lidclose and light on LCD off. Removed notification functions for lidclose and
lidopen signals and merged them to existing functions/slots. lidopen Q_SIGNALS and merged them to existing functions/Q_SLOTS.
* src/screen.cpp, src/screen.h: added new function forceDPMSOff() to * src/screen.cpp, src/screen.h: added new function forceDPMSOff() to
shutdown the display via DPMS (call xset dpms force off). shutdown the display via DPMS (call xset dpms force off).
* src/settings.cpp, src/settings.h: adde new variable and related * src/settings.cpp, src/settings.h: adde new variable and related
@ -4130,7 +4130,7 @@
2006-02-19 Danny Kukawka <danny.kukawka@web.de> 2006-02-19 Danny Kukawka <danny.kukawka@web.de>
* src/detaileddialog.cpp, src/detaileddialog.h: replaced layout for * src/detaileddialog.cpp, src/detaileddialog.h: replaced tqlayout for
battery and processor bars with QGridLayout to be sure all widgets battery and processor bars with QGridLayout to be sure all widgets
have the same size. Replaced picture for total battery fuel state have the same size. Replaced picture for total battery fuel state
with a string. Cleaned up the code. with a string. Cleaned up the code.
@ -4165,7 +4165,7 @@
* src/kpowersave.cppn src/kpowersave.h: Added new KNotify events for: * src/kpowersave.cppn src/kpowersave.h: Added new KNotify events for:
suspend (3), resume (3), scheme switched (5), lidclosed, lidopened. suspend (3), resume (3), scheme switched (5), lidclosed, lidopened.
Fixed code comments and cleanups. Fixed code comments and cleanups.
* src/pdaemon.cpp, src/pdaemon.h: Added new signals for: lidopened, * src/pdaemon.cpp, src/pdaemon.h: Added new Q_SIGNALS for: lidopened,
each resume type ( resumedFrom(QString) ) each resume type ( resumedFrom(QString) )
2006-02-17 Danny Kukawka <danny.kukawka@web.de> 2006-02-17 Danny Kukawka <danny.kukawka@web.de>
@ -4539,7 +4539,7 @@
* src/detailed_dialog.ui: reworked detailed dialog after * src/detailed_dialog.ui: reworked detailed dialog after
discussion and welcome criticism from Timo Hönig based on a discussion and welcome criticism from Timo Hönig based on a
mocup from Timo. Thanks! tqmocup from Timo. Thanks!
* src/detaileddialog.cpp, src/detaileddialog.h: added patch * src/detaileddialog.cpp, src/detaileddialog.h: added patch
from Daniel Gollub <dgollub@suse.de> to fix problems if a from Daniel Gollub <dgollub@suse.de> to fix problems if a
CPU is set offline. CPU is set offline.
@ -4863,7 +4863,7 @@
prevent message on HAL or powersave restart. Changed handling of prevent message on HAL or powersave restart. Changed handling of
display the errormessage. display the errormessage.
* src/pdaemon.cpp: Fixed some problems with HAL_ERROR handling. Fixed * src/pdaemon.cpp: Fixed some problems with HAL_ERROR handling. Fixed
problem with set update_info_ac_changed _before_ emit related signals. problem with set update_info_ac_changed _before_ emit related Q_SIGNALS.
2005-12-21 Danny Kukawka <danny.kukawka@web.de> 2005-12-21 Danny Kukawka <danny.kukawka@web.de>
@ -4937,7 +4937,7 @@
2005-12-07 Danny Kukawka <danny.kukawka@web.de> 2005-12-07 Danny Kukawka <danny.kukawka@web.de>
* src/pdaemon.cpp: fixed set applet icon for AC status if no * src/pdaemon.cpp: fixed set applet icon for AC status if no
powersave daemon is running, emit now needed signals. Also powersave daemon is running, emit now needed Q_SIGNALS. Also
fixed signal for AC sound. fixed signal for AC sound.
2005-12-03 Danny Kukawka <danny.kukawka@web.de> 2005-12-03 Danny Kukawka <danny.kukawka@web.de>

@ -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 device handling to react if a - fixed laptop panel/backlight tqdevice handling to react if a
device get added/removed to/from HAL tqdevice 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.
@ -158,7 +158,7 @@ Tue Apr 24 16:53:13 CEST 2007 - dkukawka@suse.de
- updated to current SVN HEAD v0.7.2_SVN20070424: - updated to current SVN HEAD v0.7.2_SVN20070424:
- changed set CPU Freq governor to reuse code and integrated - changed set CPU Freq governor to reuse code and integrated
patch for b.n.c #229234 patch for b.n.c #229234
- fixed b.n.c #266243: check if info.capability contains - fixed b.n.c #266243: check if info.capability tqcontains
laptop_panel instead for info.category laptop_panel instead for info.category
------------------------------------------------------------------- -------------------------------------------------------------------
@ -180,7 +180,7 @@ Wed Apr 18 20:38:47 CEST 2007 - dkukawka@suse.de
- changed logic for resume if a timeout happen - changed logic for resume if a timeout happen
- only suspend on button events if we resumed (successful) to - only suspend on button events if we resumed (successful) to
avoid double suspends avoid double suspends
- several fixes to make signals from HAL/DBus idependent from - several fixes to make Q_SIGNALS from HAL/DBus idependent from
the QT eventloop due to problems with the QT3 DBus bindings the QT eventloop due to problems with the QT3 DBus bindings
(should also fix Debian bug #413811) (should also fix Debian bug #413811)
- several fixes realated to segfaults/crashes - several fixes realated to segfaults/crashes
@ -189,7 +189,7 @@ Wed Apr 18 20:38:47 CEST 2007 - dkukawka@suse.de
- patches from Mandriva (lmontel@mandriva.com): - patches from Mandriva (lmontel@mandriva.com):
- fixed problems with formated messages from KDE media manager - fixed problems with formated messages from KDE media manager
- avoid double translate strings/msg - avoid double translate strings/msg
- Make moc files being included to speed up build and to fix - Make tqmoc files being included to speed up build and to fix
some parallel build issues some parallel build issues
- fixed several memory leaks - fixed several memory leaks
- fixed bugs: - fixed bugs:
@ -514,7 +514,7 @@ Mon Feb 6 18:54:20 CET 2006 - dkukawka@suse.de
- updated to new release 0.5.6: - updated to new release 0.5.6:
* fixed bugs: * fixed bugs:
- detailed dialog: - detailed dialog:
* removed connect setProcessor() to signals from powersave * removed connect setProcessor() to Q_SIGNALS from powersave
because of excessive CPU usage because of excessive CPU usage
* fixed problems write text if CPU Freq Policy not supported * fixed problems write text if CPU Freq Policy not supported
* cleanups (removed unneeded enum defines and replaced with * cleanups (removed unneeded enum defines and replaced with
@ -1000,7 +1000,7 @@ Tue Feb 22 10:45:45 CET 2005 - dkukawka@suse.de
general config section general config section
- changed call of the configure dialog, now kpowersave not blocked - changed call of the configure dialog, now kpowersave not blocked
while dialog is open while dialog is open
- added different slots and logic to disable/enable widgets - added different Q_SLOTS and logic to disable/enable widgets
- added load and store the configuration - added load and store the configuration
- added configoptions and funtions to make 'lock screen' - added configoptions and funtions to make 'lock screen'
configureable by user configureable by user

@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \
is \ is \
provides \ provides \
specifies \ specifies \
contains \ tqcontains \
represents \ represents \
a \ a \
an \ an \
@ -113,7 +113,7 @@ FILE_PATTERNS = *.c \
*.dox *.dox
RECURSIVE = YES RECURSIVE = YES
EXCLUDE = ./src/kpowersave_dummy.cpp \ EXCLUDE = ./src/kpowersave_dummy.cpp \
./src/screen.moc.cpp \ ./src/screen.tqmoc.cpp \
./src/kpowersave.la.cpp \ ./src/kpowersave.la.cpp \
./src/kpowersave_skel.cpp \ ./src/kpowersave_skel.cpp \
./src/info_Dialog.cpp \ ./src/info_Dialog.cpp \
@ -128,7 +128,7 @@ EXCLUDE = ./src/kpowersave_dummy.cpp \
./src/configure_Dialog.h \ ./src/configure_Dialog.h \
./src/kdeinit_kpowersave.cpp ./src/kdeinit_kpowersave.cpp
EXCLUDE_SYMLINKS = NO EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = *.moc.cpp \ EXCLUDE_PATTERNS = *.tqmoc.cpp \
*_dummy.* \ *_dummy.* \
*.la.cpp \ *.la.cpp \
*_la.all_cpp.cpp *_la.all_cpp.cpp

@ -113,7 +113,7 @@ pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries. PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix. Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give In addition, if you use an unusual directory tqlayout you can give
options like `--bindir=DIR' to specify different values for particular options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them. you can set and what kinds of files go in them.

@ -51,7 +51,7 @@ Bugfixes:
values to a enum (lead to segfault since enum is a 8bit char object) values to a enum (lead to segfault since enum is a 8bit char object)
- fixed wrong unit for power consumption (removed 'h' from unit) - fixed wrong unit for power consumption (removed 'h' from unit)
- only suspend on button events if we resumed to avoid double suspends - only suspend on button events if we resumed to avoid double suspends
- several fixes to make signals from HAL/DBus idependent from the QT - several fixes to make Q_SIGNALS from HAL/DBus idependent from the QT
eventloop due to problems with the QT3 DBus bindings eventloop due to problems with the QT3 DBus bindings
- several patches from Mandriva (lmontel@mandriva.com) to fix problems - several patches from Mandriva (lmontel@mandriva.com) to fix problems
with translations, format messages, speedup build and memory leaks with translations, format messages, speedup build and memory leaks

@ -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_device_is_caller_privileged], [LIBHAL_POLICYCHECK=yes], [LIBHAL_POLICYCHECK=no]) AC_CHECK_LIB([hal], [libhal_tqdevice_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

@ -27,7 +27,7 @@ noinst_HEADERS = \
suspenddialog.h suspenddialog.h
# let automoc handle all of the meta source files (moc) # let autotqmoc handle all of the meta source files (tqmoc)
METASOURCES = AUTO METASOURCES = AUTO
KDE_ICON = kpowersave KDE_ICON = kpowersave
@ -93,7 +93,7 @@ shellrc_DATA = eventsrc
SUBDIRS = pics SUBDIRS = pics
messages: messages:
$(EXTRACTRC) *ui eventsrc >> rc.cpp $(EXTRACTRC) *ui eventsrc >> rc.cpp
$(XGETTEXT) `find . -name \*.h -o -name \*.H -o -name \*.cpp -o -name \*.C` -o $(podir)/kpowersave.pot $(XGETTEXT) `tqfind . -name \*.h -o -name \*.H -o -name \*.cpp -o -name \*.C` -o $(podir)/kpowersave.pot
rm -f rc.cpp rm -f rc.cpp
install-data-local: install-data-local:

@ -32,8 +32,8 @@ autodimm::autodimm() : inactivity() {
lastIdleTime = 0; lastIdleTime = 0;
checkActivity = new QTimer( this ); checkActivity = new TQTimer( this );
connect( checkActivity, SIGNAL(timeout()), this, SLOT(pollActivity())); connect( checkActivity, TQT_SIGNAL(timeout()), this, TQT_SLOT(pollActivity()));
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -61,7 +61,7 @@ void autodimm::startCheckForActivity() {
} }
/*! /*!
* \b SLOT to call check if the user is active again. * \b TQT_SLOT to call check if the user is active again.
*/ */
void autodimm::pollActivity() { void autodimm::pollActivity() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);

@ -38,6 +38,7 @@
class autodimm : public inactivity class autodimm : public inactivity
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
@ -56,19 +57,19 @@ private:
//! idle time from the last check //! idle time from the last check
unsigned long lastIdleTime; unsigned long lastIdleTime;
//! QTimer intervall for the Timer to recheck for user activity //! TQTimer intervall for the Timer to recheck for user activity
/*! /*!
* The time intervall to recheck for the activity of the user. * The time intervall to recheck for the activity of the user.
* The timeslice is currently 1 sec. * The timeslice is currently 1 sec.
*/ */
static const int RECHECK_INTERVALL = 1000; static const int RECHECK_INTERVALL = 1000;
//! QTimer for check activity //! TQTimer for check activity
/*! /*!
* This timer is used to check if the user get active again. * This timer is used to check if the user get active again.
* The timerinterval is defined trough \ref RECHECK_INTERVALL . * The timerinterval is defined trough \ref RECHECK_INTERVALL .
*/ */
QTimer *checkActivity; TQTimer *checkActivity;
private slots: private slots:
//! to poll X to get info if the user is active again //! to poll X to get info if the user is active again

@ -37,6 +37,7 @@
class autosuspend : public inactivity class autosuspend : public inactivity
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>blacklistedit_Dialog</class> <class>blacklistedit_Dialog</class>
<widget class="QDialog"> <widget class="TQDialog">
<property name="name"> <property name="name">
<cstring>blacklistedit_Dialog</cstring> <cstring>blacklistedit_Dialog</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -22,15 +22,15 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>layout2</cstring> <cstring>tqlayout2</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QPushButton" row="0" column="1"> <widget class="TQPushButton" row="0" column="1">
<property name="name"> <property name="name">
<cstring>buttonOk</cstring> <cstring>buttonOk</cstring>
</property> </property>
@ -47,7 +47,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="0" column="3"> <widget class="TQPushButton" row="0" column="3">
<property name="name"> <property name="name">
<cstring>buttonCancel</cstring> <cstring>buttonCancel</cstring>
</property> </property>
@ -79,7 +79,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>305</width> <width>305</width>
<height>20</height> <height>20</height>
@ -88,7 +88,7 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<widget class="QButtonGroup" row="0" column="0"> <widget class="TQButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
<cstring>bG_scheme</cstring> <cstring>bG_scheme</cstring>
</property> </property>
@ -107,12 +107,12 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLineEdit" row="0" column="0"> <widget class="TQLineEdit" row="0" column="0">
<property name="name"> <property name="name">
<cstring>lE_blacklist</cstring> <cstring>lE_blacklist</cstring>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="0" column="1" rowspan="1" colspan="2"> <widget class="TQPushButton" row="0" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>pB_add</cstring> <cstring>pB_add</cstring>
</property> </property>
@ -120,7 +120,7 @@
<string>Add</string> <string>Add</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="1" column="1" rowspan="1" colspan="2"> <widget class="TQPushButton" row="1" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>pB_remove</cstring> <cstring>pB_remove</cstring>
</property> </property>
@ -131,7 +131,7 @@
<string></string> <string></string>
</property> </property>
</widget> </widget>
<widget class="QListBox" row="0" column="3" rowspan="3" colspan="1"> <widget class="TQListBox" row="0" column="3" rowspan="3" colspan="1">
<property name="name"> <property name="name">
<cstring>lB_blacklist</cstring> <cstring>lB_blacklist</cstring>
</property> </property>
@ -143,7 +143,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>150</height> <height>150</height>
@ -160,7 +160,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -177,14 +177,14 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>140</height> <height>140</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tLabel_info</cstring> <cstring>tLabel_info</cstring>
</property> </property>
@ -196,7 +196,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>220</width> <width>220</width>
<height>110</height> <height>110</height>
@ -205,7 +205,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -246,7 +246,7 @@
</connection> </connection>
<connection> <connection>
<sender>lB_blacklist</sender> <sender>lB_blacklist</sender>
<signal>currentChanged(QListBoxItem*)</signal> <signal>currentChanged(TQListBoxItem*)</signal>
<receiver>blacklistedit_Dialog</receiver> <receiver>blacklistedit_Dialog</receiver>
<slot>lB_blacklist_currentChanged()</slot> <slot>lB_blacklist_currentChanged()</slot>
</connection> </connection>
@ -259,17 +259,17 @@
<tabstop>pB_remove</tabstop> <tabstop>pB_remove</tabstop>
<tabstop>lB_blacklist</tabstop> <tabstop>lB_blacklist</tabstop>
</tabstops> </tabstops>
<slots> <Q_SLOTS>
<slot>buttonOk_released()</slot> <slot>buttonOk_released()</slot>
<slot>buttonCancel_released()</slot> <slot>buttonCancel_released()</slot>
<slot>buttonApply_released()</slot> <slot>buttonApply_released()</slot>
<slot>pB_remove_released()</slot> <slot>pB_remove_released()</slot>
<slot>pB_add_released()</slot> <slot>pB_add_released()</slot>
<slot>lB_blacklist_selected( QListBoxItem * )</slot> <slot>lB_blacklist_selected( TQListBoxItem * )</slot>
<slot>lE_blacklist_textChanged()</slot> <slot>lE_blacklist_textChanged()</slot>
<slot>lB_blacklist_selected()</slot> <slot>lB_blacklist_selected()</slot>
<slot>lB_blacklist_currentChanged(QListBoxItem*)</slot> <slot>lB_blacklist_currentChanged(TQListBoxItem*)</slot>
<slot>lB_blacklist_currentChanged()</slot> <slot>lB_blacklist_currentChanged()</slot>
</slots> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -32,20 +32,20 @@
#include <kiconloader.h> #include <kiconloader.h>
// QT headers: // QT headers:
#include <qbuttongroup.h> #include <tqbuttongroup.h>
#include <qdialog.h> #include <tqdialog.h>
#include <qlabel.h> #include <tqlabel.h>
#include <qlineedit.h> #include <tqlineedit.h>
#include <qlistbox.h> #include <tqlistbox.h>
#include <qpushbutton.h> #include <tqpushbutton.h>
#include <qstring.h> #include <tqstring.h>
#include <qstringlist.h> #include <tqstringlist.h>
#include <qtooltip.h> #include <tqtooltip.h>
/*! This is the default constructor of class blacklistEditDialog . */ /*! This is the default constructor of class blacklistEditDialog . */
blacklistEditDialog::blacklistEditDialog( QStringList blacklisted, QString captionName, blacklistEditDialog::blacklistEditDialog( TQStringList blacklisted, TQString captionName,
bool initImport, QWidget *parent, const char *name) bool initImport, TQWidget *tqparent, const char *name)
:blacklistedit_Dialog(parent, name, false, WDestructiveClose ) :blacklistedit_Dialog(tqparent, name, false, WDestructiveClose )
{ {
blacklist = blacklisted; blacklist = blacklisted;
@ -61,22 +61,22 @@ blacklistEditDialog::blacklistEditDialog( QStringList blacklisted, QString capti
this->bG_scheme->setTitle(captionName); this->bG_scheme->setTitle(captionName);
else else
this->bG_scheme->setTitle( i18n("Scheme: ") + captionName); this->bG_scheme->setTitle( i18n("Scheme: ") + captionName);
this->setIcon(SmallIcon("configure", QIconSet::Automatic)); this->setIcon(SmallIcon("configure", TQIconSet::Automatic));
buttonCancel->setIconSet(SmallIconSet("cancel", QIconSet::Automatic)); buttonCancel->setIconSet(SmallIconSet("cancel", TQIconSet::Automatic));
buttonOk->setIconSet(SmallIconSet("ok", QIconSet::Automatic)); buttonOk->setIconSet(SmallIconSet("ok", TQIconSet::Automatic));
pB_add->setIconSet(SmallIconSet("forward", QIconSet::Automatic)); pB_add->setIconSet(SmallIconSet("forward", TQIconSet::Automatic));
pB_remove->setIconSet(SmallIconSet("back", QIconSet::Automatic)); pB_remove->setIconSet(SmallIconSet("back", TQIconSet::Automatic));
} }
/*! This is the default destructor of class blacklistEditDialog . */ /*! This is the default destructor of class blacklistEditDialog . */
blacklistEditDialog::~blacklistEditDialog() blacklistEditDialog::~blacklistEditDialog()
{ {
// no need to delete child widgets, Qt does it all for us // no need to delete child widgets, TQt does it all for us
} }
/*! /*!
* SLOT: called if the 'ok' button clicked. This SLOT emit * SLOT: called if the 'ok' button clicked. This TQT_SLOT emit
* \ref config_finished() and close the dialog. * \ref config_finished() and close the dialog.
*/ */
void blacklistEditDialog::buttonOk_released() { void blacklistEditDialog::buttonOk_released() {
@ -90,7 +90,7 @@ void blacklistEditDialog::buttonOk_released() {
/*! /*!
* SLOT: called if the 'cancel' button clicked. This SLOT close * SLOT: called if the 'cancel' button clicked. This TQT_SLOT close
* the dialog. * the dialog.
*/ */
void blacklistEditDialog::buttonCancel_released(){ void blacklistEditDialog::buttonCancel_released(){
@ -100,8 +100,8 @@ void blacklistEditDialog::buttonCancel_released(){
/*! /*!
* SLOT: called if the 'remove' button clicked. The SLOT try to remove * SLOT: called if the 'remove' button clicked. The TQT_SLOT try to remove
* the selected item from the QListBox and the QStringList \ref blacklist . * the selected item from the TQListBox and the TQStringList \ref blacklist .
*/ */
void blacklistEditDialog::pB_remove_released(){ void blacklistEditDialog::pB_remove_released(){
@ -120,16 +120,16 @@ void blacklistEditDialog::pB_remove_released(){
/*! /*!
* SLOT: called if the 'add' button clicked. The SLOT try to add the string from * SLOT: called if the 'add' button clicked. The TQT_SLOT try to add the string from
* the QLineEdit lE_blacklist to the QListBox and the QStringList \ref blacklist . * the TQLineEdit lE_blacklist to the TQListBox and the TQStringList \ref blacklist .
*/ */
void blacklistEditDialog::pB_add_released(){ void blacklistEditDialog::pB_add_released(){
QString text = lE_blacklist->text(); TQString text = lE_blacklist->text();
// remove the whitespaces and check if text is empty // remove the whitespaces and check if text is empty
if(text.stripWhiteSpace() != "") { if(text.stripWhiteSpace() != "") {
// check if the entry is already present // check if the entry is already present
if(!lB_blacklist->findItem(text, Qt::ExactMatch)) { if(!lB_blacklist->tqfindItem(text, TQt::ExactMatch)) {
lB_blacklist->insertItem(text); lB_blacklist->insertItem(text);
lB_blacklist->sort(); lB_blacklist->sort();
blacklist.append(text); blacklist.append(text);
@ -151,7 +151,7 @@ void blacklistEditDialog::pB_add_released(){
/*! /*!
* SLOT: called if a item in the QListBox lB_blacklist is selected. * SLOT: called if a item in the TQListBox lB_blacklist is selected.
* Here we enable the remove button pB_remove . * Here we enable the remove button pB_remove .
*/ */
void blacklistEditDialog::lB_blacklist_currentChanged(){ void blacklistEditDialog::lB_blacklist_currentChanged(){

@ -37,23 +37,24 @@
class blacklistEditDialog: public blacklistedit_Dialog { class blacklistEditDialog: public blacklistedit_Dialog {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
blacklistEditDialog(QStringList blacklisted, QString captionName, bool initImport = false, blacklistEditDialog(TQStringList blacklisted, TQString captionName, bool initImport = false,
QWidget *parent = 0, const char *name = 0); TQWidget *tqparent = 0, const char *name = 0);
//! default destructor //! default destructor
~blacklistEditDialog(); ~blacklistEditDialog();
private: private:
//! QStringList with the blacklisted processes //! TQStringList with the blacklisted processes
/*! /*!
* This QStringList contains the given blacklisted processes * This TQStringList contains the given blacklisted processes
* for edit. If the dialog changed, we change also this list. * for edit. If the dialog changed, we change also this list.
*/ */
QStringList blacklist; TQStringList blacklist;
//! to tell if the blacklist was changed //! to tell if the blacklist was changed
/*! /*!
@ -76,7 +77,7 @@ private slots:
void pB_add_released(); void pB_add_released();
//! called if a item of the listbox selected //! called if a item of the listbox selected
void lB_blacklist_currentChanged(); void lB_blacklist_currentChanged();
//! called if something input in the QLineEdit //! called if something input in the TQLineEdit
void lE_blacklist_textChanged(); void lE_blacklist_textChanged();
signals: signals:
@ -85,9 +86,9 @@ signals:
/*! /*!
* This signal is emited if the configuration is finished * This signal is emited if the configuration is finished
* and the blacklist was modified- * and the blacklist was modified-
* \return QStringList (the modified blacklist) * \return TQStringList (the modified blacklist)
*/ */
void config_finished( QStringList ); void config_finished( TQStringList );
}; };

@ -5,5 +5,5 @@ AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN AC_CHECK_KDEMAXPATHLEN
AC_PATH_QT AC_PATH_QT
AC_PATH_QT_MOC_UIC AC_PATH_QT_TQMOC_UIC

File diff suppressed because it is too large Load Diff

@ -35,28 +35,28 @@
#include <kaccelmanager.h> #include <kaccelmanager.h>
// QT - Headers // QT - Headers
#include <qcheckbox.h> #include <tqcheckbox.h>
#include <qcombobox.h> #include <tqcombobox.h>
#include <qdialog.h> #include <tqdialog.h>
#include <qgroupbox.h> #include <tqgroupbox.h>
#include <qlabel.h> #include <tqlabel.h>
#include <qlineedit.h> #include <tqlineedit.h>
#include <qlistbox.h> #include <tqlistbox.h>
#include <qpushbutton.h> #include <tqpushbutton.h>
#include <qslider.h> #include <tqslider.h>
#include <qspinbox.h> #include <tqspinbox.h>
#include <qstringlist.h> #include <tqstringlist.h>
#include <qtabwidget.h> #include <tqtabwidget.h>
#include <qtoolbox.h> #include <tqtoolbox.h>
#include <qtooltip.h> #include <tqtooltip.h>
#include <qstring.h> #include <tqstring.h>
#include "configuredialog.h" #include "configuredialog.h"
/*! This is the default constructor of the class ConfigureDialog. */ /*! This is the default constructor of the class ConfigureDialog. */
ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings, ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
QWidget *parent, const char *name) TQWidget *tqparent, const char *name)
:configure_Dialog(parent, name, false, WDestructiveClose ) :configure_Dialog(tqparent, name, false, WDestructiveClose )
{ {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -65,7 +65,7 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti
hwinfo = _hwinfo; hwinfo = _hwinfo;
suspend = hwinfo->getSuspendSupport(); suspend = hwinfo->getSuspendSupport();
QString session = getenv("DESKTOP_SESSION"); TQString session = getenv("DESKTOP_SESSION");
if(session.startsWith("gnome")) gnome_session = true; if(session.startsWith("gnome")) gnome_session = true;
else gnome_session = false; else gnome_session = false;
@ -103,10 +103,10 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti
setInactivityBox(); setInactivityBox();
selectScheme(settings->currentScheme); selectScheme(settings->currentScheme);
tL_valueBrightness->setFrameStyle(QFrame::Panel | QFrame::Sunken); tL_valueBrightness->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
tL_valueBrightness->setBackgroundMode(Qt::PaletteBase); tL_valueBrightness->setBackgroundMode(TQt::PaletteBase);
tL_valueBrightness->setAlignment(Qt::AlignCenter); tL_valueBrightness->tqsetAlignment(TQt::AlignCenter);
tL_valueBrightness->setFocusPolicy(NoFocus); tL_valueBrightness->setFocusPolicy(TQ_NoFocus);
// hide Lid item if this is not a laptop // hide Lid item if this is not a laptop
if (!hwinfo->isLaptop()) if (!hwinfo->isLaptop())
@ -129,13 +129,13 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti
/*! This is the default destructor of the class ConfigureDialog. */ /*! This is the default destructor of the class ConfigureDialog. */
ConfigureDialog::~ConfigureDialog(){ ConfigureDialog::~ConfigureDialog(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
// no need to delete child widgets, Qt does it all for us // no need to delete child widgets, TQt does it all for us
} }
/* ---- START General setup SECTION ---- */ /* ---- START General setup SECTION ---- */
/*! /*!
* This used to fill the QListBox listBox_schemes and the scheme related QComboBoxes * This used to fill the TQListBox listBox_schemes and the scheme related TQComboBoxes
* with the existing schemes. * with the existing schemes.
*/ */
void ConfigureDialog::setSchemeList(){ void ConfigureDialog::setSchemeList(){
@ -145,30 +145,30 @@ void ConfigureDialog::setSchemeList(){
cB_acScheme->clear(); cB_acScheme->clear();
cB_batteryScheme->clear(); cB_batteryScheme->clear();
for ( QStringList::Iterator it = schemes.begin(); it != schemes.end(); ++it ) { for ( TQStringList::Iterator it = schemes.begin(); it != schemes.end(); ++it ) {
const char *_tmp = (*it).ascii(); const char *_tmp = (*it).ascii();
if(_tmp == "Performance" || _tmp == i18n("Performance")) { if(_tmp == "Performance" || _tmp == i18n("Performance")) {
listBox_schemes->insertItem(SmallIcon("scheme_power", QIconSet::Automatic), i18n(_tmp)); listBox_schemes->insertItem(SmallIcon("scheme_power", TQIconSet::Automatic), i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp)); cB_acScheme->insertItem(i18n(_tmp));
cB_batteryScheme->insertItem(i18n(_tmp)); cB_batteryScheme->insertItem(i18n(_tmp));
} else if(_tmp == "Powersave" || _tmp == i18n("Powersave")) { } else if(_tmp == "Powersave" || _tmp == i18n("Powersave")) {
listBox_schemes->insertItem(SmallIcon("scheme_powersave", QIconSet::Automatic), listBox_schemes->insertItem(SmallIcon("scheme_powersave", TQIconSet::Automatic),
i18n(_tmp)); i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp)); cB_acScheme->insertItem(i18n(_tmp));
cB_batteryScheme->insertItem(i18n(_tmp)); cB_batteryScheme->insertItem(i18n(_tmp));
} else if(_tmp == "Presentation" || _tmp == i18n("Presentation")){ } else if(_tmp == "Presentation" || _tmp == i18n("Presentation")){
listBox_schemes->insertItem(SmallIcon("scheme_presentation", QIconSet::Automatic), listBox_schemes->insertItem(SmallIcon("scheme_presentation", TQIconSet::Automatic),
i18n(_tmp)); i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp)); cB_acScheme->insertItem(i18n(_tmp));
cB_batteryScheme->insertItem(i18n(_tmp)); cB_batteryScheme->insertItem(i18n(_tmp));
} else if(_tmp == "Acoustic" || _tmp == i18n("Acoustic")) { } else if(_tmp == "Acoustic" || _tmp == i18n("Acoustic")) {
listBox_schemes->insertItem(SmallIcon("scheme_acoustic", QIconSet::Automatic), listBox_schemes->insertItem(SmallIcon("scheme_acoustic", TQIconSet::Automatic),
i18n(_tmp)); i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp)); cB_acScheme->insertItem(i18n(_tmp));
cB_batteryScheme->insertItem(i18n(_tmp)); cB_batteryScheme->insertItem(i18n(_tmp));
} else if(_tmp == "AdvancedPowersave" || _tmp == i18n("Advanced Powersave")) { } else if(_tmp == "AdvancedPowersave" || _tmp == i18n("Advanced Powersave")) {
listBox_schemes->insertItem(SmallIcon("scheme_advanced_powersave", listBox_schemes->insertItem(SmallIcon("scheme_advanced_powersave",
QIconSet::Automatic), i18n("Advanced Powersave")); TQIconSet::Automatic), i18n("Advanced Powersave"));
cB_acScheme->insertItem(i18n("Advanced Powersave")); cB_acScheme->insertItem(i18n("Advanced Powersave"));
cB_batteryScheme->insertItem(i18n("Advanced Powersave")); cB_batteryScheme->insertItem(i18n("Advanced Powersave"));
} else { } else {
@ -198,14 +198,14 @@ void ConfigureDialog::getSchemeList(){
/*! /*!
* This used to set the current scheme based on the name of the scheme * This used to set the current scheme based on the name of the scheme
* \param _scheme QString with the name of the scheme * \param _scheme TQString with the name of the scheme
*/ */
void ConfigureDialog::selectScheme (QString _scheme){ void ConfigureDialog::selectScheme (TQString _scheme){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
// select the current scheme in the listbox // select the current scheme in the listbox
if(!_scheme.isEmpty()) { if(!_scheme.isEmpty()) {
int pos = schemes.findIndex(_scheme); int pos = schemes.tqfindIndex(_scheme);
if(pos > -1) { if(pos > -1) {
listBox_schemes->setCurrentItem(pos); listBox_schemes->setCurrentItem(pos);
currentScheme = pos; currentScheme = pos;
@ -226,37 +226,37 @@ void ConfigureDialog::setIcons(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
/* set all Icons */ /* set all Icons */
this->setIcon(SmallIcon("kpowersave", QIconSet::Automatic)); this->setIcon(SmallIcon("kpowersave", TQIconSet::Automatic));
buttonApply->setIconSet(SmallIconSet("apply", QIconSet::Automatic)); buttonApply->setIconSet(SmallIconSet("apply", TQIconSet::Automatic));
buttonCancel->setIconSet(SmallIconSet("cancel", QIconSet::Automatic)); buttonCancel->setIconSet(SmallIconSet("cancel", TQIconSet::Automatic));
buttonOk->setIconSet(SmallIconSet("ok", QIconSet::Automatic)); buttonOk->setIconSet(SmallIconSet("ok", TQIconSet::Automatic));
buttonHelp->setIconSet(SmallIconSet("help", QIconSet::Automatic)); buttonHelp->setIconSet(SmallIconSet("help", TQIconSet::Automatic));
pB_editBlacklist->setIconSet(SmallIconSet("configure", QIconSet::Automatic)); pB_editBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
pB_editBlacklistDimm->setIconSet(SmallIconSet("configure", QIconSet::Automatic)); pB_editBlacklistDimm->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
pB_editAutosuspendGBlacklist->setIconSet(SmallIconSet("configure", QIconSet::Automatic)); pB_editAutosuspendGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
pB_editAutodimmGBlacklist->setIconSet(SmallIconSet("configure", QIconSet::Automatic)); pB_editAutodimmGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 0 ,SmallIcon("kscreensaver", QIconSet::Automatic)); tB_scheme->setItemIconSet( 0 ,SmallIcon("kscreensaver", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 1 ,SmallIcon("display", QIconSet::Automatic)); tB_scheme->setItemIconSet( 1 ,SmallIcon("display", TQIconSet::Automatic));
if(actions[0] == "Suspend to Disk") if(actions[0] == "Suspend to Disk")
tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_disk", QIconSet::Automatic)); tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_disk", TQIconSet::Automatic));
else if(actions[0] == "Suspend to RAM") else if(actions[0] == "Suspend to RAM")
tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_ram", QIconSet::Automatic)); tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_ram", TQIconSet::Automatic));
else if(actions[0] == "Standby") else if(actions[0] == "Standby")
tB_scheme->setItemIconSet( 2 ,SmallIcon("stand_by", QIconSet::Automatic)); tB_scheme->setItemIconSet( 2 ,SmallIcon("stand_by", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 3 ,SmallIcon("autodimm", QIconSet::Automatic)); tB_scheme->setItemIconSet( 3 ,SmallIcon("autodimm", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 4 ,SmallIcon("processor", QIconSet::Automatic)); tB_scheme->setItemIconSet( 4 ,SmallIcon("processor", TQIconSet::Automatic));
tB_scheme->setItemIconSet( 5 ,SmallIcon("misc", QIconSet::Automatic)); tB_scheme->setItemIconSet( 5 ,SmallIcon("misc", TQIconSet::Automatic));
tB_general->setItemIconSet( 0, SmallIcon( "scheme_powersave", QIconSet::Automatic)); tB_general->setItemIconSet( 0, SmallIcon( "scheme_powersave", TQIconSet::Automatic));
tB_general->setItemIconSet( 1, SmallIcon( "button", QIconSet::Automatic)); tB_general->setItemIconSet( 1, SmallIcon( "button", TQIconSet::Automatic));
tB_general->setItemIconSet( 2, SmallIcon( "scheme_power", QIconSet::Automatic)); tB_general->setItemIconSet( 2, SmallIcon( "scheme_power", TQIconSet::Automatic));
tB_general->setItemIconSet( 3, SmallIcon( "lock", QIconSet::Automatic)); tB_general->setItemIconSet( 3, SmallIcon( "lock", TQIconSet::Automatic));
tB_general->setItemIconSet( 4, SmallIcon( "misc", QIconSet::Automatic)); tB_general->setItemIconSet( 4, SmallIcon( "misc", TQIconSet::Automatic));
pB_configNotify->setIconSet(SmallIconSet("knotify", QIconSet::Automatic)); pB_configNotify->setIconSet(SmallIconSet("knotify", TQIconSet::Automatic));
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -267,36 +267,36 @@ void ConfigureDialog::setIcons(){
void ConfigureDialog::setTooltips(){ void ConfigureDialog::setTooltips(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
// QToolTip::setWakeUpDelay ( 1000 ); // TQToolTip::setWakeUpDelay ( 1000 );
QToolTip::add(cB_specificSettings, i18n("This enables specific screen saver settings. \n" TQToolTip::add(cB_specificSettings, i18n("This enables specific screen saver settings. \n"
"Note: If selected, the global screen saver settings are \n" "Note: If selected, the global screen saver settings are \n"
"overwritten while kpowersave runs.")); "overwritten while kpowersave runs."));
QToolTip::add(cB_disable_Ss, i18n("This disables the screen saver. \n" TQToolTip::add(cB_disable_Ss, i18n("This disables the screen saver. \n"
"Note: If selected, the global screen saver settings are \n" "Note: If selected, the global screen saver settings are \n"
"overwritten while kpowersave runs.")); "overwritten while kpowersave runs."));
QToolTip::add(cB_blankScreen, i18n("This blanks the screen instead of using a specific screen saver. \n" TQToolTip::add(cB_blankScreen, i18n("This blanks the screen instead of using a specific screen saver. \n"
"Note: This may work only with KScreensaver.")); "Note: This may work only with KScreensaver."));
QToolTip::add(cB_SpecificPM, i18n("This enables specific DPMS settings. \n" TQToolTip::add(cB_SpecificPM, i18n("This enables specific DPMS settings. \n"
"Note: If selected, the global DPMS settings are \n" "Note: If selected, the global DPMS settings are \n"
"overwritten while kpowersave runs.")); "overwritten while kpowersave runs."));
QToolTip::add(cB_disablePM, i18n("This disables DPMS support.")); TQToolTip::add(cB_disablePM, i18n("This disables DPMS support."));
QToolTip::add(cB_lockSuspend, i18n("If selected, the screen is locked on suspend or standby.")); TQToolTip::add(cB_lockSuspend, i18n("If selected, the screen is locked on suspend or standby."));
QToolTip::add(cB_lockLid, i18n("If selected, the screen is locked if the lid close event is triggered.")); TQToolTip::add(cB_lockLid, i18n("If selected, the screen is locked if the lid close event is triggered."));
QToolTip::add(cB_autoSuspend, i18n("Check this box to enable or disable automatic suspension of " TQToolTip::add(cB_autoSuspend, i18n("Check this box to enable or disable automatic suspension of "
"the computer.")); "the computer."));
QToolTip::add(cB_autoInactivity, i18n("Activate this action if the user was inactive for the defined " TQToolTip::add(cB_autoInactivity, i18n("Activate this action if the user was inactive for the defined "
"time \n(greater than 0 minutes). If empty, nothing happens.")); "time \n(greater than 0 minutes). If empty, nothing happens."));
tB_scheme->setItemToolTip ( 0, i18n("All scheme-related screen saver and DPMS settings.")); tB_scheme->setItemToolTip ( 0, i18n("All scheme-related screen saver and DPMS settings."));
tB_scheme->setItemToolTip ( 1, i18n("All scheme-related display brightness settings.")); tB_scheme->setItemToolTip ( 1, i18n("All scheme-related display brightness settings."));
tB_scheme->setItemToolTip ( 2, i18n("All scheme-related automatic suspend settings.")); tB_scheme->setItemToolTip ( 2, i18n("All scheme-related automatic suspend settings."));
QToolTip::add(brightnessSlider, i18n("Here you can change the brightness of your display. \n" TQToolTip::add(brightnessSlider, i18n("Here you can change the brightness of your display. \n"
"Use the slider to change the brightness directly for \n" "Use the slider to change the brightness directly for \n"
"testing. To reset back to previous level, please press \n" "testing. To reset back to previous level, please press \n"
"the 'Reset' button. ")); "the 'Reset' button. "));
QToolTip::add(pB_resetBrightness, i18n("Use this button to set back the slider and the " TQToolTip::add(pB_resetBrightness, i18n("Use this button to set back the slider and the "
"display brightness.")); "display brightness."));
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
@ -307,12 +307,12 @@ void ConfigureDialog::setTooltips(){
* This is a workaround for the case if Yast translated the name of the * This is a workaround for the case if Yast translated the name of the
* scheme In this case is a new config section created and the old settings * scheme In this case is a new config section created and the old settings
* would be lost. * would be lost.
* \param s_scheme QString with the 'current' name of the scheme * \param s_scheme TQString with the 'current' name of the scheme
* \return QString with the english name of the scheme * \return TQString with the english name of the scheme
*/ */
QString ConfigureDialog::getSchemeRealName(QString s_scheme) { TQString ConfigureDialog::getSchemeRealName(TQString s_scheme) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString ret = s_scheme; TQString ret = s_scheme;
if( s_scheme == "Performance" || s_scheme == i18n("Performance")) if( s_scheme == "Performance" || s_scheme == i18n("Performance"))
ret = "Performance"; ret = "Performance";
@ -331,14 +331,14 @@ QString ConfigureDialog::getSchemeRealName(QString s_scheme) {
* This function is used to read the settings from configfile and * This function is used to read the settings from configfile and
* set the values to the related dialog elements. * set the values to the related dialog elements.
* \param schemeID Integer value, represent the position of the * \param schemeID Integer value, represent the position of the
* scheme in the QListBox and within the pdaemon-list. * scheme in the TQListBox and within the pdaemon-list.
*/ */
void ConfigureDialog::setConfigToDialog( int schemeID ){ void ConfigureDialog::setConfigToDialog( int schemeID ){
if (trace) kdDebug() << funcinfo << "IN , scheme: " << schemeID << endl; if (trace) kdDebug() << funcinfo << "IN , scheme: " << schemeID << endl;
initalised = false; initalised = false;
QString s_scheme = getSchemeRealName(schemes[schemeID]); TQString s_scheme = getSchemeRealName(schemes[schemeID]);
if (kconfig->hasGroup(s_scheme)){ if (kconfig->hasGroup(s_scheme)){
settings->load_general_settings(); settings->load_general_settings();
@ -349,18 +349,18 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
!s_scheme.startsWith(settings->battery_scheme)) { !s_scheme.startsWith(settings->battery_scheme)) {
// enable delete button // enable delete button
pB_deleteScheme->setEnabled( true ); pB_deleteScheme->setEnabled( true );
QToolTip::add(pB_deleteScheme, i18n("Press this button to delete the " TQToolTip::add(pB_deleteScheme, i18n("Press this button to delete the "
"selected scheme.")); "selected scheme."));
} else { } else {
// disable button // disable button
pB_deleteScheme->setEnabled( false ); pB_deleteScheme->setEnabled( false );
QToolTip::add(pB_deleteScheme, i18n("You can't delete the current AC " TQToolTip::add(pB_deleteScheme, i18n("You can't delete the current AC "
"or battery scheme.")); "or battery scheme."));
} }
} else { } else {
// disable button, can't delete these scheme, they are default // disable button, can't delete these scheme, they are default
pB_deleteScheme->setEnabled( false ); pB_deleteScheme->setEnabled( false );
QToolTip::add(pB_deleteScheme, i18n("You can't delete this default scheme.")); TQToolTip::add(pB_deleteScheme, i18n("You can't delete this default scheme."));
} }
kconfig->setGroup(s_scheme); kconfig->setGroup(s_scheme);
@ -449,9 +449,9 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
cB_disablePM_toggled(kconfig->readBoolEntry("disableDPMS",false)); cB_disablePM_toggled(kconfig->readBoolEntry("disableDPMS",false));
// set autosuspend related settings // set autosuspend related settings
QString _action = kconfig->readEntry("autoInactiveAction", "NULL"); TQString _action = kconfig->readEntry("autoInactiveAction", "NULL");
if( _action != "NULL") { if( _action != "NULL") {
int _index = actions.findIndex(_action); int _index = actions.tqfindIndex(_action);
if( _index != -1) { if( _index != -1) {
cB_autoInactivity->setCurrentItem( _index ); cB_autoInactivity->setCurrentItem( _index );
cB_autoInactivity_activated( _index ); cB_autoInactivity_activated( _index );
@ -473,7 +473,7 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
kconfig->setGroup("default-scheme"); kconfig->setGroup("default-scheme");
_action = kconfig->readEntry("autoInactiveAction", "NULL"); _action = kconfig->readEntry("autoInactiveAction", "NULL");
if(_action != "NULL") { if(_action != "NULL") {
int _index = actions.findIndex(_action); int _index = actions.tqfindIndex(_action);
if( _index != -1) { if( _index != -1) {
cB_autoInactivity->setCurrentItem( _index ); cB_autoInactivity->setCurrentItem( _index );
tL_autoInactivity_After->setEnabled(true); tL_autoInactivity_After->setEnabled(true);
@ -536,11 +536,11 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
int i_brightnessPercent = kconfig->readNumEntry("brightnessPercent", -1); int i_brightnessPercent = kconfig->readNumEntry("brightnessPercent", -1);
if(i_brightnessPercent >= 0) { if(i_brightnessPercent >= 0) {
brightnessSlider->setValue(i_brightnessPercent); brightnessSlider->setValue(i_brightnessPercent);
tL_valueBrightness->setText(QString::number(i_brightnessPercent) + " %"); tL_valueBrightness->setText(TQString::number(i_brightnessPercent) + " %");
} }
else { else {
brightnessSlider->setValue(100); brightnessSlider->setValue(100);
tL_valueBrightness->setText(QString::number(100)+ " %"); tL_valueBrightness->setText(TQString::number(100)+ " %");
} }
tL_brightness->setText(i18n("Your hardware supports to change the brightness. The " tL_brightness->setText(i18n("Your hardware supports to change the brightness. The "
@ -602,7 +602,7 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){
} }
if (hwinfo->supportCPUFreq()) { if (hwinfo->supportCPUFreq()) {
QString cpuFreqPolicy = kconfig->readEntry("cpuFreqPolicy"); TQString cpuFreqPolicy = kconfig->readEntry("cpuFreqPolicy");
if (cpuFreqPolicy.isEmpty()) { if (cpuFreqPolicy.isEmpty()) {
// load value from default-scheme // load value from default-scheme
@ -659,7 +659,7 @@ void ConfigureDialog::setGeneralSettings() {
cB_autostart->setChecked(kconfig->readBoolEntry("Autostart",false)); cB_autostart->setChecked(kconfig->readBoolEntry("Autostart",false));
cB_autostart_neverAsk->setChecked(kconfig->readBoolEntry("AutostartNeverAsk",false)); cB_autostart_neverAsk->setChecked(kconfig->readBoolEntry("AutostartNeverAsk",false));
QString lockmethod = kconfig->readEntry("lockMethod", "NULL"); TQString lockmethod = kconfig->readEntry("lockMethod", "NULL");
if(comboB_lock->count() == 0 ){ if(comboB_lock->count() == 0 ){
comboB_lock->insertItem(i18n("Select Automatically"),0); comboB_lock->insertItem(i18n("Select Automatically"),0);
comboB_lock->insertItem(i18n("KScreensaver"),1); comboB_lock->insertItem(i18n("KScreensaver"),1);
@ -696,21 +696,21 @@ void ConfigureDialog::setGeneralSettings() {
sB_batLowAction_value->hide(); sB_batLowAction_value->hide();
sB_batCritAction_value->hide(); sB_batCritAction_value->hide();
QString _select; TQString _select;
QStringList _actions = kconfig->readListEntry("batteryAllowedActions", QString()); TQStringList _actions = kconfig->readListEntry("batteryAllowedActions", TQString());
_select = kconfig->readEntry("batteryWarningAction", QString()); _select = kconfig->readEntry("batteryWarningAction", TQString());
fillActionComboBox(cB_batWarning, _actions, _select); fillActionComboBox(cB_batWarning, _actions, _select);
if (_select == "BRIGHTNESS" && hwinfo->supportBrightness()) { if (_select == "BRIGHTNESS" && hwinfo->supportBrightness()) {
sB_batWarnAction_value->show(); sB_batWarnAction_value->show();
sB_batWarnAction_value->setValue(kconfig->readNumEntry( "batteryWarningActionValue",0)); sB_batWarnAction_value->setValue(kconfig->readNumEntry( "batteryWarningActionValue",0));
} }
_select = kconfig->readEntry("batteryLowAction", QString()); _select = kconfig->readEntry("batteryLowAction", TQString());
fillActionComboBox(cB_batLow, _actions, _select); fillActionComboBox(cB_batLow, _actions, _select);
if (_select == "BRIGHTNESS" && hwinfo->supportBrightness()) { if (_select == "BRIGHTNESS" && hwinfo->supportBrightness()) {
sB_batLowAction_value->show(); sB_batLowAction_value->show();
sB_batLowAction_value->setValue( kconfig->readNumEntry( "batteryLowActionValue",0)); sB_batLowAction_value->setValue( kconfig->readNumEntry( "batteryLowActionValue",0));
} }
_select = kconfig->readEntry("batteryCriticalAction", QString()); _select = kconfig->readEntry("batteryCriticalAction", TQString());
fillActionComboBox(cB_batCritical, _actions, _select); fillActionComboBox(cB_batCritical, _actions, _select);
if (_select == "BRIGHTNESS" && hwinfo->supportBrightness()) { if (_select == "BRIGHTNESS" && hwinfo->supportBrightness()) {
sB_batCritAction_value->show(); sB_batCritAction_value->show();
@ -723,19 +723,19 @@ void ConfigureDialog::setGeneralSettings() {
} }
// buttons tab: // buttons tab:
QStringList _actions = kconfig->readListEntry("buttonsAllowedActions", QString()); TQStringList _actions = kconfig->readListEntry("buttonsAllowedActions", TQString());
fillActionComboBox(cB_PowerButton, _actions, kconfig->readEntry("ActionOnPowerButton", QString())); fillActionComboBox(cB_PowerButton, _actions, kconfig->readEntry("ActionOnPowerButton", TQString()));
fillActionComboBox(cB_SleepButton, _actions, kconfig->readEntry("ActionOnSleepButton", QString())); fillActionComboBox(cB_SleepButton, _actions, kconfig->readEntry("ActionOnSleepButton", TQString()));
fillActionComboBox(cB_S2DiskButton, _actions, kconfig->readEntry("ActionOnS2DiskButton", QString())); fillActionComboBox(cB_S2DiskButton, _actions, kconfig->readEntry("ActionOnS2DiskButton", TQString()));
// avoid logout dialog for lidclose - this make no sense // avoid logout dialog for lidclose - this make no sense
_actions.remove("LOGOUT_DIALOG"); _actions.remove("LOGOUT_DIALOG");
fillActionComboBox(cB_LidcloseButton, _actions, kconfig->readEntry("ActionOnLidClose", QString())); fillActionComboBox(cB_LidcloseButton, _actions, kconfig->readEntry("ActionOnLidClose", TQString()));
// default scheme tab: // default scheme tab:
QString _ac_scheme = kconfig->readEntry( "ac_scheme", "Performance"); TQString _ac_scheme = kconfig->readEntry( "ac_scheme", "Performance");
QString _bat_scheme = kconfig->readEntry( "battery_scheme", "Powersave"); TQString _bat_scheme = kconfig->readEntry( "battery_scheme", "Powersave");
cB_acScheme->setCurrentItem(schemes.findIndex(_ac_scheme)); cB_acScheme->setCurrentItem(schemes.tqfindIndex(_ac_scheme));
cB_batteryScheme->setCurrentItem(schemes.findIndex(_bat_scheme)); cB_batteryScheme->setCurrentItem(schemes.tqfindIndex(_bat_scheme));
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -750,7 +750,7 @@ void ConfigureDialog::setGeneralSettings() {
void ConfigureDialog::saveSchemeSettings() { void ConfigureDialog::saveSchemeSettings() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString s_scheme = getSchemeRealName(schemes[currentScheme]); TQString s_scheme = getSchemeRealName(schemes[currentScheme]);
kconfig->setGroup(s_scheme); kconfig->setGroup(s_scheme);
kconfig->writeEntry("specSsSettings",cB_specificSettings->isOn()); kconfig->writeEntry("specSsSettings",cB_specificSettings->isOn());
@ -829,7 +829,7 @@ void ConfigureDialog::saveGeneralSettings() {
kconfig->writeEntry("Autostart",cB_autostart->isOn()); kconfig->writeEntry("Autostart",cB_autostart->isOn());
kconfig->writeEntry("AutostartNeverAsk",cB_autostart_neverAsk->isOn()); kconfig->writeEntry("AutostartNeverAsk",cB_autostart_neverAsk->isOn());
QString selected_method = ""; TQString selected_method = "";
int _selected = comboB_lock->currentItem(); int _selected = comboB_lock->currentItem();
if(_selected == 0) selected_method = "automatic"; if(_selected == 0) selected_method = "automatic";
else if(_selected == 1) selected_method = "kscreensaver"; else if(_selected == 1) selected_method = "kscreensaver";
@ -843,7 +843,7 @@ void ConfigureDialog::saveGeneralSettings() {
kconfig->writeEntry("batteryCritical", sB_batCritical->value()); kconfig->writeEntry("batteryCritical", sB_batCritical->value());
// battery level tab // battery level tab
QString _action = mapDescriptionToAction(cB_batWarning->currentText()); TQString _action = mapDescriptionToAction(cB_batWarning->currentText());
kconfig->writeEntry("batteryWarningAction", _action); kconfig->writeEntry("batteryWarningAction", _action);
if (_action == "BRIGHTNESS") { if (_action == "BRIGHTNESS") {
kconfig->writeEntry("batteryWarningActionValue", sB_batWarnAction_value->value()); kconfig->writeEntry("batteryWarningActionValue", sB_batWarnAction_value->value());
@ -918,7 +918,7 @@ void ConfigureDialog::scheme_valueChanged(){
} }
/*! /*!
* SLOT: called if the current scheme in the QListBox listBox_schemes is * SLOT: called if the current scheme in the TQListBox listBox_schemes is
* changed/ a other scheme was selected. * changed/ a other scheme was selected.
*/ */
void ConfigureDialog::listBox_schemes_currentChanged(){ void ConfigureDialog::listBox_schemes_currentChanged(){
@ -1028,21 +1028,21 @@ void ConfigureDialog::pB_newScheme_clicked(){
bool _ok = false; bool _ok = false;
bool _end = false; bool _end = false;
QString _new; TQString _new;
QString _text = i18n("Please insert a name for the new scheme:"); TQString _text = i18n("Please insert a name for the new scheme:");
QString _error; TQString _error;
getSchemeList(); getSchemeList();
while (!_end) { while (!_end) {
_new = KInputDialog::getText( i18n("KPowersave Configuration"), _new = KInputDialog::getText( i18n("KPowersave Configuration"),
_error + _text, QString::null, &_ok, this); _error + _text, TQString(), &_ok, this);
if (!_ok ) { if (!_ok ) {
_end = true; _end = true;
} else { } else {
_error = QString(); _error = TQString();
if (!_new.isEmpty()) { if (!_new.isEmpty()) {
if ( schemes.contains(_new)) if ( schemes.tqcontains(_new))
_error = i18n("Error: A scheme with this name already exist.\n"); _error = i18n("Error: A scheme with this name already exist.\n");
else else
_end = true; _end = true;
@ -1074,12 +1074,12 @@ 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?").arg(schemes[currentScheme]), "%1 scheme?").tqarg(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) {
// delete the scheme, we can be sure this is a userscheme // delete the scheme, we can be sure this is a userscheme
QString _s_tmp = getSchemeRealName(schemes[currentScheme]); TQString _s_tmp = getSchemeRealName(schemes[currentScheme]);
if (kconfig->hasGroup(_s_tmp) && kconfig->deleteGroup(_s_tmp)) { if (kconfig->hasGroup(_s_tmp) && kconfig->deleteGroup(_s_tmp)) {
schemes.remove(_s_tmp); schemes.remove(_s_tmp);
kconfig->setGroup("General"); kconfig->setGroup("General");
@ -1105,7 +1105,7 @@ void ConfigureDialog::pB_deleteScheme_clicked(){
/* ---- START SCREENSAVER SECTION ---- */ /* ---- START SCREENSAVER SECTION ---- */
/*! /*!
* SLOT: called if QCheckBox cB_specificSettings is toggled. * SLOT: called if TQCheckBox cB_specificSettings is toggled.
* \param state boolean, true if toggled on * \param state boolean, true if toggled on
* false if toggled off * false if toggled off
*/ */
@ -1133,7 +1133,7 @@ void ConfigureDialog::cB_specificSettings_toggled(bool state){
} }
/*! /*!
* SLOT: called if QCheckBox cB_disable_Ss is toggled. * SLOT: called if TQCheckBox cB_disable_Ss is toggled.
* \param state boolean, true if toggled on * \param state boolean, true if toggled on
* false if toggled off * false if toggled off
*/ */
@ -1153,7 +1153,7 @@ void ConfigureDialog::cB_disable_Ss_toggled(bool state){
/* ---- START DPMS SECTION ---- */ /* ---- START DPMS SECTION ---- */
/*! /*!
* SLOT: called if QCheckBox cB_SpecificPM is toggled. * SLOT: called if TQCheckBox cB_SpecificPM is toggled.
* \param state boolean, true if toggled on * \param state boolean, true if toggled on
* false if toggled offtrue * false if toggled offtrue
*/ */
@ -1178,7 +1178,7 @@ void ConfigureDialog::cB_SpecificPM_toggled(bool state){
} }
/*! /*!
* SLOT: called if QCheckBox cB_disablePM is toggled. * SLOT: called if TQCheckBox cB_disablePM is toggled.
* \param state boolean, true if toggled on * \param state boolean, true if toggled on
* false if toggled off * false if toggled off
*/ */
@ -1199,7 +1199,7 @@ void ConfigureDialog::cB_disablePM_toggled(bool state){
} }
/*! /*!
* SLOT: called if the standby QSpinBoxes for DPMS timout is changed. * SLOT: called if the standby TQSpinBoxes for DPMS timout is changed.
*/ */
void ConfigureDialog::sB_standby_valueChanged() { void ConfigureDialog::sB_standby_valueChanged() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1216,7 +1216,7 @@ void ConfigureDialog::sB_standby_valueChanged() {
} }
/*! /*!
* SLOT: called if the suspend QSpinBoxes for DPMS timout is changed. * SLOT: called if the suspend TQSpinBoxes for DPMS timout is changed.
*/ */
void ConfigureDialog::sB_suspend_valueChanged() { void ConfigureDialog::sB_suspend_valueChanged() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1237,7 +1237,7 @@ void ConfigureDialog::sB_suspend_valueChanged() {
} }
/*! /*!
* SLOT: called if the powerOff QSpinBoxes for DPMS timout is changed. * SLOT: called if the powerOff TQSpinBoxes for DPMS timout is changed.
*/ */
void ConfigureDialog::sB_powerOff_valueChanged() { void ConfigureDialog::sB_powerOff_valueChanged() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1267,10 +1267,10 @@ void ConfigureDialog::setInactivityBox(){
// add "nothing" at start of the list // add "nothing" at start of the list
actions.push_front(" "); actions.push_front(" ");
// add "Turn Off Computer" at end of the list // add "Turn Off Computer" at end of the list
// QString _to_i18n = i18n("Turn Off Computer"); // TQString _to_i18n = i18n("Turn Off Computer");
// actions.append("Turn Off Computer"); // actions.append("Turn Off Computer");
for ( QStringList::Iterator it = actions.begin(); it != actions.end(); ++it ) { for ( TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it ) {
cB_autoInactivity->insertItem( i18n( (*it).ascii() ) ); cB_autoInactivity->insertItem( i18n( (*it).ascii() ) );
} }
@ -1321,7 +1321,7 @@ void ConfigureDialog::cB_autoInactivity_activated( int selectedItem ) {
if( actions[selectedItem] != " " ) { if( actions[selectedItem] != " " ) {
if(!displayed_WARN_autosuspend && initalised) { if(!displayed_WARN_autosuspend && initalised) {
QString _msg = "<qt>" + i18n("<b>Note:</b> If you select this option, the computer " TQString _msg = "<qt>" + i18n("<b>Note:</b> If you select this option, the computer "
"will suspend or standby if the current user is " "will suspend or standby if the current user is "
"inactive for the defined time even if somebody is " "inactive for the defined time even if somebody is "
"logged in remotely to the X server.<br><br> This " "logged in remotely to the X server.<br><br> This "
@ -1388,20 +1388,20 @@ void ConfigureDialog::cB_Blacklist_toggled( bool toggled ){
void ConfigureDialog::pB_editBlacklistSuspend_clicked(){ void ConfigureDialog::pB_editBlacklistSuspend_clicked(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString _top_text = ""; TQString _top_text = "";
bool initialiseImport = false; bool initialiseImport = false;
if(tabWidget->currentPageIndex() == 0 ) { if(tabWidget->currentPageIndex() == 0 ) {
QString s_scheme = getSchemeRealName(schemes[listBox_schemes->currentItem()]); TQString s_scheme = getSchemeRealName(schemes[listBox_schemes->currentItem()]);
_top_text = listBox_schemes->currentText(); _top_text = listBox_schemes->currentText();
if (kconfig->hasGroup(s_scheme)){ if (kconfig->hasGroup(s_scheme)){
kconfig->setGroup(s_scheme); kconfig->setGroup(s_scheme);
} }
blacklist = kconfig->readListEntry("autoInactiveSchemeBlacklist", ','); blacklist = kconfig->readListEntry("autoInactiveSchemeBlacklist", ',');
if( blacklist.empty()) { if( blacklist.empty()) {
QString _msg = i18n("The blacklist of the selected scheme is empty. " TQString _msg = i18n("The blacklist of the selected scheme is empty. "
"Import the general blacklist?"); "Import the general blacklist?");
int tmp = KMessageBox::questionYesNo(this, _msg, QString(), i18n("Import"), i18n("Do Not Import")); int tmp = KMessageBox::questionYesNo(this, _msg, TQString(), i18n("Import"), i18n("Do Not Import"));
if (tmp == KMessageBox::Yes) { if (tmp == KMessageBox::Yes) {
initialiseImport = true; initialiseImport = true;
if(kconfig->hasGroup("General")){ if(kconfig->hasGroup("General")){
@ -1420,24 +1420,24 @@ void ConfigureDialog::pB_editBlacklistSuspend_clicked(){
} }
blacklistEDlgAS = new blacklistEditDialog(blacklist, _top_text, initialiseImport, this); blacklistEDlgAS = new blacklistEditDialog(blacklist, _top_text, initialiseImport, this);
connect( blacklistEDlgAS, SIGNAL(config_finished(QStringList)), this, connect( blacklistEDlgAS, TQT_SIGNAL(config_finished(TQStringList)), this,
SLOT(saveSchemeSuspendBlacklist(QStringList))); TQT_SLOT(saveSchemeSuspendBlacklist(TQStringList)));
blacklistEDlgAS->exec(); blacklistEDlgAS->exec();
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
/*! /*!
* SLOT: Called if the signal config_finished(QStringList) recieved * SLOT: Called if the signal config_finished(TQStringList) recieved
* and the autosuspend blacklist is edited. * and the autosuspend blacklist is edited.
* \param new_blacklist QStringlist with the edited blacklisted processes * \param new_blacklist TQStringlist with the edited blacklisted processes
*/ */
void ConfigureDialog::saveSchemeSuspendBlacklist( QStringList new_blacklist){ void ConfigureDialog::saveSchemeSuspendBlacklist( TQStringList new_blacklist){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if(tabWidget->currentPageIndex() == 0 ) { if(tabWidget->currentPageIndex() == 0 ) {
QString s_scheme = getSchemeRealName(schemes[currentScheme]); TQString s_scheme = getSchemeRealName(schemes[currentScheme]);
kconfig->setGroup(s_scheme); kconfig->setGroup(s_scheme);
kconfig->writeEntry("autoInactiveSchemeBlacklist", new_blacklist, ','); kconfig->writeEntry("autoInactiveSchemeBlacklist", new_blacklist, ',');
} }
@ -1518,20 +1518,20 @@ void ConfigureDialog::cB_BlacklistDimm_toggled( bool toggled ){
void ConfigureDialog::pB_editBlacklistDimm_clicked(){ void ConfigureDialog::pB_editBlacklistDimm_clicked(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString _top_text = ""; TQString _top_text = "";
bool initialiseImport = false; bool initialiseImport = false;
if(tabWidget->currentPageIndex() == 0 ) { if(tabWidget->currentPageIndex() == 0 ) {
QString s_scheme = getSchemeRealName(schemes[listBox_schemes->currentItem()]); TQString s_scheme = getSchemeRealName(schemes[listBox_schemes->currentItem()]);
_top_text = listBox_schemes->currentText(); _top_text = listBox_schemes->currentText();
if (kconfig->hasGroup(s_scheme)){ if (kconfig->hasGroup(s_scheme)){
kconfig->setGroup(s_scheme); kconfig->setGroup(s_scheme);
} }
blacklist = kconfig->readListEntry("autoDimmSchemeBlacklist", ','); blacklist = kconfig->readListEntry("autoDimmSchemeBlacklist", ',');
if( blacklist.empty()) { if( blacklist.empty()) {
QString _msg = i18n("The blacklist of the selected scheme is empty. " TQString _msg = i18n("The blacklist of the selected scheme is empty. "
"Import the general blacklist?"); "Import the general blacklist?");
int tmp = KMessageBox::questionYesNo(this, _msg, QString(), i18n("Import"), i18n("Do Not Import")); int tmp = KMessageBox::questionYesNo(this, _msg, TQString(), i18n("Import"), i18n("Do Not Import"));
if (tmp == KMessageBox::Yes) { if (tmp == KMessageBox::Yes) {
initialiseImport = true; initialiseImport = true;
if(kconfig->hasGroup("General")){ if(kconfig->hasGroup("General")){
@ -1550,23 +1550,23 @@ void ConfigureDialog::pB_editBlacklistDimm_clicked(){
} }
blacklistEDlgAD = new blacklistEditDialog(blacklist, _top_text, initialiseImport, this); blacklistEDlgAD = new blacklistEditDialog(blacklist, _top_text, initialiseImport, this);
connect( blacklistEDlgAD, SIGNAL(config_finished(QStringList)), this, connect( blacklistEDlgAD, TQT_SIGNAL(config_finished(TQStringList)), this,
SLOT(saveSchemeDimmBlacklist(QStringList))); TQT_SLOT(saveSchemeDimmBlacklist(TQStringList)));
blacklistEDlgAD->exec(); blacklistEDlgAD->exec();
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
/*! /*!
* SLOT: Called if the signal config_finished(QStringList) recieved * SLOT: Called if the signal config_finished(TQStringList) recieved
* and the autdimm blacklist is edited. * and the autdimm blacklist is edited.
* \param new_blacklist QStringlist with the edited blacklisted processes * \param new_blacklist TQStringlist with the edited blacklisted processes
*/ */
void ConfigureDialog::saveSchemeDimmBlacklist( QStringList new_blacklist){ void ConfigureDialog::saveSchemeDimmBlacklist( TQStringList new_blacklist){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if(tabWidget->currentPageIndex() == 0 ) { if(tabWidget->currentPageIndex() == 0 ) {
QString s_scheme = getSchemeRealName(schemes[currentScheme]); TQString s_scheme = getSchemeRealName(schemes[currentScheme]);
kconfig->setGroup(s_scheme); kconfig->setGroup(s_scheme);
kconfig->writeEntry("autoDimmSchemeBlacklist", new_blacklist, ','); kconfig->writeEntry("autoDimmSchemeBlacklist", new_blacklist, ',');
} }
@ -1615,7 +1615,7 @@ void ConfigureDialog::cB_Brightness_toggled( bool toggled ) {
gB_Brightness->setEnabled(toggled); gB_Brightness->setEnabled(toggled);
cB_Brightness->setChecked(toggled); cB_Brightness->setChecked(toggled);
connect(brightnessSlider, SIGNAL(valueChanged (int)), this, SLOT(brightnessSlider_sliderMoved(int))); connect(brightnessSlider, TQT_SIGNAL(valueChanged (int)), this, TQT_SLOT(brightnessSlider_sliderMoved(int)));
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -1626,7 +1626,7 @@ void ConfigureDialog::brightnessSlider_sliderMoved( int new_value ) {
if (cB_Brightness->isEnabled() && cB_Brightness->isChecked()) { if (cB_Brightness->isEnabled() && cB_Brightness->isChecked()) {
scheme_valueChanged(); scheme_valueChanged();
tL_valueBrightness->setText(QString::number(new_value) + " %"); tL_valueBrightness->setText(TQString::number(new_value) + " %");
hwinfo->setBrightness(-1, new_value); hwinfo->setBrightness(-1, new_value);
pB_resetBrightness->setEnabled(true); pB_resetBrightness->setEnabled(true);
brightness_changed = true; brightness_changed = true;
@ -1651,7 +1651,7 @@ void ConfigureDialog::pB_resetBrightness_clicked( ) {
/* ---- START battery level SECTION ---- */ /* ---- START battery level SECTION ---- */
/*! /*!
* SLOT: called if the warning QSpinBoxes for battery level is changed. * SLOT: called if the warning TQSpinBoxes for battery level is changed.
*/ */
void ConfigureDialog::sB_batWarning_valueChanged() { void ConfigureDialog::sB_batWarning_valueChanged() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1668,7 +1668,7 @@ void ConfigureDialog::sB_batWarning_valueChanged() {
} }
/*! /*!
* SLOT: called if the low QSpinBoxes for battery level is changed. * SLOT: called if the low TQSpinBoxes for battery level is changed.
*/ */
void ConfigureDialog::sB_batLow_valueChanged() { void ConfigureDialog::sB_batLow_valueChanged() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1689,7 +1689,7 @@ void ConfigureDialog::sB_batLow_valueChanged() {
} }
/*! /*!
* SLOT: called if the critical QSpinBoxes for battery level is changed. * SLOT: called if the critical TQSpinBoxes for battery level is changed.
*/ */
void ConfigureDialog::sB_batCritical_valueChanged() { void ConfigureDialog::sB_batCritical_valueChanged() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1706,8 +1706,8 @@ void ConfigureDialog::sB_batCritical_valueChanged() {
} }
/*! /*!
* SLOT: called if the QComboBox 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 QSpinboxes if needed. * used to hide/show the related TQSpinboxes if needed.
*/ */
void ConfigureDialog::cB_batWarning_activated() { void ConfigureDialog::cB_batWarning_activated() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1721,9 +1721,9 @@ void ConfigureDialog::cB_batWarning_activated() {
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
//! called if the QComboBox for the battery low level action changed //! called if the TQComboBox for the battery low level action changed
/*! /*!
* used to hide/show the related QSpinboxes if needed. * used to hide/show the related TQSpinboxes if needed.
*/ */
void ConfigureDialog::cB_batLow_activated() { void ConfigureDialog::cB_batLow_activated() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1738,8 +1738,8 @@ void ConfigureDialog::cB_batLow_activated() {
} }
/*! /*!
* SLOT: called if the QComboBox 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 QSpinboxes if needed. * used to hide/show the related TQSpinboxes if needed.
*/ */
void ConfigureDialog::cB_batCritical_activated() { void ConfigureDialog::cB_batCritical_activated() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -1767,31 +1767,31 @@ void ConfigureDialog::pB_configNotify_released( ) {
/* ---- START helper functions SECTION ---- */ /* ---- START helper functions SECTION ---- */
/*! /*!
* Map the key from config for a action to a descriptive name. * Map the key from config for a action to a descriptive name.
* \param action QString with the config key value * \param action TQString with the config key value
* \return QString with the description * \return TQString with the description
*/ */
QString ConfigureDialog::mapActionToDescription( QString action ) { TQString ConfigureDialog::mapActionToDescription( TQString action ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString ret; TQString ret;
if (action.startsWith("SHUTDOWN")) { if (action.startsWith("SHUTDOWN")) {
ret = i18n("Shutdown"); ret = i18n("Shutdown");
} else if (action.startsWith("LOGOUT_DIALOG")) { } else if (action.startsWith("LOGOUT_DIALOG")) {
ret = i18n("Logout Dialog"); ret = i18n("Logout Dialog");
} else if (action.startsWith("SUSPEND2DISK")) { } else if (action.startsWith("SUSPEND2DISK")) {
if (actions.contains("Suspend to Disk")) if (actions.tqcontains("Suspend to Disk"))
ret = i18n("Suspend to Disk"); ret = i18n("Suspend to Disk");
} else if (action.startsWith("SUSPEND2RAM")) { } else if (action.startsWith("SUSPEND2RAM")) {
if (actions.contains("Suspend to RAM")) if (actions.tqcontains("Suspend to RAM"))
ret = i18n("Suspend to RAM"); ret = i18n("Suspend to RAM");
} else if (action.startsWith("CPUFREQ_POWERSAVE")) { } else if (action.startsWith("CPUFRETQ_POWERSAVE")) {
if (hwinfo->supportCPUFreq()) if (hwinfo->supportCPUFreq())
ret = i18n("CPU Powersave policy"); ret = i18n("CPU Powersave policy");
} else if (action.startsWith("CPUFREQ_DYNAMIC")) { } else if (action.startsWith("CPUFRETQ_DYNAMIC")) {
if (hwinfo->supportCPUFreq()) if (hwinfo->supportCPUFreq())
ret = i18n("CPU Dynamic policy"); ret = i18n("CPU Dynamic policy");
} else if (action.startsWith("CPUFREQ_PERFORMANCE")) { } else if (action.startsWith("CPUFRETQ_PERFORMANCE")) {
if (hwinfo->supportCPUFreq()) if (hwinfo->supportCPUFreq())
ret = i18n("CPU Performance policy"); ret = i18n("CPU Performance policy");
} else if (action.startsWith("BRIGHTNESS")) { } else if (action.startsWith("BRIGHTNESS")) {
@ -1804,14 +1804,14 @@ QString ConfigureDialog::mapActionToDescription( QString action ) {
} }
/*! /*!
* Map the action description (maybe translated) back to a QString key for the config. * Map the action description (maybe translated) back to a TQString key for the config.
* \param description QString with the description * \param description TQString with the description
* \return QString with the config key value * \return TQString with the config key value
*/ */
QString ConfigureDialog::mapDescriptionToAction( QString description ) { TQString ConfigureDialog::mapDescriptionToAction( TQString description ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString ret; TQString ret;
if (description.startsWith("Shutdown") || description.startsWith(i18n("Shutdown"))) { if (description.startsWith("Shutdown") || description.startsWith(i18n("Shutdown"))) {
ret = "SHUTDOWN"; ret = "SHUTDOWN";
@ -1826,13 +1826,13 @@ QString ConfigureDialog::mapDescriptionToAction( QString description ) {
ret = "SUSPEND2RAM"; ret = "SUSPEND2RAM";
} else if (description.startsWith("CPU Powersave policy") || } else if (description.startsWith("CPU Powersave policy") ||
description.startsWith(i18n("CPU Powersave policy"))) { description.startsWith(i18n("CPU Powersave policy"))) {
ret = "CPUFREQ_POWERSAVE"; ret = "CPUFRETQ_POWERSAVE";
} else if (description.startsWith("CPU Dynamic policy") || } else if (description.startsWith("CPU Dynamic policy") ||
description.startsWith(i18n("CPU Dynamic policy"))) { description.startsWith(i18n("CPU Dynamic policy"))) {
ret = "CPUFREQ_DYNAMIC"; ret = "CPUFRETQ_DYNAMIC";
} else if (description.startsWith("CPU Performance policy") || } else if (description.startsWith("CPU Performance policy") ||
description.startsWith(i18n("CPU Performance policy"))) { description.startsWith(i18n("CPU Performance policy"))) {
ret = "CPUFREQ_PERFORMANCE"; ret = "CPUFRETQ_PERFORMANCE";
} else if (description.startsWith("Set Brightness to") || } else if (description.startsWith("Set Brightness to") ||
description.startsWith(i18n("Set Brightness to"))) { description.startsWith(i18n("Set Brightness to"))) {
ret = "BRIGHTNESS"; ret = "BRIGHTNESS";
@ -1843,21 +1843,21 @@ QString ConfigureDialog::mapDescriptionToAction( QString description ) {
} }
/*! /*!
* Helper to fill a QComboBox with their text and select the correct item * Helper to fill a TQComboBox with their text and select the correct item
* \param _cb Pointer to the QComboBox * \param _cb Pointer to the TQComboBox
* \param _actions QStringList with the allowed actions * \param _actions TQStringList with the allowed actions
* \param _select QString with the action to select * \param _select TQString with the action to select
*/ */
void ConfigureDialog::fillActionComboBox(QComboBox *_cb, QStringList _actions, QString _select) { void ConfigureDialog::fillActionComboBox(TQComboBox *_cb, TQStringList _actions, TQString _select) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
_cb->clear(); _cb->clear();
_cb->insertItem(""); _cb->insertItem("");
for ( QStringList::Iterator it = _actions.begin(); it != _actions.end(); ++it ) { for ( TQStringList::Iterator it = _actions.begin(); it != _actions.end(); ++it ) {
QString _tmp = *it; TQString _tmp = *it;
QString _desc = mapActionToDescription( _tmp ); TQString _desc = mapActionToDescription( _tmp );
if (!_desc.isEmpty()) { if (!_desc.isEmpty()) {
_cb->insertItem( _desc ); _cb->insertItem( _desc );
if (_tmp == _select) { if (_tmp == _select) {

@ -42,11 +42,12 @@
class ConfigureDialog: public configure_Dialog { class ConfigureDialog: public configure_Dialog {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings, ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
QWidget *parent = 0, const char *name = 0); TQWidget *tqparent = 0, const char *name = 0);
//! default destructor //! default destructor
~ConfigureDialog(); ~ConfigureDialog();
@ -66,12 +67,12 @@ private:
//! struct with allowed suspend states //! struct with allowed suspend states
SuspendStates suspend; SuspendStates suspend;
//! QStringList with the blacklisted processes //! TQStringList with the blacklisted processes
QStringList blacklist; TQStringList blacklist;
//! QStringList with all available supported actions //! TQStringList with all available supported actions
QStringList actions; TQStringList actions;
//! QStringList with the name of the schemes in the config //! TQStringList with the name of the schemes in the config
QStringList schemes; TQStringList schemes;
//! true if the current desktop session is a GNOME session, else if not //! true if the current desktop session is a GNOME session, else if not
bool gnome_session; bool gnome_session;
@ -116,16 +117,16 @@ private:
//! get the list of schemes and fill \ref schemes //! get the list of schemes and fill \ref schemes
void getSchemeList(); void getSchemeList();
//! set the current scheme //! set the current scheme
void selectScheme (QString _scheme); void selectScheme (TQString _scheme);
//! to get the real Name of the Scheme //! to get the real Name of the Scheme
QString getSchemeRealName( QString ); TQString getSchemeRealName( TQString );
//! map a action string from options to a description //! map a action string from options to a description
QString mapActionToDescription( QString action ); TQString mapActionToDescription( TQString action );
//! map a (translated) description of a action back to the name config key //! map a (translated) description of a action back to the name config key
QString mapDescriptionToAction( QString description ); TQString mapDescriptionToAction( TQString description );
//! fill a QComboBox with actions (translated text) and select a value //! fill a TQComboBox with actions (translated text) and select a value
void fillActionComboBox(QComboBox *_cb, QStringList _actions, QString _select); void fillActionComboBox(TQComboBox *_cb, TQStringList _actions, TQString _select);
signals: signals:
@ -178,11 +179,11 @@ private slots:
//! called if the pB_editBlacklist clicked //! called if the pB_editBlacklist clicked
void pB_editBlacklistSuspend_clicked(); void pB_editBlacklistSuspend_clicked();
//! to store the changed and from BlacklistEditDlg recieved suspend blacklist to scheme //! to store the changed and from BlacklistEditDlg recieved suspend blacklist to scheme
void saveSchemeSuspendBlacklist( QStringList ); void saveSchemeSuspendBlacklist( TQStringList );
//! called if the pB_editBlacklistDimm clicked //! called if the pB_editBlacklistDimm clicked
void pB_editBlacklistDimm_clicked(); void pB_editBlacklistDimm_clicked();
//! to store the changed and from BlacklistEditDlg recieved dimm blacklist to scheme //! to store the changed and from BlacklistEditDlg recieved dimm blacklist to scheme
void saveSchemeDimmBlacklist( QStringList ); void saveSchemeDimmBlacklist( TQStringList );
//! called if the checkbox cB_Brightness toggled //! called if the checkbox cB_Brightness toggled
void cB_Brightness_toggled ( bool ); void cB_Brightness_toggled ( bool );
@ -205,18 +206,18 @@ private slots:
//! called if the value of the powerOff DPMS spinBox changed //! called if the value of the powerOff DPMS spinBox changed
void sB_powerOff_valueChanged(); void sB_powerOff_valueChanged();
//! called if the warning QSpinBoxes for battery level is changed //! called if the warning TQSpinBoxes for battery level is changed
void sB_batWarning_valueChanged(); void sB_batWarning_valueChanged();
//! called if the low QSpinBoxes for battery level is changed //! called if the low TQSpinBoxes for battery level is changed
void sB_batLow_valueChanged(); void sB_batLow_valueChanged();
//! called if the critical QSpinBoxes for battery level is changed //! called if the critical TQSpinBoxes for battery level is changed
void sB_batCritical_valueChanged(); void sB_batCritical_valueChanged();
//! called if the QComboBox for the battery warning level action changed //! called if the TQComboBox for the battery warning level action changed
void cB_batWarning_activated(); void cB_batWarning_activated();
//! called if the QComboBox for the battery low level action changed //! called if the TQComboBox for the battery low level action changed
void cB_batLow_activated(); void cB_batLow_activated();
//! called if the QComboBox for the battery critical level action changed //! called if the TQComboBox for the battery critical level action changed
void cB_batCritical_activated(); void cB_batCritical_activated();
}; };

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>countdown_Dialog</class> <class>countdown_Dialog</class>
<widget class="QDialog"> <widget class="TQDialog">
<property name="name"> <property name="name">
<cstring>countdown_Dialog</cstring> <cstring>countdown_Dialog</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -40,14 +40,14 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>142</width> <width>142</width>
<height>21</height> <height>21</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QPushButton" row="2" column="4"> <widget class="TQPushButton" row="2" column="4">
<property name="name"> <property name="name">
<cstring>pB_cancel</cstring> <cstring>pB_cancel</cstring>
</property> </property>
@ -68,7 +68,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>
@ -85,24 +85,24 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>144</width> <width>144</width>
<height>21</height> <height>21</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>iconPixmap</cstring> <cstring>iconPixmap</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>48</width> <width>48</width>
<height>48</height> <height>48</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>48</width> <width>48</width>
<height>48</height> <height>48</height>
@ -125,14 +125,14 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>5</width> <width>5</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="0" column="3" rowspan="1" colspan="4"> <widget class="TQLabel" row="0" column="3" rowspan="1" colspan="4">
<property name="name"> <property name="name">
<cstring>textLabel</cstring> <cstring>textLabel</cstring>
</property> </property>
@ -142,7 +142,7 @@
<property name="textFormat"> <property name="textFormat">
<enum>AutoText</enum> <enum>AutoText</enum>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -156,7 +156,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>
@ -175,7 +175,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>20</height> <height>20</height>
@ -197,8 +197,8 @@
<slot>pB_cancel_pressed()</slot> <slot>pB_cancel_pressed()</slot>
</connection> </connection>
</connections> </connections>
<slots> <Q_SLOTS>
<slot>pB_cancel_pressed()</slot> <slot>pB_cancel_pressed()</slot>
</slots> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -33,24 +33,24 @@
#include <kprogress.h> #include <kprogress.h>
// QT headers: // QT headers:
#include <qdialog.h> #include <tqdialog.h>
#include <qlabel.h> #include <tqlabel.h>
#include <qprogressbar.h> #include <tqprogressbar.h>
#include <qpushbutton.h> #include <tqpushbutton.h>
#include <qstring.h> #include <tqstring.h>
#include <qtimer.h> #include <tqtimer.h>
/*! This is the default constructor of class countDownDialog . */ /*! This is the default constructor of class countDownDialog . */
countDownDialog::countDownDialog( int timeout, QWidget *parent, const char *name) countDownDialog::countDownDialog( int timeout, TQWidget *tqparent, const char *name)
:countdown_Dialog(parent, name, false, Qt::WStyle_StaysOnTop | Qt::WDestructiveClose ) :countdown_Dialog(tqparent, name, false, TQt::WStyle_StaysOnTop | TQt::WDestructiveClose )
{ {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
chancel = false; chancel = false;
remaining = timeout; remaining = timeout;
timeOut = timeout; timeOut = timeout;
PROGRESS = new QTimer(this); PROGRESS = new TQTimer(this);
connect(PROGRESS, SIGNAL(timeout()), this, SLOT(updateProgress())); connect(PROGRESS, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgress()));
this->setCaption(i18n("KPowersave")); this->setCaption(i18n("KPowersave"));
@ -60,7 +60,7 @@ countDownDialog::countDownDialog( int timeout, QWidget *parent, const char *name
/*! This is the default destructor of class countDownDialog . */ /*! This is the default destructor of class countDownDialog . */
countDownDialog::~countDownDialog() { countDownDialog::~countDownDialog() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
// no need to delete child widgets, Qt does it all for us // no need to delete child widgets, TQt does it all for us
emit dialogClosed(chancel); emit dialogClosed(chancel);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
@ -68,12 +68,12 @@ countDownDialog::~countDownDialog() {
/*! /*!
* This used to set Icon/pixmap for the dialog. * This used to set Icon/pixmap for the dialog.
* \param type QString with the type of the current suspend * \param type TQString with the type of the current suspend
* to set the pixmap in the dialog * to set the pixmap in the dialog
*/ */
void countDownDialog::setPixmap( QString type ) void countDownDialog::setPixmap( TQString type )
{ {
QPixmap pixmap = 0; TQPixmap pixmap = 0;
if(type.startsWith("suspend2disk")){ if(type.startsWith("suspend2disk")){
pixmap = KGlobal::iconLoader()->loadIcon("suspend_to_disk", KIcon::NoGroup, KIcon::SizeLarge); pixmap = KGlobal::iconLoader()->loadIcon("suspend_to_disk", KIcon::NoGroup, KIcon::SizeLarge);
@ -89,9 +89,9 @@ void countDownDialog::setPixmap( QString type )
/*! /*!
* To set the message to the dialog, which should be shown to the user. * To set the message to the dialog, which should be shown to the user.
* \param text QString with the message. * \param text TQString with the message.
*/ */
void countDownDialog::setMessageText(QString text) { void countDownDialog::setMessageText(TQString text) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if (!text.isEmpty()) { if (!text.isEmpty()) {
@ -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").arg(remaining)); progressBar->setFormat(i18n("%1 seconds").tqarg(remaining));
progressBar->setPercentageVisible(true); progressBar->setPercentageVisible(true);
progressBar->setProgress(100); progressBar->setProgress(100);
progressBar->setEnabled(true); progressBar->setEnabled(true);
@ -130,7 +130,7 @@ bool countDownDialog::showDialog() {
} }
/*! /*!
* \b SLOT to get the event if the 'Cancel' button was pressed. * \b TQT_SLOT to get the event if the 'Cancel' button was pressed.
*/ */
void countDownDialog::pB_cancel_pressed() { void countDownDialog::pB_cancel_pressed() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -145,7 +145,7 @@ void countDownDialog::pB_cancel_pressed() {
} }
/*! /*!
* \b SLOT to handle the change of the progressbar. * \b TQT_SLOT to handle the change of the progressbar.
*/ */
void countDownDialog::updateProgress() { void countDownDialog::updateProgress() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -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").arg(remaining)); progressBar->setFormat(i18n("%1 seconds").tqarg(remaining));
progressBar->setPercentageVisible(true); progressBar->setPercentageVisible(true);
progressBar->setProgress(setTo); progressBar->setProgress(setTo);
progressBar->setEnabled(true); progressBar->setEnabled(true);

@ -36,18 +36,19 @@
class countDownDialog: public countdown_Dialog { class countDownDialog: public countdown_Dialog {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
countDownDialog(int timeout, QWidget *parent = 0, const char *name = 0); countDownDialog(int timeout, TQWidget *tqparent = 0, const char *name = 0);
//! default destructor //! default destructor
~countDownDialog(); ~countDownDialog();
//! set needed icons //! set needed icons
void setPixmap( QString ); void setPixmap( TQString );
//! to set the message text for the user //! to set the message text for the user
void setMessageText(QString text); void setMessageText(TQString text);
//! to show up the dialog //! to show up the dialog
bool showDialog(); bool showDialog();
@ -57,7 +58,7 @@ private:
* This timer is used to change the progressbar and to close the dialog if * This timer is used to change the progressbar and to close the dialog if
* the \ref timeOut is over. * the \ref timeOut is over.
*/ */
QTimer *PROGRESS; TQTimer *PROGRESS;
//! time the dialog should be displayed //! time the dialog should be displayed
int timeOut; int timeOut;

@ -194,17 +194,17 @@ bool dbusHAL::initDBUS(){
dbus_bus_add_match( dbus_connection, "type='signal'," dbus_bus_add_match( dbus_connection, "type='signal',"
"interface='org.freedesktop.ConsoleKit.Session'," "interface='org.freedesktop.ConsoleKit.Session',"
"member='ActiveChanged'", NULL); "member='ActiveChanged'", NULL);
m_dBusQtConnection = new DBusQt::Connection(this); m_dBusQtConnection = new DBusQt::Connection(this);
m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbus_connection); m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbus_connection);
dbus_is_connected = true; dbus_is_connected = true;
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return true; return true;
} }
/*! /*!
* This function aquire the org.freedesktop.Policy.Power interface * This function aquire the org.freedesktop.Policy.Power interface
* \return boolean with the result of the operation * \return boolean with the result of the operation
* \retval true if successful aquired the interface * \retval true if successful aquired the interface
@ -415,12 +415,12 @@ bool dbusHAL::reconnectHAL() {
/*! /*!
* This function query a integer property from HAL for a given device * This function query a integer property from HAL for a given device
* \param udi QString with the UDI of the device * \param udi TQString with the UDI of the device
* \param property QString with the property * \param property TQString with the property
* \param returnval pointer to the return value * \param returnval pointer to the return value
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::halGetPropertyInt(QString udi, QString property, int *returnval){ bool dbusHAL::halGetPropertyInt(TQString udi, TQString property, int *returnval){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
bool ret = false; bool ret = false;
@ -454,12 +454,12 @@ out:
/*! /*!
* This function query a boolean property from HAL for a given device * This function query a boolean property from HAL for a given device
* \param udi QString with the UDI of the device * \param udi TQString with the UDI of the device
* \param property QString with the property * \param property TQString with the property
* \param returnval pointer to the return value * \param returnval pointer to the return value
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::halGetPropertyBool(QString udi, QString property, bool *returnval){ bool dbusHAL::halGetPropertyBool(TQString udi, TQString property, bool *returnval){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
bool ret = false; bool ret = false;
@ -494,12 +494,12 @@ out:
/*! /*!
* This function query a Sting property from HAL for a given device * This function query a Sting property from HAL for a given device
* \param udi QString with the UDI of the device * \param udi TQString with the UDI of the device
* \param property QString with the property * \param property TQString with the property
* \param returnval pointer to the return value * \param returnval pointer to the return value
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::halGetPropertyString(QString udi, QString property, QString *returnval){ bool dbusHAL::halGetPropertyString(TQString udi, TQString property, TQString *returnval){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
bool ret = false; bool ret = false;
@ -533,12 +533,12 @@ out:
/*! /*!
* This function query a String List property from HAL for a given device * This function query a String List property from HAL for a given device
* \param udi QString with the udi of the device * \param udi TQString with the udi of the device
* \param property QString with the property to query * \param property TQString with the property to query
* \param devices QStringList to return the values * \param devices TQStringList to return the values
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::halGetPropertyStringList (QString udi, QString property, QStringList *devices) { bool dbusHAL::halGetPropertyStringList (TQString udi, TQString property, TQStringList *devices) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
bool ret = false; bool ret = false;
@ -566,7 +566,7 @@ bool dbusHAL::halGetPropertyStringList (QString udi, QString property, QStringLi
goto out; goto out;
} else { } else {
for (int i = 0; found[i] != NULL ; ++i) { for (int i = 0; found[i] != NULL ; ++i) {
QString _to_add = found[i]; TQString _to_add = found[i];
if (!_to_add.isEmpty()) *devices += _to_add; if (!_to_add.isEmpty()) *devices += _to_add;
} }
libhal_free_string_array(found); libhal_free_string_array(found);
@ -581,12 +581,12 @@ out:
/*! /*!
* This function query a capability from HAL for a given device * This function query a capability from HAL for a given device
* \param udi QString with the UDI of the device * \param udi TQString with the UDI of the device
* \param capability QString with the capability to query * \param capability TQString with the capability to query
* \param returnval pointer to the return value as boolean * \param returnval pointer to the return value as boolean
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::halQueryCapability(QString udi, QString capability, bool *returnval) { bool dbusHAL::halQueryCapability(TQString udi, TQString capability, bool *returnval) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
bool ret = false; bool ret = false;
@ -615,11 +615,11 @@ out:
/*! /*!
* Use this function to check if a device has a specia property/key. * Use this function to check if a device has a specia property/key.
* \param udi QString with the UDI of the device * \param udi TQString with the UDI of the device
* \param property QString with the property * \param property TQString with the property
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::halDevicePropertyExist(QString udi, QString property ) { bool dbusHAL::halDevicePropertyExist(TQString udi, TQString property ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
bool ret = false; bool ret = false;
@ -648,11 +648,11 @@ out:
/*! /*!
* Use this function to search find devices with a give capability * Use this function to search find devices with a give capability
* \param capability QString with the capability to query * \param capability TQString with the capability to query
* \param devices QStringList to return the found devices * \param devices TQStringList to return the found devices
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::halFindDeviceByCapability (QString capability, QStringList *devices) { bool dbusHAL::halFindDeviceByCapability (TQString capability, TQStringList *devices) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
DBusError error; DBusError error;
@ -675,7 +675,7 @@ bool dbusHAL::halFindDeviceByCapability (QString capability, QStringList *device
goto out; goto out;
} else { } else {
for (int i = 0; i < num; ++i) { for (int i = 0; i < num; ++i) {
QString _to_add = found[i]; TQString _to_add = found[i];
if (!_to_add.isEmpty()) *devices += _to_add; if (!_to_add.isEmpty()) *devices += _to_add;
} }
libhal_free_string_array(found); libhal_free_string_array(found);
@ -689,12 +689,12 @@ out:
/*! /*!
* Use this function to search find devices with a special string property * Use this function to search find devices with a special string property
* \param property QString with the name of the property * \param property TQString with the name of the property
* \param keyval QString with value of the string property * \param keyval TQString with value of the string property
* \param devices QStringList to return the found devices * \param devices TQStringList to return the found devices
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::halFindDeviceByString (QString property, QString keyval, QStringList *devices) { bool dbusHAL::halFindDeviceByString (TQString property, TQString keyval, TQStringList *devices) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
DBusError error; DBusError error;
@ -717,7 +717,7 @@ bool dbusHAL::halFindDeviceByString (QString property, QString keyval, QStringLi
goto out; goto out;
} else { } else {
for (int i = 0; i < num; ++i) { for (int i = 0; i < num; ++i) {
QString _to_add = found[i]; TQString _to_add = found[i];
if (!_to_add.isEmpty()) *devices += _to_add; if (!_to_add.isEmpty()) *devices += _to_add;
} }
libhal_free_string_array(found); libhal_free_string_array(found);
@ -733,15 +733,15 @@ out:
/* ----> D-Bus methode calls functions :: START <---- */ /* ----> D-Bus methode calls functions :: START <---- */
/*! /*!
* This function call a D-Bus method * This function call a D-Bus method
* \param interface QString with te dbus interface * \param interface TQString with te dbus interface
* \param path QString with the object path * \param path TQString with the object path
* \param object QString with the object name * \param object TQString with the object name
* \param method QString with the name of the methode * \param method TQString with the name of the methode
* \param first_arg_type integer with the dbus type of the first argument * \param first_arg_type integer with the dbus type of the first argument
* \param ... more arguments * \param ... more arguments
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::dbusSystemMethodCall( QString interface, QString path, QString object, QString method, bool dbusHAL::dbusSystemMethodCall( TQString interface, TQString path, TQString object, TQString method,
int first_arg_type, ... ) { int first_arg_type, ... ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -760,16 +760,16 @@ bool dbusHAL::dbusSystemMethodCall( QString interface, QString path, QString obj
/*! /*!
* This overloaded function call a D-Bus method on the D-Bus system bus with a return value * This overloaded function call a D-Bus method on the D-Bus system bus with a return value
* \param interface QString with the dbus interface * \param interface TQString with the dbus interface
* \param path QString with the object path * \param path TQString with the object path
* \param object QString with the object name * \param object TQString with the object name
* \param method QString with the name of the method * \param method TQString with the name of the method
* \param retvalue void pointer to arguments, if NULL we make a simple call * \param retvalue void pointer to arguments, if NULL we make a simple call
* \param retval_type Integer with the dbus type of the return value, set to -1 if retvalue is NULL * \param retval_type Integer with the dbus type of the return value, set to -1 if retvalue is NULL
* \param first_arg_type Integer with the dbus type of the first argument followed by the value * \param first_arg_type Integer with the dbus type of the first argument followed by the value
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::dbusSystemMethodCall( QString interface, QString path, QString object, QString method, bool dbusHAL::dbusSystemMethodCall( TQString interface, TQString path, TQString object, TQString method,
void *retvalue, int retval_type, int first_arg_type, ... ) { void *retvalue, int retval_type, int first_arg_type, ... ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -788,10 +788,10 @@ bool dbusHAL::dbusSystemMethodCall( QString interface, QString path, QString obj
/*! /*!
* This function call a D-Bus method with a return value * This function call a D-Bus method with a return value
* \param interface QString with the dbus interface * \param interface TQString with the dbus interface
* \param path QString with the object path * \param path TQString with the object path
* \param object QString with the object name * \param object TQString with the object name
* \param method QString with the name of the method * \param method TQString with the name of the method
* \param dbus_type DBusBusType with the D-Bus BUS Type * \param dbus_type DBusBusType with the D-Bus BUS Type
* \param retvalue void pointer to arguments, if NULL we make a simple call * \param retvalue void pointer to arguments, if NULL we make a simple call
* \param retval_type Integer with the dbus type of the return value, set to -1 if retvalue is NULL * \param retval_type Integer with the dbus type of the return value, set to -1 if retvalue is NULL
@ -799,7 +799,7 @@ bool dbusHAL::dbusSystemMethodCall( QString interface, QString path, QString obj
* \param var_args va_list with more arguments * \param var_args va_list with more arguments
* \return If the query was successful or not * \return If the query was successful or not
*/ */
bool dbusHAL::dbusMethodCall( QString interface, QString path, QString object, QString method, bool dbusHAL::dbusMethodCall( TQString interface, TQString path, TQString object, TQString method,
DBusBusType dbus_type, void *retvalue, int retval_type, int first_arg_type, DBusBusType dbus_type, void *retvalue, int retval_type, int first_arg_type,
va_list var_args ) { va_list var_args ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -969,16 +969,16 @@ out:
/*! /*!
* Check if the user is privileged to a special privilege * Check if the user is privileged to a special privilege
* \param privilege QString with the name of the requested privilege * \param privilege TQString with the name of the requested privilege
* \param udi QString with the UDI. * \param udi TQString with the UDI.
* \param ressource QString with the name of the ressource * \param ressource TQString with the name of the ressource
* \param user QString with the name of the user. If empty the current user is used. * \param user TQString with the name of the user. If empty the current user is used.
* \return int with info if the user is allowed or not. * \return int with info if the user is allowed or not.
* \retval 0 if not allowed * \retval 0 if not allowed
* \retval 1 if allowed * \retval 1 if allowed
* \retval -1 if a error occurs or we could not query the interface * \retval -1 if a error occurs or we could not query the interface
*/ */
int dbusHAL::isUserPrivileged(QString privilege, QString udi, QString ressource, QString user) { int dbusHAL::isUserPrivileged(TQString privilege, TQString udi, TQString ressource, TQString user) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
const char *_unique_name; const char *_unique_name;
@ -1058,14 +1058,14 @@ out:
/* ---> PolicyKit method call section :: END <--- */ /* ---> PolicyKit method call section :: END <--- */
/*! /*!
* Use this SLOT to emit a reviced messages to the kpowersave. * Use this TQT_SLOT to emit a reviced messages to the kpowersave.
* NOTE: Because of the filter function this need to be a public function. * NOTE: Because of the filter function this need to be a public function.
* Don't use this function in any other place than this class. * Don't use this function in any other place than this class.
* \param type enum with the type of the message * \param type enum with the type of the message
* \param message String with the message * \param message String with the message
* \param string String with additional info * \param string String with additional info
*/ */
void dbusHAL::emitMsgReceived( msg_type type, QString message, QString string ) { void dbusHAL::emitMsgReceived( msg_type type, TQString message, TQString string ) {
if (message.startsWith("dbus.terminate")) if (message.startsWith("dbus.terminate"))
dbus_is_connected = false; dbus_is_connected = false;
@ -1097,7 +1097,7 @@ filterFunction (DBusConnection *connection, DBusMessage *message, void */*data*/
bool reply_wanted; bool reply_wanted;
char *value; char *value;
QString ifaceType; TQString ifaceType;
DBusError error; DBusError error;
dbus_error_init( &error ); dbus_error_init( &error );
@ -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, QString("%1").arg((int)active)); session, TQString("%1").tqarg((int)active));
} else { } else {
if (dbus_error_is_set( &error )) dbus_error_free( &error ); if (dbus_error_is_set( &error )) dbus_error_free( &error );
} }
@ -1312,3 +1312,4 @@ filterFunction (DBusConnection *connection, DBusMessage *message, void */*data*/
DBusConnection * dbusHAL::get_DBUS_connection() { DBusConnection * dbusHAL::get_DBUS_connection() {
return dbus_connection; return dbus_connection;
} }

@ -16,14 +16,14 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
/*! /*!
* \file dbusHAL.h * \file dbusHAL.h
* \brief Headerfile for dbusHAL.cpp and the class \ref dbusHAL. * \brief Headerfile for dbusHAL.cpp and the class \ref dbusHAL.
*/ */
/*! /*!
* \class dbusHAL * \class dbusHAL
* \brief class for connection to HAL via D-Bus * \brief class for connection to HAL via D-Bus
* \author Danny Kukawka, <dkukawka@suse.de>, <danny.kukawka@web.de> * \author Danny Kukawka, <dkukawka@suse.de>, <danny.kukawka@web.de>
* \date 2006-2007 * \date 2006-2007
*/ */
@ -41,7 +41,7 @@
#endif #endif
// QT - Header // QT - Header
#include <qstring.h> #include <tqstring.h>
// D-Bus Header // D-Bus Header
#include <dbus/dbus.h> // needed for dbus_bool_t #include <dbus/dbus.h> // needed for dbus_bool_t
@ -74,10 +74,11 @@ enum msg_type {
POLICY_POWER_OWNER_CHANGED POLICY_POWER_OWNER_CHANGED
}; };
class dbusHAL : public QObject{ class dbusHAL : public TQObject{
Q_OBJECT Q_OBJECT
TQ_OBJECT
private: private:
//! QT connection to D-Bus //! QT connection to D-Bus
DBusQt::Connection* m_dBusQtConnection; DBusQt::Connection* m_dBusQtConnection;
@ -85,7 +86,7 @@ private:
DBusConnection *dbus_connection; DBusConnection *dbus_connection;
//! HAL context //! HAL context
LibHalContext *hal_ctx; LibHalContext *hal_ctx;
//! to store information if KPowersave is connected to D-Bus //! to store information if KPowersave is connected to D-Bus
/*! /*!
* This boolean represent information about the state of the connection to D-Bus * This boolean represent information about the state of the connection to D-Bus
@ -100,7 +101,7 @@ private:
* \li false: if disconnected * \li false: if disconnected
*/ */
bool hal_is_connected; bool hal_is_connected;
//! if we could claim the org.freedesktop.Policy.Power interface //! if we could claim the org.freedesktop.Policy.Power interface
/*! /*!
* This boolean represent information if KPowersave could claim the * This boolean represent information if KPowersave could claim the
@ -114,7 +115,7 @@ private:
//! to initialise the connection to D-Bus //! to initialise the connection to D-Bus
bool initDBUS(); bool initDBUS();
//! to call a methode on a dbus interface with reply //! to call a methode on a dbus interface with reply
bool dbusMethodCall( QString interface, QString path, QString object, QString method, bool dbusMethodCall( TQString interface, TQString path, TQString object, TQString method,
DBusBusType dbus_type, void *retvalue, int retval_type, DBusBusType dbus_type, void *retvalue, int retval_type,
int first_arg_type, va_list var_args); int first_arg_type, va_list var_args);
@ -128,7 +129,7 @@ private:
void freeHAL(); void freeHAL();
public: public:
//! default constructor //! default constructor
dbusHAL(); dbusHAL();
//! default destructor //! default destructor
@ -155,7 +156,7 @@ public:
bool isConnectedToHAL(); bool isConnectedToHAL();
//! to get info about claim org.freedesktop.Policy.Power interface //! to get info about claim org.freedesktop.Policy.Power interface
bool aquiredPolicyPowerInterface(); bool aquiredPolicyPowerInterface();
//! return the current HAL context //! return the current HAL context
LibHalContext *get_HAL_context(); LibHalContext *get_HAL_context();
//! return the current DBus connection //! return the current DBus connection
@ -163,32 +164,32 @@ public:
/* HAL device information stuff */ /* HAL device information stuff */
//! Query a integer device property from HAL //! Query a integer device property from HAL
bool halGetPropertyInt(QString udi, QString property, int *returnval); bool halGetPropertyInt(TQString udi, TQString property, int *returnval);
//! Query a bolean device property from HAL //! Query a bolean device property from HAL
bool halGetPropertyBool(QString udi, QString property, bool *returnval); bool halGetPropertyBool(TQString udi, TQString property, bool *returnval);
//! Query a string device property from HAL //! Query a string device property from HAL
bool halGetPropertyString(QString udi, QString property, QString *returnval); bool halGetPropertyString(TQString udi, TQString property, TQString *returnval);
//! Query a string list device property from HAL //! Query a string list device property from HAL
bool halGetPropertyStringList (QString udi, QString property, QStringList *devices); bool halGetPropertyStringList (TQString udi, TQString property, TQStringList *devices);
//! Query a capability for a HAL device //! Query a capability for a HAL device
bool halQueryCapability(QString udi, QString capability, bool *returnval); bool halQueryCapability(TQString udi, TQString capability, bool *returnval);
/* functions to find devices and check stuff */ /* functions to find devices and check stuff */
//! check if a property exist on a device //! check if a property exist on a device
bool halDevicePropertyExist(QString udi, QString property); bool halDevicePropertyExist(TQString udi, TQString property);
//! to find a device by capability //! to find a device by capability
bool halFindDeviceByCapability (QString capability, QStringList *devices); bool halFindDeviceByCapability (TQString capability, TQStringList *devices);
//! to find a device by a string property //! to find a device by a string property
bool halFindDeviceByString (QString property, QString keyval, QStringList *devices); bool halFindDeviceByString (TQString property, TQString keyval, TQStringList *devices);
/* D-Bus helper functions */ /* D-Bus helper functions */
/* functions to call methodes */ /* functions to call methodes */
//! to call a methode on a dbus system bus method without reply //! to call a methode on a dbus system bus method without reply
bool dbusSystemMethodCall( QString interface, QString path, QString object, QString method, bool dbusSystemMethodCall( TQString interface, TQString path, TQString object, TQString method,
int first_arg_type, ... ); int first_arg_type, ... );
//! to call a methode on a dbus system bus method with reply //! to call a methode on a dbus system bus method with reply
bool dbusSystemMethodCall( QString interface, QString path, QString object, QString method, bool dbusSystemMethodCall( TQString interface, TQString path, TQString object, TQString method,
void *retvalue, int retval_type, int first_arg_type, ... ); void *retvalue, int retval_type, int first_arg_type, ... );
//! to call a suspend method on HAL //! to call a suspend method on HAL
@ -196,14 +197,14 @@ public:
/* PolicyKit call helper */ /* PolicyKit call helper */
//! check if the user has a requested privilege //! check if the user has a requested privilege
int isUserPrivileged( QString privilege, QString udi, QString ressource = "", QString user = QString()); int isUserPrivileged( TQString privilege, TQString udi, TQString ressource = "", TQString user = TQString());
//! wrapper to emit a signal with a event from HAL //! wrapper to emit a signal with a event from HAL
void emitMsgReceived( msg_type type, QString message, QString string ); void emitMsgReceived( msg_type type, TQString message, TQString string );
signals: signals:
//! signal with message to forward from D-Bus to HAL //! signal with message to forward from D-Bus to HAL
void msgReceived_withStringString( msg_type, QString, QString ); void msgReceived_withStringString( msg_type, TQString, TQString );
//! signal if we resumed! //! signal if we resumed!
void backFromSuspend( int result ); void backFromSuspend( int result );
}; };

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>detailed_Dialog</class> <class>detailed_Dialog</class>
<widget class="QDialog"> <widget class="TQDialog">
<property name="name"> <property name="name">
<cstring>detailed_Dialog</cstring> <cstring>detailed_Dialog</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -30,7 +30,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QGroupBox" row="0" column="0"> <widget class="TQGroupBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>GeneralGroup</cstring> <cstring>GeneralGroup</cstring>
</property> </property>
@ -49,7 +49,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QSplitter" row="0" column="1"> <widget class="TQSplitter" row="0" column="1">
<property name="name"> <property name="name">
<cstring>splitter7</cstring> <cstring>splitter7</cstring>
</property> </property>
@ -64,15 +64,15 @@
<property name="orientation"> <property name="orientation">
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout17</cstring> <cstring>tqlayout17</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="1"> <widget class="TQLabel" row="0" column="1">
<property name="name"> <property name="name">
<cstring>InfoLabelValue</cstring> <cstring>InfoLabelValue</cstring>
</property> </property>
@ -92,11 +92,11 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignTop|AlignRight</set> <set>AlignTop|AlignRight</set>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>InfoLabel</cstring> <cstring>InfoLabel</cstring>
</property> </property>
@ -111,7 +111,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>
@ -127,7 +127,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>50</height> <height>50</height>
@ -135,15 +135,15 @@
</property> </property>
</spacer> </spacer>
</widget> </widget>
<widget class="QLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout18</cstring> <cstring>tqlayout18</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>InfoPictogram</cstring> <cstring>InfoPictogram</cstring>
</property> </property>
@ -155,13 +155,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
@ -181,7 +181,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -192,7 +192,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QGroupBox" row="1" column="0"> <widget class="TQGroupBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>BatteryGroup</cstring> <cstring>BatteryGroup</cstring>
</property> </property>
@ -205,7 +205,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title"> <property name="title">
<string>Battery Status</string> <string>Battery tqStatus</string>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -221,30 +221,30 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>118</height> <height>118</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>layout15</cstring> <cstring>tqlayout15</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLayoutWidget" row="3" column="0"> <widget class="TQLayoutWidget" row="3" column="0">
<property name="name"> <property name="name">
<cstring>layout14</cstring> <cstring>tqlayout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>LabelAC</cstring> <cstring>LabelAC</cstring>
</property> </property>
@ -270,7 +270,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>5</width> <width>5</width>
<height>20</height> <height>20</height>
@ -300,16 +300,16 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>5</width> <width>5</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>LabelACStatus</cstring> <cstring>LabelACtqStatus</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
@ -322,13 +322,13 @@
<property name="text"> <property name="text">
<string>plugged in</string> <string>plugged in</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>powerConsLayout</cstring> <cstring>powerConsLayout</cstring>
</property> </property>
@ -336,7 +336,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>tl_powerConsDesc</cstring> <cstring>tl_powerConsDesc</cstring>
</property> </property>
@ -344,20 +344,20 @@
<string>Power Consumtion: </string> <string>Power Consumtion: </string>
</property> </property>
</widget> </widget>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>tl_powerConsValue</cstring> <cstring>tl_powerConsValue</cstring>
</property> </property>
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QFrame" row="0" column="0"> <widget class="TQFrame" row="0" column="0">
<property name="name"> <property name="name">
<cstring>BatteryFrame</cstring> <cstring>BatteryFrame</cstring>
</property> </property>
@ -386,7 +386,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -395,9 +395,9 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<widget class="QLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout12</cstring> <cstring>tqlayout12</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -413,14 +413,14 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>90</height> <height>90</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>BatteryPictogram</cstring> <cstring>BatteryPictogram</cstring>
</property> </property>
@ -432,13 +432,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
@ -452,7 +452,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QGroupBox" row="2" column="0"> <widget class="TQGroupBox" row="2" column="0">
<property name="name"> <property name="name">
<cstring>ProcessorGroup</cstring> <cstring>ProcessorGroup</cstring>
</property> </property>
@ -465,15 +465,15 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title"> <property name="title">
<string>Processor Status</string> <string>Processor tqStatus</string>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout12_2</cstring> <cstring>tqlayout12_2</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -489,14 +489,14 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>90</height> <height>90</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>ProcessorPictogram</cstring> <cstring>ProcessorPictogram</cstring>
</property> </property>
@ -508,13 +508,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
@ -526,7 +526,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QSplitter" row="0" column="1"> <widget class="TQSplitter" row="0" column="1">
<property name="name"> <property name="name">
<cstring>splitter6</cstring> <cstring>splitter6</cstring>
</property> </property>
@ -541,15 +541,15 @@
<property name="orientation"> <property name="orientation">
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout16</cstring> <cstring>tqlayout16</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QFrame" row="0" column="0"> <widget class="TQFrame" row="0" column="0">
<property name="name"> <property name="name">
<cstring>ProcessorFrame</cstring> <cstring>ProcessorFrame</cstring>
</property> </property>
@ -580,7 +580,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>20</height> <height>20</height>
@ -590,9 +590,9 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QLayoutWidget" row="3" column="0"> <widget class="TQLayoutWidget" row="3" column="0">
<property name="name"> <property name="name">
<cstring>layout19</cstring> <cstring>tqlayout19</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -608,14 +608,14 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>230</width> <width>230</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QPushButton" row="0" column="1"> <widget class="TQPushButton" row="0" column="1">
<property name="name"> <property name="name">
<cstring>OkButton</cstring> <cstring>OkButton</cstring>
</property> </property>
@ -638,5 +638,5 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -33,11 +33,11 @@
#include <klocale.h> #include <klocale.h>
// QT headers: // QT headers:
#include <qpushbutton.h> #include <tqpushbutton.h>
#include <qlayout.h> #include <tqlayout.h>
#include <qlabel.h> #include <tqlabel.h>
#include <qtimer.h> #include <tqtimer.h>
#include <qgroupbox.h> #include <tqgroupbox.h>
// own headers // own headers
#include "detaileddialog.h" #include "detaileddialog.h"
@ -45,9 +45,9 @@
/*! /*!
* This is the default constructor of the class detaileddialog. * This is the default constructor of the class detaileddialog.
*/ */
detaileddialog::detaileddialog( HardwareInfo *_hwinfo, QPixmap *_pixmap, Settings *_set, detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settings *_set,
QWidget* parent, const char* name ) TQWidget* tqparent, const char* name )
: detailed_Dialog( parent, name, false, WDestructiveClose ) { : detailed_Dialog( tqparent, name, false, WDestructiveClose ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
hwinfo = _hwinfo; hwinfo = _hwinfo;
config = _set; config = _set;
@ -65,22 +65,22 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, QPixmap *_pixmap, Setting
GeneralGroup->setTitle(i18n("Miscellaneous")); GeneralGroup->setTitle(i18n("Miscellaneous"));
ProcessorGroup->setTitle(i18n("CPUs")); ProcessorGroup->setTitle(i18n("CPUs"));
ProcessorGridLayout = new QGridLayout(ProcessorFrame, numOfCPUs, 2, 0, 5, "ProcessorGridLayout"); ProcessorGridLayout = new TQGridLayout(ProcessorFrame, numOfCPUs, 2, 0, 5, "ProcessorGridLayout");
if (batteries > 0) { if (batteries > 0) {
if (batteries > 1) batteries++; if (batteries > 1) batteries++;
BatteryGroup->setTitle(i18n("Battery state:").remove(":")); BatteryGroup->setTitle(i18n("Battery state:").remove(":"));
BatteryGridLayout = new QGridLayout(BatteryFrame, batteries, 2, 0, 5, "BatteryGridLayout"); BatteryGridLayout = new TQGridLayout(BatteryFrame, batteries, 2, 0, 5, "BatteryGridLayout");
for (int i = 0; i < batteries; i++) { for (int i = 0; i < batteries; i++) {
QLabel *Label = new QLabel(BatteryFrame, "BatteryLabel"); TQLabel *Label = new TQLabel(BatteryFrame, "BatteryLabel");
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" ).arg(i)); Label->setText( i18n( "Battery %1" ).tqarg(i));
else else
Label->setText( i18n( "Battery %1" ).arg(i + 1)); Label->setText( i18n( "Battery %1" ).tqarg(i + 1));
BatteryGridLayout->addWidget( Label, i , 0); BatteryGridLayout->addWidget( Label, i , 0);
@ -93,12 +93,12 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, QPixmap *_pixmap, Setting
BatteryFrame->adjustSize(); BatteryFrame->adjustSize();
tl_powerConsDesc->hide(); tl_powerConsDesc->hide();
tl_powerConsValue->hide(); tl_powerConsValue->hide();
connect(hwinfo, SIGNAL(generalDataChanged()), this, SLOT(setBattery())); connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setBattery()));
connect(primaryBatteries, SIGNAL(batteryChanged()), this, SLOT(setBattery())); connect(primaryBatteries, TQT_SIGNAL(batteryChanged()), this, TQT_SLOT(setBattery()));
connect(primaryBatteries, SIGNAL(batteryChargingStateChanged(int)), this, connect(primaryBatteries, TQT_SIGNAL(batteryChargingStateChanged(int)), this,
SLOT(setPowerConsumption())); TQT_SLOT(setPowerConsumption()));
connect(primaryBatteries, SIGNAL(batteryRateChanged()), this, connect(primaryBatteries, TQT_SIGNAL(batteryRateChanged()), this,
SLOT(setPowerConsumption())); TQT_SLOT(setPowerConsumption()));
setBattery(); setBattery();
setPowerConsumption(); setPowerConsumption();
} else { } else {
@ -110,8 +110,8 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, QPixmap *_pixmap, Setting
ProcessorPictogram->setPixmap(SmallIcon("processor", 22)); ProcessorPictogram->setPixmap(SmallIcon("processor", 22));
for (int i = 0; i < numOfCPUs; i++) { for (int i = 0; i < numOfCPUs; i++) {
QLabel *Label = new QLabel(ProcessorFrame, "ProcessorLabel"); TQLabel *Label = new TQLabel(ProcessorFrame, "ProcessorLabel");
Label->setText( i18n( "Processor %1" ).arg(i + 1)); Label->setText( i18n( "Processor %1" ).tqarg(i + 1));
ProcessorGridLayout->addWidget( Label, i , 0); ProcessorGridLayout->addWidget( Label, i , 0);
KProgress *CPUPBar = new KProgress(ProcessorFrame, "ProcessorPBar"); KProgress *CPUPBar = new KProgress(ProcessorFrame, "ProcessorPBar");
@ -122,21 +122,21 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, QPixmap *_pixmap, Setting
} }
ProcessorFrame->adjustSize(); ProcessorFrame->adjustSize();
connect(OkButton, SIGNAL(clicked()), this, SLOT(closeDetailedDlg())); connect(OkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeDetailedDlg()));
connect(hwinfo, SIGNAL(ACStatus(bool)), this, SLOT(setAC())); connect(hwinfo, TQT_SIGNAL(ACtqStatus(bool)), this, TQT_SLOT(setAC()));
// TODO: replace event // TODO: replace event
//connect(pd, SIGNAL(schemeDataChanged()), this, SLOT(setInfos())); //connect(pd, TQT_SIGNAL(schemeDataChanged()), this, TQT_SLOT(setInfos()));
connect(hwinfo, SIGNAL(generalDataChanged()), this, SLOT(setInfos())); connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setInfos()));
if (hwinfo->supportCPUFreq() || cpuInfo->cpuFreqHW) { if (hwinfo->supportCPUFreq() || cpuInfo->cpuFreqHW) {
// Check if cpufreq is available // Check if cpufreq is available
cpuInfo->getCPUMaxSpeed(); cpuInfo->getCPUMaxSpeed();
setProcessor(); setProcessor();
connect(hwinfo, SIGNAL(currentCPUFreqPolicyChanged()), this, SLOT(setInfos())); connect(hwinfo, TQT_SIGNAL(currentCPUFreqPolicyChanged()), this, TQT_SLOT(setInfos()));
} else { } else {
// .. if not, use cpu throttling // .. if not, use cpu throttling
if (!cpuInfo->getCPUThrottlingState() || numOfCPUs <= 1) { if (!cpuInfo->getCPUThrottlingState() || numOfCPUs <= 1) {
connect(hwinfo, SIGNAL(generalDataChanged()), this, SLOT(setProcessorThrottling())); connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setProcessorThrottling()));
} }
setProcessorThrottling(); setProcessorThrottling();
} }
@ -150,11 +150,11 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, QPixmap *_pixmap, Setting
/*! This is the default destructor of class detaileddialog. */ /*! This is the default destructor of class detaileddialog. */
detaileddialog::~detaileddialog() { detaileddialog::~detaileddialog() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
// no need to delete child widgets, Qt does it all for us // no need to delete child widgets, TQt does it all for us
} }
/*! /*!
* \b SLOT called if the dialog is closed by the user. * \b TQT_SLOT called if the dialog is closed by the user.
* We do some cleanups here. * We do some cleanups here.
*/ */
void detaileddialog::closeDetailedDlg() { void detaileddialog::closeDetailedDlg() {
@ -165,18 +165,18 @@ void detaileddialog::closeDetailedDlg() {
} }
/*! /*!
* \b SLOT to set up the battery progress widgets. * \b TQT_SLOT to set up the battery progress widgets.
*/ */
void detaileddialog::setBattery() { void detaileddialog::setBattery() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString minutes; TQString minutes;
int batteries = 0; int batteries = 0;
// refresh battery collection // refresh battery collection
primaryBatteries = hwinfo->getPrimaryBatteries(); primaryBatteries = hwinfo->getPrimaryBatteries();
QPtrList<Battery> allBatteries = hwinfo->getAllBatteries(); TQPtrList<Battery> allBatteries = hwinfo->getAllBatteries();
batteries = primaryBatteries->getNumBatteries(); batteries = primaryBatteries->getNumBatteries();
@ -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) {
QString temp = i18n("%1:%2 h until charged").arg(hours).arg(minutes); TQString temp = i18n("%1:%2 h until charged").tqarg(hours).tqarg(minutes);
BatteryPBar[i]->setFormat(temp); BatteryPBar[i]->setFormat(temp);
} else if (_c_state == DISCHARGING) { } else if (_c_state == DISCHARGING) {
QString temp = i18n("%1:%2 h remaining").arg(hours).arg(minutes); TQString temp = i18n("%1:%2 h remaining").tqarg(hours).tqarg(minutes);
BatteryPBar[i]->setFormat(temp); BatteryPBar[i]->setFormat(temp);
} else { } else {
@ -266,7 +266,7 @@ void detaileddialog::setBattery() {
} }
/*! /*!
* \b SLOT to set up the Processor/CPU progress bar widgets. * \b TQT_SLOT to set up the Processor/CPU progress bar widgets.
*/ */
void detaileddialog::setPowerConsumption() { void detaileddialog::setPowerConsumption() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -277,7 +277,7 @@ void detaileddialog::setPowerConsumption() {
if (rate > 0 && !primaryBatteries->getChargeLevelUnit().isEmpty()) { if (rate > 0 && !primaryBatteries->getChargeLevelUnit().isEmpty()) {
QString _val; TQString _val;
_val.setNum(rate); _val.setNum(rate);
_val += " " + primaryBatteries->getChargeLevelUnit().remove('h'); _val += " " + primaryBatteries->getChargeLevelUnit().remove('h');
@ -298,7 +298,7 @@ void detaileddialog::setPowerConsumption() {
} }
/*! /*!
* \b SLOT to set up the Processor/CPU progress bar widgets. * \b TQT_SLOT to set up the Processor/CPU progress bar widgets.
*/ */
void detaileddialog::setProcessor() { void detaileddialog::setProcessor() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -332,12 +332,12 @@ void detaileddialog::setProcessor() {
ProcessorPBar[i]->setEnabled(false); ProcessorPBar[i]->setEnabled(false);
} }
} }
QTimer::singleShot(333, this, SLOT(setProcessor())); TQTimer::singleShot(333, this, TQT_SLOT(setProcessor()));
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
/*! /*!
* \b SLOT to set up the Processor/CPU bar widgets for cpu throttling machines. * \b TQT_SLOT to set up the Processor/CPU bar widgets for cpu throttling machines.
*/ */
void detaileddialog::setProcessorThrottling() { void detaileddialog::setProcessorThrottling() {
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
@ -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);
QString ProgressString = QString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufreq_speed[i]); TQString ProgressString = TQString("%1% (%2 MHz)").tqarg(100 - cpuInfo->cpu_throttling[i]).tqarg(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);
@ -375,24 +375,24 @@ void detaileddialog::setProcessorThrottling() {
// currently there are no events we can use to get actual data // currently there are no events we can use to get actual data
// so we recheck data ever 2 secs to register changes in the // so we recheck data ever 2 secs to register changes in the
// throttling state and if a CPU/core online state change // throttling state and if a CPU/core online state change
QTimer::singleShot(2000, this, SLOT(setProcessorThrottling())); TQTimer::singleShot(2000, this, TQT_SLOT(setProcessorThrottling()));
} }
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
/*! /*!
* \b SLOT to set up the AC status within the Led widget. * \b TQT_SLOT to set up the AC status within the Led widget.
*/ */
void detaileddialog::setAC() { void detaileddialog::setAC() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if (hwinfo->getAcAdapter()) { if (hwinfo->getAcAdapter()) {
LabelACStatus->setText( i18n("plugged in") ); LabelACtqStatus->setText( i18n("plugged in") );
LedAC->on(); LedAC->on();
} else { } else {
LedAC->off(); LedAC->off();
LabelACStatus->setText( i18n("unplugged") ); LabelACtqStatus->setText( i18n("unplugged") );
} }
setInfos(); setInfos();
@ -400,14 +400,14 @@ void detaileddialog::setAC() {
} }
/*! /*!
* \b SLOT to set all additional informtation as e.g. CPUFrequency policy * \b TQT_SLOT to set all additional informtation as e.g. CPUFrequency policy
* or current scheme * or current scheme
*/ */
void detaileddialog::setInfos() { void detaileddialog::setInfos() {
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
QString display; TQString display;
QString displayValue; TQString displayValue;
if(!config->currentScheme.isEmpty()) if(!config->currentScheme.isEmpty())
display += i18n("Current Scheme: ") + "\n"; display += i18n("Current Scheme: ") + "\n";
@ -447,7 +447,7 @@ void detaileddialog::setInfos() {
// refresh battery collection // refresh battery collection
primaryBatteries = hwinfo->getPrimaryBatteries(); primaryBatteries = hwinfo->getPrimaryBatteries();
int batteries = primaryBatteries->getNumBatteries(); int batteries = primaryBatteries->getNumBatteries();
QPtrList<Battery> allBatteries = hwinfo->getAllBatteries(); TQPtrList<Battery> allBatteries = hwinfo->getAllBatteries();
if (batteries > 0 && primaryBatteries->getNumPresentBatteries() > 0) { if (batteries > 0 && primaryBatteries->getNumPresentBatteries() > 0) {

@ -29,7 +29,7 @@
#include <kprogress.h> #include <kprogress.h>
// other QT headers: // other QT headers:
#include <qpixmap.h> #include <tqpixmap.h>
// own headers: // own headers:
#include "hardware.h" #include "hardware.h"
@ -51,10 +51,11 @@
class detaileddialog: public detailed_Dialog { class detaileddialog: public detailed_Dialog {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
detaileddialog(HardwareInfo *_hwinfo, QPixmap *_pixmap, Settings *_set, QWidget *parent = 0, const char *name = 0); detaileddialog(HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settings *_set, TQWidget *tqparent = 0, const char *name = 0);
//! default destructor //! default destructor
~detaileddialog(); ~detaileddialog();
@ -85,29 +86,29 @@ private:
Settings *config; Settings *config;
//! pointer to the kpowersave class //! pointer to the kpowersave class
QPixmap *pixmap; TQPixmap *pixmap;
//! the numbers of CPUs in the system //! the numbers of CPUs in the system
int numOfCPUs; int numOfCPUs;
//! list of progressbars for battery information //! list of progressbars for battery information
/*! /*!
* This QValueList with type KProgress contains the list * This TQValueList with type KProgress contains the list
* of battery progress widgets. Each element represent * of battery progress widgets. Each element represent
* one battery or batteryslot * one battery or batteryslot
*/ */
QValueList<KProgress *> BatteryPBar; TQValueList<KProgress *> BatteryPBar;
//! list of progressbars for CPU information //! list of progressbars for CPU information
/*! /*!
* This QValueList with type KProgress contains the list * This TQValueList with type KProgress contains the list
* of CPU progress widgets. Each element represent one CPU. * of CPU progress widgets. Each element represent one CPU.
*/ */
QValueList<KProgress *> ProcessorPBar; TQValueList<KProgress *> ProcessorPBar;
//! QGridLayout for Battery progress widgets //! TQGridLayout for Battery progress widgets
QGridLayout* BatteryGridLayout; TQGridLayout* BatteryGridLayout;
//! QGridLayout for Processor progress widgets //! TQGridLayout for Processor progress widgets
QGridLayout* ProcessorGridLayout; TQGridLayout* ProcessorGridLayout;
}; };
#endif #endif

@ -24,13 +24,13 @@
* \date 2007 * \date 2007
*/ */
#include <qstring.h> #include <tqstring.h>
#include <klocale.h> #include <klocale.h>
class dummy { class dummy {
dummy() { dummy() {
QString dummy; TQString dummy;
// from configuredialog.cpp: // from configuredialog.cpp:
dummy = i18n("If the current desktop user is inactive, dim the display to:"); dummy = i18n("If the current desktop user is inactive, dim the display to:");
@ -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 devices:"); dummy = i18n("Deactivate following tqdevices:");
dummy = i18n("Activate following devices"); dummy = i18n("Activate following tqdevices");
dummy = i18n("Reactivate following devices"); dummy = i18n("Reactivate following tqdevices");
dummy = i18n("Deactivate following device classes:"); dummy = i18n("Deactivate following tqdevice classes:");
dummy = i18n("Activate following devices classes"); dummy = i18n("Activate following tqdevices classes");
dummy = i18n("Reactivate following device classes"); dummy = i18n("Reactivate following tqdevice classes");
dummy = i18n("If the scheme switched all devices are again activated."); dummy = i18n("If the scheme switched all tqdevices 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 devices and click on "); dummy = i18n("Select one of the available tqdevices and click on ");
dummy = i18n("Select one of the available device classes and click on "); dummy = i18n("Select one of the available tqdevice classes 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 tqdevices and click on ");
dummy = i18n("Select one or more of the available device classes and click on "); dummy = i18n("Select one or more of the available tqdevice classes and click on ");
dummy = i18n("Please note: If you e.g. deactivate a network device you may lose your " dummy = i18n("Please note: If you e.g. deactivate a network tqdevice 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 devices: %2").arg("").arg(""); dummy = i18n("Scheme switched to %1. \n Deactivate following tqdevices: %2").tqarg("").tqarg("");
dummy = i18n("Scheme switched to %1. \n Activate following devices: %2").arg("").arg(""); dummy = i18n("Scheme switched to %1. \n Activate following tqdevices: %2").tqarg("").tqarg("");
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!").arg("").arg(""); dummy = i18n("Additionally, please mail the output of %1 to %2 . Thanks!").tqarg("").tqarg("");
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: ").arg(30); dummy = i18n("The display get dimmed down to %1% in: ").tqarg(30);
// other ConsoleKit related stuff // other ConsoleKit related stuff
dummy = i18n("Could not call %1. The current desktop session is not active.").arg(""); dummy = i18n("Could not call %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("Could not set %1. The current desktop session is not active.").tqarg("");
dummy = i18n("Stopped %1. The current desktop session is now inactive.").arg(""); dummy = i18n("Stopped %1. The current desktop session is now inactive.").tqarg("");
dummy = i18n("Restarted %1. The current desktop session is now active again.").arg(""); dummy = i18n("Restarted %1. The current desktop session is now active again.").tqarg("");
} }
}; };

@ -28,8 +28,8 @@
#include <fcntl.h> #include <fcntl.h>
// include QT header // include QT header
#include <qtimer.h> #include <tqtimer.h>
#include <qdir.h> #include <tqdir.h>
// include own header // include own header
#include "hardware.h" #include "hardware.h"
@ -61,8 +61,8 @@ HardwareInfo::HardwareInfo() {
primaryBatteriesLowLevel = 7; primaryBatteriesLowLevel = 7;
primaryBatteriesCriticalLevel = 2; primaryBatteriesCriticalLevel = 2;
allUDIs = QStringList(); allUDIs = TQStringList();
consoleKitSession = QString(); consoleKitSession = TQString();
BatteryList.setAutoDelete( true ); // the list owns the objects BatteryList.setAutoDelete( true ); // the list owns the objects
primaryBatteries = new BatteryCollection(BAT_PRIMARY); primaryBatteries = new BatteryCollection(BAT_PRIMARY);
@ -93,9 +93,9 @@ HardwareInfo::HardwareInfo() {
updatePrimaryBatteries(); updatePrimaryBatteries();
// connect to signals // connect to signals
connect(dbus_HAL, SIGNAL(msgReceived_withStringString( msg_type, QString, QString )), connect(dbus_HAL, TQT_SIGNAL(msgReceived_withStringString( msg_type, TQString, TQString )),
this, SLOT(processMessage( msg_type, QString, QString ))); this, TQT_SLOT(processMessage( msg_type, TQString, TQString )));
connect(dbus_HAL, SIGNAL(backFromSuspend(int)), this, SLOT(handleResumeSignal(int))); connect(dbus_HAL, TQT_SIGNAL(backFromSuspend(int)), this, TQT_SLOT(handleResumeSignal(int)));
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -122,7 +122,7 @@ void HardwareInfo::reconnectDBUS() {
if (!_reconnect && !dbus_HAL->isConnectedToDBUS()) { if (!_reconnect && !dbus_HAL->isConnectedToDBUS()) {
//reconnect failed //reconnect failed
emit dbusRunning(DBUS_NOT_RUNNING); emit dbusRunning(DBUS_NOT_RUNNING);
QTimer::singleShot(4000, this, SLOT(reconnectDBUS())); TQTimer::singleShot(4000, this, TQT_SLOT(reconnectDBUS()));
} else if (!_reconnect && dbus_HAL->isConnectedToDBUS()) { } else if (!_reconnect && dbus_HAL->isConnectedToDBUS()) {
// reset everything, we are reconnected // reset everything, we are reconnected
dbus_terminated = false; dbus_terminated = false;
@ -163,7 +163,7 @@ bool HardwareInfo::reinitHardwareInfos () {
update_info_cpufreq_policy_changed = true; update_info_cpufreq_policy_changed = true;
update_info_primBattery_changed = true; update_info_primBattery_changed = true;
allUDIs = QStringList(); allUDIs = TQStringList();
BatteryList.clear(); BatteryList.clear();
primaryBatteries = new BatteryCollection(BAT_PRIMARY); primaryBatteries = new BatteryCollection(BAT_PRIMARY);
@ -196,7 +196,7 @@ bool HardwareInfo::reinitHardwareInfos () {
* \param message the message * \param message the message
* \param value an optional message value as e.g. message string * \param value an optional message value as e.g. message string
*/ */
void HardwareInfo::processMessage (msg_type type, QString message, QString value) { void HardwareInfo::processMessage (msg_type type, TQString message, TQString value) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
switch(type) { switch(type) {
@ -208,7 +208,7 @@ void HardwareInfo::processMessage (msg_type type, QString message, QString value
if ( message.startsWith("dbus.terminate")){ if ( message.startsWith("dbus.terminate")){
// TODO: addapt from pdaemon // TODO: addapt from pdaemon
dbus_terminated = true; dbus_terminated = true;
QTimer::singleShot(4000, this, SLOT(reconnectDBUS())); TQTimer::singleShot(4000, this, TQT_SLOT(reconnectDBUS()));
} }
else if ( message.startsWith("hal.")) { else if ( message.startsWith("hal.")) {
if ( message.startsWith("hal.terminate")) { if ( message.startsWith("hal.terminate")) {
@ -250,7 +250,7 @@ void HardwareInfo::processMessage (msg_type type, QString message, QString value
} }
} }
} else if (message.startsWith("DeviceRemoved")) { } else if (message.startsWith("DeviceRemoved")) {
if (allUDIs.contains(value)) { if (allUDIs.tqcontains(value)) {
if (checkIfHandleDevice(value, &_type)) { if (checkIfHandleDevice(value, &_type)) {
switch (_type) { switch (_type) {
case BATTERY: case BATTERY:
@ -276,19 +276,19 @@ void HardwareInfo::processMessage (msg_type type, QString message, QString value
} }
break; break;
case HAL_PROPERTY_CHANGED: case HAL_PROPERTY_CHANGED:
if (!message.isEmpty() && allUDIs.contains( message )) { if (!message.isEmpty() && allUDIs.tqcontains( message )) {
if (value.startsWith( "ac_adapter.present" )) { if (value.startsWith( "ac_adapter.present" )) {
QTimer::singleShot(50, this, SLOT(checkACAdapterState())); TQTimer::singleShot(50, this, TQT_SLOT(checkACAdapterState()));
} else if (value.startsWith( "battery." )) { } else if (value.startsWith( "battery." )) {
// this is a battery event // this is a battery event
updateBatteryValues(message, value); updateBatteryValues(message, value);
} else if (value.startsWith( "button.state.value" )) { } else if (value.startsWith( "button.state.value" )) {
if (message.startsWith( *udis["lidclose"] )) { if (message.startsWith( *udis["lidclose"] )) {
QTimer::singleShot(50, this, SLOT(checkLidcloseState())); TQTimer::singleShot(50, this, TQT_SLOT(checkLidcloseState()));
} }
} else if (value.startsWith( "laptop_panel")) { } else if (value.startsWith( "laptop_panel")) {
if (message.startsWith( *udis["laptop_panel"] )) { if (message.startsWith( *udis["laptop_panel"] )) {
QTimer::singleShot(50, this, SLOT(checkBrightness())); TQTimer::singleShot(50, this, TQT_SLOT(checkBrightness()));
} }
} }
// TODO: add needed code // TODO: add needed code
@ -302,18 +302,18 @@ void HardwareInfo::processMessage (msg_type type, QString message, QString value
if (message.startsWith("ButtonPressed")) { if (message.startsWith("ButtonPressed")) {
kdDebug() << "ButtonPressed event from HAL: " << value << endl; kdDebug() << "ButtonPressed event from HAL: " << value << endl;
if (value.startsWith("lid")) { if (value.startsWith("lid")) {
QTimer::singleShot(50, this, SLOT(checkLidcloseState())); TQTimer::singleShot(50, this, TQT_SLOT(checkLidcloseState()));
} else if (value.startsWith("power")) { } else if (value.startsWith("power")) {
QTimer::singleShot(50, this, SLOT(emitPowerButtonPressed())); TQTimer::singleShot(50, this, TQT_SLOT(emitPowerButtonPressed()));
} else if (value.startsWith("sleep") || value.startsWith("suspend")) { } else if (value.startsWith("sleep") || value.startsWith("suspend")) {
QTimer::singleShot(50, this, SLOT(emitSleepButtonPressed())); TQTimer::singleShot(50, this, TQT_SLOT(emitSleepButtonPressed()));
} else if (value.startsWith("hibernate")) { } else if (value.startsWith("hibernate")) {
QTimer::singleShot(50, this, SLOT(emitS2diskButtonPressed())); TQTimer::singleShot(50, this, TQT_SLOT(emitS2diskButtonPressed()));
} else if (value.startsWith("brightness-")) { } else if (value.startsWith("brightness-")) {
if (!brightness_in_hardware && value.endsWith("-up")) if (!brightness_in_hardware && value.endsWith("-up"))
QTimer::singleShot(50, this, SLOT(brightnessUpPressed())); TQTimer::singleShot(50, this, TQT_SLOT(brightnessUpPressed()));
else if (!brightness_in_hardware && value.endsWith("-down")) else if (!brightness_in_hardware && value.endsWith("-down"))
QTimer::singleShot(50, this, SLOT(brightnessDownPressed())); TQTimer::singleShot(50, this, TQT_SLOT(brightnessDownPressed()));
} }
} else { } else {
kdDebug() << "Unmonitored HAL_CONDITION: " << message << " : " << value << endl; kdDebug() << "Unmonitored HAL_CONDITION: " << message << " : " << value << endl;
@ -327,7 +327,7 @@ void HardwareInfo::processMessage (msg_type type, QString message, QString value
} else { } else {
sessionIsActive = false; sessionIsActive = false;
} }
QTimer::singleShot(50, this, SLOT(emitSessionActiveState())); TQTimer::singleShot(50, this, TQT_SLOT(emitSessionActiveState()));
} else { } else {
if (trace) if (trace)
kdDebug() << "CONSOLEKIT_SESSION_ACTIVE: not our session" << endl; kdDebug() << "CONSOLEKIT_SESSION_ACTIVE: not our session" << endl;
@ -350,7 +350,7 @@ void HardwareInfo::processMessage (msg_type type, QString message, QString value
} }
/*! /*!
* This SLOT is used to fetch the resume signal and multiplex. If needed some * This TQT_SLOT is used to fetch the resume signal and multiplex. If needed some
* actions after resume, do this here. * actions after resume, do this here.
* \param result integer with the result of the resume/suspend * \param result integer with the result of the resume/suspend
*/ */
@ -367,7 +367,7 @@ void HardwareInfo::handleResumeSignal (int result) {
emit resumed(result); emit resumed(result);
} }
calledSuspend = QTime(); calledSuspend = TQTime();
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -429,23 +429,23 @@ bool HardwareInfo::checkConsoleKitSession () {
/*! /*!
* This function check for a given UDI, if we should handle a device * This function check for a given UDI, if we should handle a device
* \param _udi QString with the UDI of the device * \param _udi TQString with the UDI of the device
* \param *type pointer to a integer to return the type of the device, see \ref device_type * \param *type pointer to a integer to return the type of the device, see \ref device_type
* \return Boolean with info if we should handle the device. * \return Boolean with info if we should handle the device.
* \retval true if we should handle * \retval true if we should handle
* \retval false if not * \retval false if not
*/ */
bool HardwareInfo::checkIfHandleDevice ( QString _udi, int *type) { bool HardwareInfo::checkIfHandleDevice ( TQString _udi, int *type) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QStringList _cap; TQStringList _cap;
bool ret = true; bool ret = true;
if (dbus_HAL->halGetPropertyStringList( _udi, "info.capabilities", &_cap) && !_cap.isEmpty()) { if (dbus_HAL->halGetPropertyStringList( _udi, "info.capabilities", &_cap) && !_cap.isEmpty()) {
if (_cap.contains("ac_adapter")) { if (_cap.tqcontains("ac_adapter")) {
*type = BATTERY; *type = BATTERY;
} else if (_cap.contains("button")) { } else if (_cap.tqcontains("button")) {
QString _val; TQString _val;
if (dbus_HAL->halGetPropertyString( _udi, "button.type", &_val)) { if (dbus_HAL->halGetPropertyString( _udi, "button.type", &_val)) {
if (_val.startsWith("lid")) { if (_val.startsWith("lid")) {
*type = LID; *type = LID;
@ -459,9 +459,9 @@ bool HardwareInfo::checkIfHandleDevice ( QString _udi, int *type) {
} else { } else {
ret = false; ret = false;
} }
} else if (_cap.contains("battery")) { } else if (_cap.tqcontains("battery")) {
*type = BATTERY; *type = BATTERY;
} else if (_cap.contains("laptop_panel")) { } else if (_cap.tqcontains("laptop_panel")) {
*type = LAPTOP_PANEL; *type = LAPTOP_PANEL;
} else { } else {
ret = false; ret = false;
@ -515,7 +515,7 @@ void HardwareInfo::setPrimaryBatteriesWarningLevel (int _warn, int _low, int _cr
void HardwareInfo::checkIsLaptop () { void HardwareInfo::checkIsLaptop () {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString ret; TQString ret;
if (dbus_HAL->halGetPropertyString(HAL_COMPUTER_UDI, "system.formfactor", &ret)) { if (dbus_HAL->halGetPropertyString(HAL_COMPUTER_UDI, "system.formfactor", &ret)) {
@ -537,7 +537,7 @@ void HardwareInfo::checkIsLaptop () {
void HardwareInfo::checkPowermanagement() { void HardwareInfo::checkPowermanagement() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString ret; TQString ret;
has_APM = false; has_APM = false;
has_ACPI = false; has_ACPI = false;
@ -566,7 +566,7 @@ void HardwareInfo::checkPowermanagement() {
void HardwareInfo::checkSuspend() { void HardwareInfo::checkSuspend() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QStringList ret; TQStringList ret;
bool _ret_b = false; bool _ret_b = false;
suspend_states = SuspendStates(); suspend_states = SuspendStates();
@ -579,7 +579,7 @@ void HardwareInfo::checkSuspend() {
&_ret_b )) { &_ret_b )) {
suspend_states.suspend2ram_can = _ret_b; suspend_states.suspend2ram_can = _ret_b;
if (_ret_b) { if (_ret_b) {
if (ret.contains( "Suspend" )) { if (ret.tqcontains( "Suspend" )) {
suspend_states.suspend2ram = true; suspend_states.suspend2ram = true;
suspend_states.suspend2ram_allowed = dbus_HAL->isUserPrivileged(PRIV_SUSPEND, suspend_states.suspend2ram_allowed = dbus_HAL->isUserPrivileged(PRIV_SUSPEND,
HAL_COMPUTER_UDI); HAL_COMPUTER_UDI);
@ -600,7 +600,7 @@ void HardwareInfo::checkSuspend() {
&_ret_b )) { &_ret_b )) {
suspend_states.suspend2disk_can = _ret_b; suspend_states.suspend2disk_can = _ret_b;
if (_ret_b) { if (_ret_b) {
if (ret.contains( "Hibernate" )) { if (ret.tqcontains( "Hibernate" )) {
suspend_states.suspend2disk = true; suspend_states.suspend2disk = true;
suspend_states.suspend2disk_allowed = suspend_states.suspend2disk_allowed =
dbus_HAL->isUserPrivileged(PRIV_HIBERNATE, dbus_HAL->isUserPrivileged(PRIV_HIBERNATE,
@ -620,7 +620,7 @@ void HardwareInfo::checkSuspend() {
if (dbus_HAL->halGetPropertyBool( HAL_COMPUTER_UDI, "power_management.can_standby", &_ret_b )) { if (dbus_HAL->halGetPropertyBool( HAL_COMPUTER_UDI, "power_management.can_standby", &_ret_b )) {
suspend_states.standby_can = _ret_b; suspend_states.standby_can = _ret_b;
if (_ret_b) { if (_ret_b) {
if (ret.contains( "Standby" )) { if (ret.tqcontains( "Standby" )) {
suspend_states.standby = true; suspend_states.standby = true;
suspend_states.standby_allowed = dbus_HAL->isUserPrivileged(PRIV_STANDBY, suspend_states.standby_allowed = dbus_HAL->isUserPrivileged(PRIV_STANDBY,
HAL_COMPUTER_UDI); HAL_COMPUTER_UDI);
@ -720,7 +720,7 @@ cpufreq_type HardwareInfo::checkCurrentCPUFreqPolicy() {
void HardwareInfo::checkBrightness() { void HardwareInfo::checkBrightness() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QStringList devices; TQStringList devices;
brightness = false; brightness = false;
currentBrightnessLevel = -1; currentBrightnessLevel = -1;
@ -739,8 +739,8 @@ void HardwareInfo::checkBrightness() {
kdDebug() << "laptop_panel device found: " << devices.first() << endl; kdDebug() << "laptop_panel device found: " << devices.first() << endl;
// we should asume there is only one laptop panel device in the system // we should asume there is only one laptop panel device in the system
if (dbus_HAL->halGetPropertyInt(devices.first(), "laptop_panel.num_levels", &retval )) { if (dbus_HAL->halGetPropertyInt(devices.first(), "laptop_panel.num_levels", &retval )) {
udis.insert("laptop_panel", new QString( devices.first() )); udis.insert("laptop_panel", new TQString( devices.first() ));
if (!allUDIs.contains( devices.first() )) if (!allUDIs.tqcontains( devices.first() ))
allUDIs.append( devices.first() ); allUDIs.append( devices.first() );
if (retval > 1) { if (retval > 1) {
@ -798,17 +798,17 @@ void HardwareInfo::checkCurrentBrightness() {
bool HardwareInfo::intialiseHWInfo() { bool HardwareInfo::intialiseHWInfo() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QStringList ret; TQStringList ret;
if (!dbus_HAL->isConnectedToDBUS() || !dbus_HAL->isConnectedToHAL()) if (!dbus_HAL->isConnectedToDBUS() || !dbus_HAL->isConnectedToHAL())
return false; return false;
if( dbus_HAL->halFindDeviceByCapability("ac_adapter", &ret)) { if( dbus_HAL->halFindDeviceByCapability("ac_adapter", &ret)) {
// there should be normaly only one device, but let be sure // there should be normaly only one device, but let be sure
for ( QStringList::iterator it = ret.begin(); it != ret.end(); ++it ) { for ( TQStringList::iterator it = ret.begin(); it != ret.end(); ++it ) {
// we need a deep copy // we need a deep copy
udis.insert("acadapter", new QString( *it )); udis.insert("acadapter", new TQString( *it ));
if (!allUDIs.contains( *it )) if (!allUDIs.tqcontains( *it ))
allUDIs.append( *it ); allUDIs.append( *it );
checkACAdapterState(); checkACAdapterState();
} }
@ -818,10 +818,10 @@ bool HardwareInfo::intialiseHWInfo() {
if( dbus_HAL->halFindDeviceByString("button.type", "lid", &ret)) { if( dbus_HAL->halFindDeviceByString("button.type", "lid", &ret)) {
// there should be normaly only one device, but let be sure // there should be normaly only one device, but let be sure
for ( QStringList::iterator it = ret.begin(); it != ret.end(); ++it ) { for ( TQStringList::iterator it = ret.begin(); it != ret.end(); ++it ) {
// we need a deep copy // we need a deep copy
udis.insert("lidclose", new QString( *it )); udis.insert("lidclose", new TQString( *it ));
if (!allUDIs.contains( *it )) if (!allUDIs.tqcontains( *it ))
allUDIs.append( *it ); allUDIs.append( *it );
checkLidcloseState(); checkLidcloseState();
} }
@ -833,8 +833,8 @@ bool HardwareInfo::intialiseHWInfo() {
if( dbus_HAL->halFindDeviceByCapability("battery", &ret)) { if( dbus_HAL->halFindDeviceByCapability("battery", &ret)) {
if (!ret.isEmpty()) { if (!ret.isEmpty()) {
// there should be normaly only one device, but let be sure // there should be normaly only one device, but let be sure
for ( QStringList::iterator it = ret.begin(); it != ret.end(); ++it ) { for ( TQStringList::iterator it = ret.begin(); it != ret.end(); ++it ) {
if (!allUDIs.contains( *it )) if (!allUDIs.tqcontains( *it ))
allUDIs.append( *it ); allUDIs.append( *it );
BatteryList.append( new Battery(dbus_HAL, *it) ); BatteryList.append( new Battery(dbus_HAL, *it) );
} }
@ -843,7 +843,7 @@ bool HardwareInfo::intialiseHWInfo() {
Battery *bat; Battery *bat;
for (bat = BatteryList.first(); bat; bat = BatteryList.next() ) { for (bat = BatteryList.first(); bat; bat = BatteryList.next() ) {
if (bat->getType() == BAT_PRIMARY) { if (bat->getType() == BAT_PRIMARY) {
connect(bat, SIGNAL(changedBattery()),this, SLOT(updatePrimaryBatteries())); connect(bat, TQT_SIGNAL(changedBattery()),this, TQT_SLOT(updatePrimaryBatteries()));
} }
} }
} }
@ -854,7 +854,7 @@ bool HardwareInfo::intialiseHWInfo() {
} }
/*! /*!
* The function/SLOT checks the state of the AC adapter. * The function/TQT_SLOT checks the state of the AC adapter.
*/ */
void HardwareInfo::checkACAdapterState() { void HardwareInfo::checkACAdapterState() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
@ -866,7 +866,7 @@ void HardwareInfo::checkACAdapterState() {
if (_state != acadapter) { if (_state != acadapter) {
acadapter = _state; acadapter = _state;
update_info_ac_changed = true; update_info_ac_changed = true;
emit ACStatus( acadapter ); emit ACtqStatus( acadapter );
} else { } else {
update_info_ac_changed = false; update_info_ac_changed = false;
} }
@ -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 lidclosetqStatus( lidclose );
} }
} else { } else {
lidclose = false; lidclose = false;
@ -904,13 +904,13 @@ void HardwareInfo::checkLidcloseState() {
/*! /*!
* This funtion is used to call a update of a battery value for a given * This funtion is used to call a update of a battery value for a given
* UDI and the given changed property * UDI and the given changed property
* \param udi QString with the UDI of the battery * \param udi TQString with the UDI of the battery
* \param property QString with the changed property * \param property TQString with the changed property
*/ */
void HardwareInfo::updateBatteryValues (QString udi, QString property) { void HardwareInfo::updateBatteryValues (TQString udi, TQString property) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if (!udi.isEmpty() && allUDIs.contains( udi )) { if (!udi.isEmpty() && allUDIs.tqcontains( udi )) {
// find effected battery object // find effected battery object
Battery *bat; Battery *bat;
for (bat = BatteryList.first(); bat; bat = BatteryList.next() ) { for (bat = BatteryList.first(); bat; bat = BatteryList.next() ) {
@ -937,10 +937,10 @@ void HardwareInfo::updatePrimaryBatteries () {
if (primaryBatteries->getNumBatteries() < 1) { if (primaryBatteries->getNumBatteries() < 1) {
setPrimaryBatteriesWarningLevel(); setPrimaryBatteriesWarningLevel();
primaryBatteries->refreshInfo( BatteryList ); primaryBatteries->refreshInfo( BatteryList );
connect(primaryBatteries, SIGNAL(batteryChanged()), this, connect(primaryBatteries, TQT_SIGNAL(batteryChanged()), this,
SLOT(setPrimaryBatteriesChanges())); TQT_SLOT(setPrimaryBatteriesChanges()));
connect(primaryBatteries, SIGNAL(batteryWarnState(int,int)), this, connect(primaryBatteries, TQT_SIGNAL(batteryWarnState(int,int)), this,
SLOT(emitBatteryWARNState(int,int))); TQT_SLOT(emitBatteryWARNState(int,int)));
} else { } else {
setPrimaryBatteriesWarningLevel(); setPrimaryBatteriesWarningLevel();
primaryBatteries->refreshInfo( BatteryList ); primaryBatteries->refreshInfo( BatteryList );
@ -993,7 +993,7 @@ void HardwareInfo::emitBatteryWARNState (int type, int state) {
bool HardwareInfo::suspend( suspend_type suspend ) { bool HardwareInfo::suspend( suspend_type suspend ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
calledSuspend = QTime(); calledSuspend = TQTime();
if (dbus_HAL->isConnectedToDBUS() && dbus_HAL->isConnectedToHAL()) { if (dbus_HAL->isConnectedToDBUS() && dbus_HAL->isConnectedToHAL()) {
switch (suspend) { switch (suspend) {
@ -1133,7 +1133,7 @@ bool HardwareInfo::setCPUFreq ( cpufreq_type cpufreq, int limit ) {
if (dbus_HAL->isConnectedToDBUS() && dbus_HAL->isConnectedToHAL()) { if (dbus_HAL->isConnectedToDBUS() && dbus_HAL->isConnectedToHAL()) {
dbus_bool_t consider = (dbus_bool_t) getAcAdapter(); dbus_bool_t consider = (dbus_bool_t) getAcAdapter();
QStringList dynamic; TQStringList dynamic;
if (checkCurrentCPUFreqPolicy() == cpufreq) { if (checkCurrentCPUFreqPolicy() == cpufreq) {
if (cpufreq == DYNAMIC && !cpuFreqGovernor.startsWith("ondemand")) { if (cpufreq == DYNAMIC && !cpuFreqGovernor.startsWith("ondemand")) {
@ -1155,7 +1155,7 @@ bool HardwareInfo::setCPUFreq ( cpufreq_type cpufreq, int limit ) {
case DYNAMIC: case DYNAMIC:
dynamic << "ondemand" << "userspace" << "conservative"; dynamic << "ondemand" << "userspace" << "conservative";
for (QStringList::Iterator it = dynamic.begin(); it != dynamic.end(); it++){ for (TQStringList::Iterator it = dynamic.begin(); it != dynamic.end(); it++){
kdDebug() << "Try to set dynamic CPUFreq to: " << *it << endl; kdDebug() << "Try to set dynamic CPUFreq to: " << *it << endl;
if (setCPUFreqGovernor((*it).latin1())) { if (setCPUFreqGovernor((*it).latin1())) {
@ -1604,9 +1604,9 @@ BatteryCollection* HardwareInfo::getPrimaryBatteries() const {
/*! /*!
* The function return all batteries * The function return all batteries
* \return QPtrList<Battery> * \return TQPtrList<Battery>
*/ */
QPtrList<Battery> HardwareInfo::getAllBatteries() const { TQPtrList<Battery> HardwareInfo::getAllBatteries() const {
return BatteryList; return BatteryList;
} }

@ -39,11 +39,11 @@
#endif #endif
// QT - Header // QT - Header
#include <qstring.h> #include <tqstring.h>
#include <qobject.h> #include <tqobject.h>
#include <qvaluelist.h> #include <tqvaluelist.h>
#include <qptrlist.h> #include <tqptrlist.h>
#include <qdict.h> #include <tqdict.h>
// HAL Library // HAL Library
#include <hal/libhal.h> #include <hal/libhal.h>
@ -119,15 +119,16 @@ typedef struct SuspendStates {
} }
} SuspendStates; } SuspendStates;
class HardwareInfo : public QObject{ class HardwareInfo : public TQObject{
Q_OBJECT Q_OBJECT
TQ_OBJECT
private: private:
//! pointer to the dbusHAL connection class //! pointer to the dbusHAL connection class
dbusHAL *dbus_HAL; dbusHAL *dbus_HAL;
//! hold udis of special hardware execpt batteries represented by a QString pairs (name,udi) //! hold udis of special hardware execpt batteries represented by a TQString pairs (name,udi)
/*! /*!
* This directory handle udis for known fixed devices as e.g ac adapter. This devices are * This directory handle udis for known fixed devices as e.g ac adapter. This devices are
* currently available: * currently available:
@ -135,15 +136,15 @@ private:
* \li lidclose * \li lidclose
* \li laptop_panel * \li laptop_panel
*/ */
QDict<QString> udis; TQDict<TQString> udis;
//! hold the UDIs of all hardware we handle atm //! hold the UDIs of all hardware we handle atm
/*! /*!
* This QStringList contains the list of UDIs we handle at the moment in this * This TQStringList contains the list of UDIs we handle at the moment in this
* class. This should be used to handle device events from HAL for devices we * class. This should be used to handle device events from HAL for devices we
* want to monitor * want to monitor
*/ */
QStringList allUDIs; TQStringList allUDIs;
//! hold information if suspend/standby/pm actions are supported and allowed //! hold information if suspend/standby/pm actions are supported and allowed
/*! /*!
@ -152,18 +153,18 @@ private:
*/ */
SuspendStates suspend_states; SuspendStates suspend_states;
QTime calledSuspend; TQTime calledSuspend;
//! hold the list of pointers to all relevant batteries //! hold the list of pointers to all relevant batteries
QPtrList<Battery> BatteryList; TQPtrList<Battery> BatteryList;
//! hold the information about all primary batteries //! hold the information about all primary batteries
BatteryCollection *primaryBatteries; BatteryCollection *primaryBatteries;
//! hold the name of the CPU Freq governor from the last check //! hold the name of the CPU Freq governor from the last check
QString cpuFreqGovernor; TQString cpuFreqGovernor;
//! hold the ConsoleKit name/path of the actual session //! hold the ConsoleKit name/path of the actual session
QString consoleKitSession; TQString consoleKitSession;
//! enum with the currently active CPU Freq policy //! enum with the currently active CPU Freq policy
/*! This enum contains the enum with the currently set CPU Freq Policy. */ /*! This enum contains the enum with the currently set CPU Freq Policy. */
@ -305,7 +306,7 @@ private:
//! to check the current ConsoleKit session //! to check the current ConsoleKit session
bool checkConsoleKitSession(); bool checkConsoleKitSession();
//! to check if we should handle a device //! to check if we should handle a device
bool checkIfHandleDevice ( QString _udi, int *type ); bool checkIfHandleDevice ( TQString _udi, int *type );
//! to set the CPUFreq governor //! to set the CPUFreq governor
bool setCPUFreqGovernor( const char *governor ); bool setCPUFreqGovernor( const char *governor );
//! to get the state of SchedPowerSave setting of kernel/HAL //! to get the state of SchedPowerSave setting of kernel/HAL
@ -314,12 +315,12 @@ private:
bool setSchedPowerSavings( bool enable ); bool setSchedPowerSavings( bool enable );
//! find and update a battery information //! find and update a battery information
void updateBatteryValues (QString udi, QString property); void updateBatteryValues (TQString udi, TQString property);
private slots: private slots:
//! to fetch events from D-Bus and handle them //! to fetch events from D-Bus and handle them
void processMessage (msg_type type, QString message, QString value); void processMessage (msg_type type, TQString message, TQString value);
//! to update \ref primaryBatteries //! to update \ref primaryBatteries
void updatePrimaryBatteries (); void updatePrimaryBatteries ();
//! to set \ref update_info_primBattery_changed //! to set \ref update_info_primBattery_changed
@ -331,13 +332,13 @@ private slots:
//! check if brightness change is possible //! check if brightness change is possible
void checkBrightness(); void checkBrightness();
//! SLOT to handle the reconnect to D-Bus //! TQT_SLOT to handle the reconnect to D-Bus
void reconnectDBUS(); void reconnectDBUS();
//! SLOT to forward signal about changed battery warning state //! TQT_SLOT to forward signal about changed battery warning state
void emitBatteryWARNState (int type, int state); void emitBatteryWARNState (int type, int state);
//! SLOT to handle resume and forward a signal for resume //! TQT_SLOT to handle resume and forward a signal for resume
void handleResumeSignal (int result); void handleResumeSignal (int result);
//! to emit signal for power button //! to emit signal for power button
@ -361,9 +362,9 @@ signals:
void currentCPUFreqPolicyChanged(); void currentCPUFreqPolicyChanged();
//! signal the AC adapter //! signal the AC adapter
void ACStatus( bool ); void ACtqStatus( bool );
//! signal for the lidclose button //! signal for the lidclose button
void lidcloseStatus ( bool ); void lidclosetqStatus ( 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
@ -443,7 +444,7 @@ public:
//! get a pointer to the primary batteries //! get a pointer to the primary batteries
BatteryCollection* getPrimaryBatteries() const; BatteryCollection* getPrimaryBatteries() const;
//! get all batteries //! get all batteries
QPtrList<Battery> getAllBatteries() const; TQPtrList<Battery> getAllBatteries() const;
//! check the currently set CPU Frequency Policy //! check the currently set CPU Frequency Policy
cpufreq_type checkCurrentCPUFreqPolicy(); cpufreq_type checkCurrentCPUFreqPolicy();

@ -30,7 +30,7 @@
Battery::Battery(dbusHAL* _dbus_HAL) : dbus_HAL(_dbus_HAL) { Battery::Battery(dbusHAL* _dbus_HAL) : dbus_HAL(_dbus_HAL) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
udi = QString(); udi = TQString();
initialized = false; initialized = false;
initDefault(); initDefault();
@ -40,7 +40,7 @@ Battery::Battery(dbusHAL* _dbus_HAL) : dbus_HAL(_dbus_HAL) {
} }
/*! The default constructor of the class Battery. */ /*! The default constructor of the class Battery. */
Battery::Battery( dbusHAL* _dbus_HAL, QString _udi ) : dbus_HAL(_dbus_HAL), udi(_udi) { Battery::Battery( dbusHAL* _dbus_HAL, TQString _udi ) : dbus_HAL(_dbus_HAL), udi(_udi) {
if (trace) kdDebug() << funcinfo << "IN , udi: " << udi << endl; if (trace) kdDebug() << funcinfo << "IN , udi: " << udi << endl;
initialized = false; initialized = false;
@ -57,7 +57,7 @@ Battery::Battery() {
initialized = false; initialized = false;
initDefault(); initDefault();
udi = QString(); udi = TQString();
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -256,7 +256,7 @@ bool Battery::checkBatteryPresent () {
bool Battery::checkBatteryType () { bool Battery::checkBatteryType () {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString tmp_qstring; TQString tmp_qstring;
if (!dbus_HAL->isConnectedToHAL() && !dbus_HAL->reconnect()) { if (!dbus_HAL->isConnectedToHAL() && !dbus_HAL->reconnect()) {
kdError() << "Couldn't connect to HAL" << endl; kdError() << "Couldn't connect to HAL" << endl;
@ -302,7 +302,7 @@ bool Battery::checkBatteryType () {
bool Battery::checkBatteryTechnology () { bool Battery::checkBatteryTechnology () {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString tmp_qstring; TQString tmp_qstring;
if (!dbus_HAL->isConnectedToHAL() && !dbus_HAL->reconnect()) { if (!dbus_HAL->isConnectedToHAL() && !dbus_HAL->reconnect()) {
kdError() << "Couldn't connect to HAL" << endl; kdError() << "Couldn't connect to HAL" << endl;
@ -318,15 +318,15 @@ bool Battery::checkBatteryTechnology () {
if (dbus_HAL->halGetPropertyString(udi,"battery.technology", &tmp_qstring)) { if (dbus_HAL->halGetPropertyString(udi,"battery.technology", &tmp_qstring)) {
if (!tmp_qstring.isEmpty()) { if (!tmp_qstring.isEmpty()) {
technology = QString(tmp_qstring); technology = TQString(tmp_qstring);
} else { } else {
technology = QString("UNKNOWN"); technology = TQString("UNKNOWN");
} }
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return true; return true;
} else { } else {
//query was not successfull, but this property is optional //query was not successfull, but this property is optional
technology = QString("UNKNOWN"); technology = TQString("UNKNOWN");
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
} }
@ -343,7 +343,7 @@ bool Battery::checkBatteryTechnology () {
bool Battery::checkCapacityState () { bool Battery::checkCapacityState () {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString tmp_qstring; TQString tmp_qstring;
if (!dbus_HAL->isConnectedToHAL() && !dbus_HAL->reconnect()) { if (!dbus_HAL->isConnectedToHAL() && !dbus_HAL->reconnect()) {
kdError() << "Couldn't connect to HAL" << endl; kdError() << "Couldn't connect to HAL" << endl;
@ -358,12 +358,12 @@ bool Battery::checkCapacityState () {
} }
if (dbus_HAL->halGetPropertyString(udi, "battery.charge_level.capacity_state", &tmp_qstring)) { if (dbus_HAL->halGetPropertyString(udi, "battery.charge_level.capacity_state", &tmp_qstring)) {
capacity_state = QString(tmp_qstring); capacity_state = TQString(tmp_qstring);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return true; return true;
} else { } else {
//query was not successfull, but this property is optional //query was not successfull, but this property is optional
capacity_state = QString(); capacity_state = TQString();
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
} }
@ -766,13 +766,13 @@ bool Battery::checkChargingState () {
/*! /*!
* Check for the given property new values from HAL and set them to * Check for the given property new values from HAL and set them to
* the battery variables. * the battery variables.
* \param _udi QString with the UDI of the device to recheck * \param _udi TQString with the UDI of the device to recheck
* \param _property QString with the property which was changed * \param _property TQString with the property which was changed
* \return boolean with the result of the operation * \return boolean with the result of the operation
* \retval true if the update was successfull * \retval true if the update was successfull
* \retval false if the update couldn't be applied * \retval false if the update couldn't be applied
*/ */
bool Battery::updateProperty(QString _udi, QString _property) { bool Battery::updateProperty(TQString _udi, TQString _property) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
//first check whether HAL is available //first check whether HAL is available
@ -828,14 +828,14 @@ bool Battery::updateProperty(QString _udi, QString _property) {
//! Resets the current HAL udi used by the one given //! Resets the current HAL udi used by the one given
/*! /*!
* The given QString will be (checked and) used as new HAL udi for the battery. * The given TQString will be (checked and) used as new HAL udi for the battery.
* But don't forget to do a recheck of the battery afterwards. * But don't forget to do a recheck of the battery afterwards.
* \param _udi QString with the UDI to reset * \param _udi TQString with the UDI to reset
* \return boolean with the result of the operation * \return boolean with the result of the operation
* \retval true if reset was successfull * \retval true if reset was successfull
* \retval false if reset couldn't be applied * \retval false if reset couldn't be applied
*/ */
bool Battery::resetUdi(QString _udi) { bool Battery::resetUdi(TQString _udi) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
bool tmp_result=false; bool tmp_result=false;
@ -909,8 +909,8 @@ void Battery::setCritLevel(int _crit_level) {
// ---> get private members SECTION : START <---- // ---> get private members SECTION : START <----
//! reports the HAL udi of this battery //! reports the HAL udi of this battery
QString Battery::getUdi() const { TQString Battery::getUdi() const {
return QString(udi); return TQString(udi);
} }
//! reports the battery type //! reports the battery type
@ -919,8 +919,8 @@ int Battery::getType() const {
} }
//! gives the name of this battery technology //! gives the name of this battery technology
QString Battery::getTechnology() const { TQString Battery::getTechnology() const {
return QString(technology); return TQString(technology);
} }
//! tells the current batterystate as enum BAT_STATE_ //! tells the current batterystate as enum BAT_STATE_
@ -954,8 +954,8 @@ int Battery::getChargingState() const {
} }
//! reports the physical unit of values like DesignCapacity, PresentRate and Lastfull //! reports the physical unit of values like DesignCapacity, PresentRate and Lastfull
QString Battery::getChargelevelUnit() const { TQString Battery::getChargelevelUnit() const {
return QString(charge_level_unit); return TQString(charge_level_unit);
} }
//! reports current chargelevel in percentage //! reports current chargelevel in percentage
@ -974,8 +974,8 @@ int Battery::getCurrentLevel() const {
} }
//! reports HAL capacity_state value //! reports HAL capacity_state value
QString Battery::getCapacityState() const { TQString Battery::getCapacityState() const {
return QString(capacity_state); return TQString(capacity_state);
} }
//! reports the chargelevel in percent when battery goes to state warning //! reports the chargelevel in percent when battery goes to state warning

@ -38,15 +38,16 @@
#endif #endif
// QT - Header // QT - Header
#include <qstring.h> #include <tqstring.h>
#include <qstringlist.h> #include <tqstringlist.h>
#include <qobject.h> #include <tqobject.h>
#include "dbusHAL.h" #include "dbusHAL.h"
class Battery : public QObject { class Battery : public TQObject {
Q_OBJECT Q_OBJECT
TQ_OBJECT
private: private:
//! Internal reference to dbusHAL for communication with HAL daemon //! Internal reference to dbusHAL for communication with HAL daemon
@ -54,30 +55,30 @@ private:
//! HAL udi of the battery to represent //! HAL udi of the battery to represent
/*! /*!
* This QString holds the HAL udi adress of the battery. * This TQString holds the HAL udi adress of the battery.
* \li empty: all primary batteries are represented * \li empty: all primary batteries are represented
* \li e.g. "/org/freedesktop/Hal/devices/acpi_BAT0": first acpi battery * \li e.g. "/org/freedesktop/Hal/devices/acpi_BAT0": first acpi battery
*/ */
QString udi; TQString udi;
//! Technologyname of the battery //! Technologyname of the battery
/*! /*!
* Tells the type of technologyname the battery is working with. * Tells the type of technologyname the battery is working with.
* \li e.g. "LION" * \li e.g. "LION"
*/ */
QString technology; TQString technology;
//! Current charging state of this battery as reported by HAL //! Current charging state of this battery as reported by HAL
/*! /*!
* This QString tells the current capacity_state HAL is reporting. * This TQString tells the current capacity_state HAL is reporting.
* \li as of current HAL spec: "ok", "critical" * \li as of current HAL spec: "ok", "critical"
*/ */
QString capacity_state; TQString capacity_state;
//! Unit of charge_level_unit and charge_level_lastfull. //! Unit of charge_level_unit and charge_level_lastfull.
/*! This QString tells the physical unit the values of charge_level_unit. */ /*! This TQString tells the physical unit the values of charge_level_unit. */
QString charge_level_unit; TQString charge_level_unit;
//! Serialnumber of the the battery //! Serialnumber of the the battery
/*! Identifies the currently installed battery uniquely. */ /*! Identifies the currently installed battery uniquely. */
QString serial; TQString serial;
//! Boolean which tells if the battery is initalized first time //! Boolean which tells if the battery is initalized first time
/*! /*!
@ -224,7 +225,7 @@ signals:
public: public:
//! default constructor //! default constructor
Battery( dbusHAL* _dbus_HAL, QString _udi ); Battery( dbusHAL* _dbus_HAL, TQString _udi );
//! default constructor //! default constructor
Battery( dbusHAL* _dbus_HAL ); Battery( dbusHAL* _dbus_HAL );
//! this constructor forces the use of init with dbuHAL pointer set! //! this constructor forces the use of init with dbuHAL pointer set!
@ -239,17 +240,17 @@ public:
//! rechecks only minimalistic set properties //! rechecks only minimalistic set properties
void minRecheck(); void minRecheck();
//! update a property on HAL event //! update a property on HAL event
bool updateProperty(QString _udi, QString _property); bool updateProperty(TQString _udi, TQString _property);
//ro-Interface to internal data //ro-Interface to internal data
//! reports the HAL udi of this battery //! reports the HAL udi of this battery
QString getUdi() const; TQString getUdi() const;
//! reports HAL capacity_state value //! reports HAL capacity_state value
QString getCapacityState() const; TQString getCapacityState() const;
//! reports the physical unit of values like DesignCapacity, PresentRate and Lastfull //! reports the physical unit of values like DesignCapacity, PresentRate and Lastfull
QString getChargelevelUnit() const; TQString getChargelevelUnit() const;
//! gives the name of this battery technology //! gives the name of this battery technology
QString getTechnology() const; TQString getTechnology() const;
//! get availability of this battery //! get availability of this battery
bool isPresent(); bool isPresent();
@ -283,12 +284,12 @@ public:
//writeable access to internals //writeable access to internals
//! Resets the current HAL udi used by the one given //! Resets the current HAL udi used by the one given
/*! /*!
* The given QString will be (checked and) used as new HAL udi for the battery. * The given TQString will be (checked and) used as new HAL udi for the battery.
* But don't forget to do a recheck of the battery afterwards. * But don't forget to do a recheck of the battery afterwards.
* \li returns TRUE: if reset was successfull * \li returns TRUE: if reset was successfull
* \li returns FALSE: if reset couldn't be applied * \li returns FALSE: if reset couldn't be applied
*/ */
bool resetUdi(QString); bool resetUdi(TQString);
//! sets the chargelevel in percent when battery should go into state warning //! sets the chargelevel in percent when battery should go into state warning
void setWarnLevel(int _warn_level); void setWarnLevel(int _warn_level);

@ -68,11 +68,11 @@ void BatteryCollection::initDefault() {
/*! /*!
* This function refresh the information of the collection from the given * This function refresh the information of the collection from the given
* batterylist. * batterylist.
* \param BatteryList QPtrList with battery objects * \param BatteryList TQPtrList with battery objects
* \param force_level_recheck boolean with info if the the check for the current * \param force_level_recheck boolean with info if the the check for the current
* battery warning level should get forced * battery warning level should get forced
*/ */
bool BatteryCollection::refreshInfo(QPtrList<Battery> BatteryList, bool force_level_recheck) { bool BatteryCollection::refreshInfo(TQPtrList<Battery> BatteryList, bool force_level_recheck) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
int _charging_state = UNKNOWN_STATE; int _charging_state = UNKNOWN_STATE;
@ -203,13 +203,13 @@ bool BatteryCollection::refreshInfo(QPtrList<Battery> BatteryList, bool force_le
} }
//! check if the given udi is already handled by this collection //! check if the given udi is already handled by this collection
bool BatteryCollection::isBatteryHandled( QString udi ) { bool BatteryCollection::isBatteryHandled( TQString udi ) {
return udis.contains( udi ); return udis.tqcontains( udi );
} }
// ---> write private members SECTION : START <---- // ---> write private members SECTION : START <----
//! get the unit for charge level stuff //! get the unit for charge level stuff
QString BatteryCollection::getChargeLevelUnit() const { TQString BatteryCollection::getChargeLevelUnit() const {
return present_rate_unit; return present_rate_unit;
} }

@ -37,24 +37,25 @@
#endif #endif
// QT - Header // QT - Header
#include <qstring.h> #include <tqstring.h>
#include <qstringlist.h> #include <tqstringlist.h>
#include <qobject.h> #include <tqobject.h>
// own Header // own Header
#include "hardware_battery.h" #include "hardware_battery.h"
class BatteryCollection : public QObject { class BatteryCollection : public TQObject {
Q_OBJECT Q_OBJECT
TQ_OBJECT
private: private:
//! contains the udis of the batteries of this collection //! contains the udis of the batteries of this collection
QStringList udis; TQStringList udis;
//! contains the rate unit //! contains the rate unit
QString present_rate_unit; TQString present_rate_unit;
//! Roletype of battery //! Roletype of battery
/*! /*!
@ -160,13 +161,13 @@ public:
// functions // functions
//! refresh the information of the collection from the given batterylist //! refresh the information of the collection from the given batterylist
bool refreshInfo(QPtrList<Battery> BatteryList, bool force_level_recheck = false); bool refreshInfo(TQPtrList<Battery> BatteryList, bool force_level_recheck = false);
//! check if this collection already handle a special battery/udi //! check if this collection already handle a special battery/udi
bool isBatteryHandled(QString udi); bool isBatteryHandled(TQString udi);
// get internals // get internals
//! get the unit for charge level stuff //! get the unit for charge level stuff
QString getChargeLevelUnit() const; TQString getChargeLevelUnit() const;
//! get the cumulative remaining time //! get the cumulative remaining time
int getRemainingMinutes() const; int getRemainingMinutes() const;

@ -33,8 +33,8 @@
#include "hardware_cpu.moc" #include "hardware_cpu.moc"
// QT Header // QT Header
#include <qdir.h> #include <tqdir.h>
#include <qtimer.h> #include <tqtimer.h>
// system header // system header
#include <fcntl.h> #include <fcntl.h>
@ -63,8 +63,8 @@ int CPUInfo::getCPUNum() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
int cpu_id=0; int cpu_id=0;
QDir tmp_dir; TQDir tmp_dir;
QString cpu_path = "/sys/devices/system/cpu/cpu0/"; TQString cpu_path = "/sys/devices/system/cpu/cpu0/";
#ifdef FAKE_CPU #ifdef FAKE_CPU
cpu_path.prepend("/tmp/foo"); cpu_path.prepend("/tmp/foo");
#endif #endif
@ -76,13 +76,13 @@ int CPUInfo::getCPUNum() {
cpuFreqHW = false; cpuFreqHW = false;
} }
QString tmp_path = tmp_dir.absFilePath(cpu_path, true); TQString tmp_path = tmp_dir.absFilePath(cpu_path, true);
while (tmp_dir.exists(tmp_path)) { while (tmp_dir.exists(tmp_path)) {
int tmp = cpu_id; int tmp = cpu_id;
cpu_id++; cpu_id++;
cpu_path.replace(QString::number(tmp), QString::number(cpu_id)); cpu_path.tqreplace(TQString::number(tmp), TQString::number(cpu_id));
tmp_path = tmp_dir.absFilePath(cpu_path, true); tmp_path = tmp_dir.absFilePath(cpu_path, true);
} }
@ -107,7 +107,7 @@ int CPUInfo::checkCPUSpeed(){
int new_value = -1; int new_value = -1;
int fd; int fd;
char buf[15]; char buf[15];
QString cpu_device = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"; TQString cpu_device = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq";
#ifdef FAKE_CPU #ifdef FAKE_CPU
cpu_device.prepend("/tmp/foo"); cpu_device.prepend("/tmp/foo");
#endif #endif
@ -141,7 +141,7 @@ int CPUInfo::checkCPUSpeed(){
cpufreq_speed.append(new_value); cpufreq_speed.append(new_value);
} }
cpu_device.replace(QString::number(cpu_id), QString::number(cpu_id+1)); cpu_device.tqreplace(TQString::number(cpu_id), TQString::number(cpu_id+1));
} }
if (speed_changed) { if (speed_changed) {
@ -164,11 +164,11 @@ int CPUInfo::checkCPUSpeed(){
int CPUInfo::checkCPUSpeedThrottling() { int CPUInfo::checkCPUSpeedThrottling() {
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
QString cpu_file = "/proc/cpuinfo"; TQString cpu_file = "/proc/cpuinfo";
#ifdef FAKE_CPU #ifdef FAKE_CPU
cpu_file.prepend("/tmp/foo"); cpu_file.prepend("/tmp/foo");
#endif #endif
QFile cpu_info(cpu_file); TQFile cpu_info(cpu_file);
// clear cpufreq list // clear cpufreq list
cpufreq_speed.clear(); cpufreq_speed.clear();
@ -179,8 +179,8 @@ int CPUInfo::checkCPUSpeedThrottling() {
return -1; return -1;
} }
QTextStream stream( &cpu_info ); TQTextStream stream( &cpu_info );
QString line; TQString line;
while ( !stream.atEnd() ) { while ( !stream.atEnd() ) {
line = stream.readLine(); line = stream.readLine();
@ -212,24 +212,24 @@ bool CPUInfo::getCPUThrottlingState() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
int id = 0; int id = 0;
QFileInfo *fi; TQFileInfo *fi;
QString cpu_dirname; TQString cpu_dirname;
QString dir_acpi_processor = "/proc/acpi/processor/"; TQString dir_acpi_processor = "/proc/acpi/processor/";
#ifdef FAKE_CPU #ifdef FAKE_CPU
dir_acpi_processor.prepend("/tmp/foo"); dir_acpi_processor.prepend("/tmp/foo");
#endif #endif
QDir d_throttling(dir_acpi_processor); TQDir d_throttling(dir_acpi_processor);
if (!d_throttling.exists()) { if (!d_throttling.exists()) {
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
} }
d_throttling.setFilter( QDir::Dirs ); d_throttling.setFilter( TQDir::Dirs );
d_throttling.setNameFilter("CPU*"); d_throttling.setNameFilter("CPU*");
const QFileInfoList *list = d_throttling.entryInfoList(); const TQFileInfoList *list = d_throttling.entryInfoList();
QFileInfoListIterator it( *list ); TQFileInfoListIterator it( *list );
// clear throttling value list // clear throttling value list
cpu_throttling.clear(); cpu_throttling.clear();
@ -237,17 +237,17 @@ bool CPUInfo::getCPUThrottlingState() {
while ((fi = it.current()) != 0 ) { while ((fi = it.current()) != 0 ) {
cpu_dirname = fi->fileName(); cpu_dirname = fi->fileName();
QString throttling_device = d_throttling.absPath(); TQString throttling_device = d_throttling.absPath();
throttling_device.append("/").append(cpu_dirname).append("/throttling"); throttling_device.append("/").append(cpu_dirname).append("/throttling");
kdDebug() << "Throttling state file for CPU" << id << " will be: " << throttling_device << endl; kdDebug() << "Throttling state file for CPU" << id << " will be: " << throttling_device << endl;
QFile throttling(throttling_device); TQFile throttling(throttling_device);
// open throttling state file // open throttling state file
if ( throttling.open(IO_ReadOnly) ) { if ( throttling.open(IO_ReadOnly) ) {
QTextStream stream( &throttling ); TQTextStream stream( &throttling );
QString line; TQString line;
do { do {
line = stream.readLine(); line = stream.readLine();
@ -283,7 +283,7 @@ void CPUInfo::getCPUMaxSpeed() {
int fd; int fd;
int maxfreq; int maxfreq;
char buf[15]; char buf[15];
QString cpu_device_max = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"; TQString cpu_device_max = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq";
#ifdef FAKE_CPU #ifdef FAKE_CPU
cpu_device_max.prepend("/tmp/foo"); cpu_device_max.prepend("/tmp/foo");
#endif #endif
@ -306,7 +306,7 @@ void CPUInfo::getCPUMaxSpeed() {
close(fd); close(fd);
} }
cpu_device_max.replace(QString::number(cpu_id), QString::number(cpu_id+1)); cpu_device_max.tqreplace(TQString::number(cpu_id), TQString::number(cpu_id+1));
} }
kdDebugFuncOut(trace); kdDebugFuncOut(trace);

@ -39,16 +39,17 @@
#endif #endif
// QT Headers // QT Headers
#include <qstring.h> #include <tqstring.h>
#include <qobject.h> #include <tqobject.h>
#include <qvaluelist.h> #include <tqvaluelist.h>
// own headers // own headers
#include "kpowersave_debug.h" #include "kpowersave_debug.h"
class CPUInfo : public QObject{ class CPUInfo : public TQObject{
Q_OBJECT Q_OBJECT
TQ_OBJECT
private: private:
@ -63,21 +64,21 @@ public:
* This interge value represent the current throttling step of the CPU in percent * This interge value represent the current throttling step of the CPU in percent
* \li a value >= 0 in % * \li a value >= 0 in %
*/ */
QValueList <int> cpu_throttling; TQValueList <int> cpu_throttling;
//! represent the current CPU speeds //! represent the current CPU speeds
/*! /*!
* This integer value represent the current speed/frequency of the CPUs in Mhz * This integer value represent the current speed/frequency of the CPUs in Mhz
* \li a value > 0 in Mhz * \li a value > 0 in Mhz
*/ */
QValueList <int> cpufreq_speed; TQValueList <int> cpufreq_speed;
//! represent the max. CPU speeds //! represent the max. CPU speeds
/*! /*!
* This integer value represent the max speed/frequency of the CPUs in Mhz * This integer value represent the max speed/frequency of the CPUs in Mhz
* \li a value > 0 in Mhz * \li a value > 0 in Mhz
*/ */
QValueList <int> cpufreq_max_speed; TQValueList <int> cpufreq_max_speed;
//! if the machine support change CPU Freq in general //! if the machine support change CPU Freq in general
/*! /*!

@ -53,8 +53,8 @@ inactivity::inactivity() {
int dummy = 0; int dummy = 0;
has_XSC_Extension = XScreenSaverQueryExtension( qt_xdisplay(), &dummy, &dummy ); has_XSC_Extension = XScreenSaverQueryExtension( qt_xdisplay(), &dummy, &dummy );
checkInactivity = new QTimer( this ); checkInactivity = new TQTimer( this );
connect( checkInactivity, SIGNAL(timeout()), this, SLOT(check())); connect( checkInactivity, TQT_SIGNAL(timeout()), this, TQT_SLOT(check()));
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -72,13 +72,13 @@ inactivity::~inactivity() {
/*! /*!
* This function start the monitoring of inactivity of user on the X-Server. * This function start the monitoring of inactivity of user on the X-Server.
* Here wee set the time for the signal \ref inactivityTimeExpired() and start * Here wee set the time for the signal \ref inactivityTimeExpired() and start
* the needed QTimer. * the needed TQTimer.
* \param timeToExpire Integer value representing the time of inactivity which need * \param timeToExpire Integer value representing the time of inactivity which need
* to elapse befor send signal. The time is in seconds. * to elapse befor send signal. The time is in seconds.
* \param blacked QStringList with blacklisted programs which if detected with * \param blacked TQStringList with blacklisted programs which if detected with
* pidof() as running prevent the autosuspend. * pidof() as running prevent the autosuspend.
*/ */
void inactivity::start( int timeToExpire, QStringList blacked ) { void inactivity::start( int timeToExpire, TQStringList blacked ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
blacklist = blacked; blacklist = blacked;
@ -93,7 +93,7 @@ void inactivity::start( int timeToExpire, QStringList blacked ) {
} }
/*! /*!
* \b SLOT to call check as recheck inactivity if befor a running PID * \b TQT_SLOT to call check as recheck inactivity if befor a running PID
* request was detected. * request was detected.
*/ */
void inactivity::recheck() { void inactivity::recheck() {
@ -105,14 +105,14 @@ void inactivity::recheck() {
} }
/*! /*!
* \b SLOT to call check without a recheck. * \b TQT_SLOT to call check without a recheck.
*/ */
void inactivity::check() { void inactivity::check() {
check(false); check(false);
} }
/*! /*!
* \b SLOT to check the current idle-time of the X-Server and if there * \b TQT_SLOT to check the current idle-time of the X-Server and if there
* are blacklisted programs are running. If the through \ref timeToInactivity * are blacklisted programs are running. If the through \ref timeToInactivity
* defined time is expired, this function emit signal \ref inactivityTimeExpired() . * defined time is expired, this function emit signal \ref inactivityTimeExpired() .
* \param recheck boolean which define if this is a recheck or not. * \param recheck boolean which define if this is a recheck or not.
@ -143,7 +143,7 @@ void inactivity::check( bool recheck ) {
} }
else { else {
//called if there is a getPIDs() is running //called if there is a getPIDs() is running
QTimer::singleShot(500, this, SLOT(recheck())); TQTimer::singleShot(500, this, TQT_SLOT(recheck()));
} }
} }
else checkInactivity->start(CHECK_for_INACTIVITY, true); else checkInactivity->start(CHECK_for_INACTIVITY, true);
@ -288,10 +288,10 @@ void inactivity::checkBlacklisted(){
proc = new KProcess; proc = new KProcess;
*proc << "pidof" << blacklist; *proc << "pidof" << blacklist;
connect( proc, SIGNAL(receivedStdout(KProcess *, char *, int)),this, connect( proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this,
SLOT(getPIDs(KProcess *, char *, int))); TQT_SLOT(getPIDs(KProcess *, char *, int)));
connect( proc, SIGNAL(processExited(KProcess *)), connect( proc, TQT_SIGNAL(processExited(KProcess *)),
SLOT(getPIDsExited(KProcess *))); TQT_SLOT(getPIDsExited(KProcess *)));
if (!proc->start(KProcess::NotifyOnExit, KProcess::AllOutput)) if (!proc->start(KProcess::NotifyOnExit, KProcess::AllOutput))
{ {
@ -309,7 +309,7 @@ void inactivity::checkBlacklisted(){
/*! /*!
* \b SLOT to get the return of the command pidof and parse this to set * \b TQT_SLOT to get the return of the command pidof and parse this to set
* \ref blacklisted_running . * \ref blacklisted_running .
* \param *proc pointer to the sending KProcess * \param *proc pointer to the sending KProcess
* \param *buffer the char pointer to the output of the process to stdout * \param *buffer the char pointer to the output of the process to stdout
@ -318,14 +318,14 @@ void inactivity::checkBlacklisted(){
void inactivity::getPIDs(KProcess */*proc*/, char *buffer, int /*lenght*/) { void inactivity::getPIDs(KProcess */*proc*/, char *buffer, int /*lenght*/) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
QString pids(buffer); TQString pids(buffer);
pids.remove(" "); pids.remove(" ");
if(pids.isEmpty() || pids == "\n" ) { if(pids.isEmpty() || pids == "\n" ) {
kdDebug() << "NO! BLACKLISTED IS RUNNING" << endl; kdDebug() << "NO! BLACKLISTED IS RUNNING" << endl;
blacklisted_running = false; blacklisted_running = false;
} }
else { else {
if (pids.contains(QRegExp("[0-9]"))) { if (pids.tqcontains(TQRegExp("[0-9]"))) {
kdDebug() << "BLACKLISTED IS RUNNING" << endl; kdDebug() << "BLACKLISTED IS RUNNING" << endl;
blacklisted_running = true; blacklisted_running = true;
blacklisted_running_last = idleTime; blacklisted_running_last = idleTime;
@ -342,7 +342,7 @@ void inactivity::getPIDs(KProcess */*proc*/, char *buffer, int /*lenght*/) {
/*! /*!
* \b SLOT which called if the call of pidof is exited * \b TQT_SLOT which called if the call of pidof is exited
* \param proc the KPocess which called this SLOT * \param proc the KPocess which called this SLOT
*/ */
void inactivity::getPIDsExited(KProcess *proc){ void inactivity::getPIDsExited(KProcess *proc){

@ -22,19 +22,19 @@
/* this is needed to avoid typedef clash with X11 /* this is needed to avoid typedef clash with X11
*/ */
#ifndef QT_CLEAN_NAMESPACE #ifndef TQT_CLEAN_NAMESPACE
#define QT_CLEAN_NAMESPACE #define TQT_CLEAN_NAMESPACE
#endif #endif
// KDE Header // KDE Header
#include <kprocess.h> #include <kprocess.h>
// QT Header // QT Header
#include <qregexp.h> #include <tqregexp.h>
#include <qstring.h> #include <tqstring.h>
#include <qwidget.h> #include <tqwidget.h>
#include <qtimer.h> #include <tqtimer.h>
#include <qevent.h> #include <tqevent.h>
// X11 Header // X11 Header
#include <X11/X.h> #include <X11/X.h>
@ -56,9 +56,10 @@
* \date 2006 * \date 2006
*/ */
class inactivity : public QWidget class inactivity : public TQWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
@ -67,7 +68,7 @@ public:
~inactivity(); ~inactivity();
//! to start the monitoring of the X-Server //! to start the monitoring of the X-Server
void start(int, QStringList); void start(int, TQStringList);
//! to stop the monitoring of the X-Server //! to stop the monitoring of the X-Server
void stop(); void stop();
@ -79,7 +80,7 @@ signals:
//! signal emited if the with \ref start() set time of inactivity is expired //! signal emited if the with \ref start() set time of inactivity is expired
void inactivityTimeExpired(); void inactivityTimeExpired();
//! signal to emit error msg //! signal to emit error msg
void displayErrorMsg( QString ); void displayErrorMsg( TQString );
private: private:
@ -117,8 +118,8 @@ private:
*/ */
bool blacklisted_running; bool blacklisted_running;
//! QStringList with blacklisted programs for autosuspend //! TQStringList with blacklisted programs for autosuspend
QStringList blacklist; TQStringList blacklist;
//! time which must expire befor emit signal for autosuspend //! time which must expire befor emit signal for autosuspend
unsigned long timeToInactivity; unsigned long timeToInactivity;
@ -129,20 +130,20 @@ private:
//! if the XServer-has XScreenSaverExtension //! if the XServer-has XScreenSaverExtension
int has_XSC_Extension; int has_XSC_Extension;
//! QTimer intervall for the \ref checkInactivity Timer //! TQTimer intervall for the \ref checkInactivity Timer
/*! /*!
* The time intervall to check for the current status and time of * The time intervall to check for the current status and time of
* userinactivity. The timeslice is currently 30 sec. * userinactivity. The timeslice is currently 30 sec.
*/ */
static const int CHECK_for_INACTIVITY = 30000; static const int CHECK_for_INACTIVITY = 30000;
//! QTimer for check inactivity //! TQTimer for check inactivity
/*! /*!
* This timer is used to check the currently status and time of * This timer is used to check the currently status and time of
* userinactivity on the X-Server. The timerinterval is defined trough * userinactivity on the X-Server. The timerinterval is defined trough
* \ref CHECK_for_INACTIVITY . * \ref CHECK_for_INACTIVITY .
*/ */
QTimer *checkInactivity; TQTimer *checkInactivity;
// -------- FUNCTIONS ------------ // -------- FUNCTIONS ------------

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>info_Dialog</class> <class>info_Dialog</class>
<widget class="QDialog"> <widget class="TQDialog">
<property name="name"> <property name="name">
<cstring>info_Dialog</cstring> <cstring>info_Dialog</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -19,11 +19,11 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QPushButton" row="3" column="4"> <widget class="TQPushButton" row="3" column="4">
<property name="name"> <property name="name">
<cstring>buttonOK</cstring> <cstring>buttonOK</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -46,7 +46,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>171</width> <width>171</width>
<height>21</height> <height>21</height>
@ -63,24 +63,24 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>151</width> <width>151</width>
<height>21</height> <height>21</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="0" column="1" rowspan="2" colspan="2"> <widget class="TQLabel" row="0" column="1" rowspan="2" colspan="2">
<property name="name"> <property name="name">
<cstring>iconPixmap</cstring> <cstring>iconPixmap</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>32</height> <height>32</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>32</height> <height>32</height>
@ -93,11 +93,11 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="3" rowspan="2" colspan="4"> <widget class="TQLabel" row="0" column="3" rowspan="2" colspan="4">
<property name="name"> <property name="name">
<cstring>msgText</cstring> <cstring>msgText</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>370</width> <width>370</width>
<height>50</height> <height>50</height>
@ -106,7 +106,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -120,7 +120,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>20</height> <height>20</height>
@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>20</height> <height>20</height>
@ -154,18 +154,18 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QCheckBox" row="2" column="3" rowspan="1" colspan="3"> <widget class="TQCheckBox" row="2" column="3" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>dontShowAgain</cstring> <cstring>dontShowAgain</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>330</width> <width>330</width>
<height>0</height> <height>0</height>
@ -188,7 +188,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>21</height> <height>21</height>
@ -210,8 +210,8 @@
<slot>ButtonOK_clicked()</slot> <slot>ButtonOK_clicked()</slot>
</connection> </connection>
</connections> </connections>
<slots> <Q_SLOTS>
<slot>ButtonOK_clicked()</slot> <slot>ButtonOK_clicked()</slot>
</slots> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -33,18 +33,18 @@
#include <klocale.h> #include <klocale.h>
// QT headers: // QT headers:
#include <qcheckbox.h> #include <tqcheckbox.h>
#include <qdialog.h> #include <tqdialog.h>
#include <qlabel.h> #include <tqlabel.h>
#include <qpushbutton.h> #include <tqpushbutton.h>
#include <qstring.h> #include <tqstring.h>
#include <qtooltip.h> #include <tqtooltip.h>
/*! This is the default constructor of class infoDialog . */ /*! This is the default constructor of class infoDialog . */
infoDialog::infoDialog( KConfig *config, QString captionName, QString message, infoDialog::infoDialog( KConfig *config, TQString captionName, TQString message,
QString dontShowAgainMsg, QString settingsEntryName, TQString dontShowAgainMsg, TQString settingsEntryName,
QWidget *parent, const char *name) TQWidget *tqparent, const char *name)
:info_Dialog( parent, name, false, Qt::WStyle_StaysOnTop | WDestructiveClose ) :info_Dialog( tqparent, name, false, TQt::WStyle_StaysOnTop | WDestructiveClose )
{ {
if ( message.isEmpty() || (!dontShowAgainMsg.isEmpty() && settingsEntryName.isEmpty()) || if ( message.isEmpty() || (!dontShowAgainMsg.isEmpty() && settingsEntryName.isEmpty()) ||
(!dontShowAgainMsg.isEmpty() && (config == 0))) (!dontShowAgainMsg.isEmpty() && (config == 0)))
@ -64,9 +64,9 @@ infoDialog::infoDialog( KConfig *config, QString captionName, QString message,
} }
} }
buttonOK->setIconSet(SmallIconSet("ok", QIconSet::Automatic)); buttonOK->setIconSet(SmallIconSet("ok", TQIconSet::Automatic));
QPixmap pixmap = 0; TQPixmap pixmap = 0;
pixmap = KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium); pixmap = KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium);
iconPixmap->setPixmap( pixmap ); iconPixmap->setPixmap( pixmap );
@ -90,7 +90,7 @@ infoDialog::infoDialog( KConfig *config, QString captionName, QString message,
/*! This is the default destructor of class infoDialog . */ /*! This is the default destructor of class infoDialog . */
infoDialog::~infoDialog() infoDialog::~infoDialog()
{ {
// no need to delete child widgets, Qt does it all for us // no need to delete child widgets, TQt does it all for us
} }
/*! /*!
@ -104,7 +104,7 @@ bool infoDialog::dialogIsDisabled() {
} }
/*! /*!
* SLOT: called if the 'ok' button clicked. This SLOT sync the settings * SLOT: called if the 'ok' button clicked. This TQT_SLOT sync the settings
* and close the dialog. * and close the dialog.
*/ */
void infoDialog::ButtonOK_clicked() { void infoDialog::ButtonOK_clicked() {

@ -38,13 +38,14 @@
class infoDialog: public info_Dialog { class infoDialog: public info_Dialog {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
infoDialog( KConfig *config = 0, QString captionName = QString(), QString message = QString(), infoDialog( KConfig *config = 0, TQString captionName = TQString(), TQString message = TQString(),
QString dontShowAgainMsg = QString(), QString settingsEntryName = QString(), TQString dontShowAgainMsg = TQString(), TQString settingsEntryName = TQString(),
QWidget *parent = 0, const char *name = 0); TQWidget *tqparent = 0, const char *name = 0);
//! default destructor //! default destructor
~infoDialog(); ~infoDialog();
@ -57,10 +58,10 @@ private:
KConfig *settings; KConfig *settings;
//! name of the entry in the settings //! name of the entry in the settings
/*! QString store the name of the settings entry to /*! TQString store the name of the settings entry to
* store settings of 'DontShowAgain' checkbox * store settings of 'DontShowAgain' checkbox
*/ */
QString entryName; TQString entryName;
//! represent if the dialog is disabled by user //! represent if the dialog is disabled by user
/*! /*!

File diff suppressed because it is too large Load Diff

@ -23,8 +23,8 @@
#define _KPOWERSAVE_H_ #define _KPOWERSAVE_H_
// this is needed to avoid typedef clash with X11/Xmd.h (X11/Xproto.h) // this is needed to avoid typedef clash with X11/Xmd.h (X11/Xproto.h)
#ifndef QT_CLEAN_NAMESPACE #ifndef TQT_CLEAN_NAMESPACE
#define QT_CLEAN_NAMESPACE #define TQT_CLEAN_NAMESPACE
#endif #endif
// Global Header // Global Header
@ -38,7 +38,7 @@
#include <dcopobject.h> #include <dcopobject.h>
// QT - Header // QT - Header
#include <qpopupmenu.h> #include <tqpopupmenu.h>
// kpowersave - Header // kpowersave - Header
#include "autosuspend.h" #include "autosuspend.h"
@ -68,6 +68,7 @@
class kpowersave : public KSystemTray, public DCOPObject class kpowersave : public KSystemTray, public DCOPObject
{ {
Q_OBJECT Q_OBJECT
// TQ_OBJECT
K_DCOP K_DCOP
private: private:
@ -199,10 +200,10 @@ private:
int STANDBY_MENU_ID; int STANDBY_MENU_ID;
//! a menu seperator ID //! a menu seperator ID
/*! contains the ID of the separator between sleep-states-entries and the cpufreq-submenu */ /*! contains the ID of the separator between sleep-states-entries and the cpufreq-submenu */
int CPUFREQ_SEPARATOR_MENU_ID; int CPUFRETQ_SEPARATOR_MENU_ID;
//! a submenu ID //! a submenu ID
/*! contains the ID of the cpufreq sub menu*/ /*! contains the ID of the cpufreq sub menu*/
int CPUFREQ_MENU_ID; int CPUFRETQ_MENU_ID;
//! a menu seperator ID //! a menu seperator ID
/*! contains the ID of the separator between cpufreq- and scheme-submenu*/ /*! contains the ID of the separator between cpufreq- and scheme-submenu*/
int SCHEME_SEPARATOR_MENU_ID; int SCHEME_SEPARATOR_MENU_ID;
@ -230,14 +231,14 @@ private:
*/ */
int countWhiteIconPixel; int countWhiteIconPixel;
//! QTimer-interval for icon background //! TQTimer-interval for icon background
/*! /*!
* Time intervall to set the colored background of the batteryicon on/off. * Time intervall to set the colored background of the batteryicon on/off.
* The value is 1000 msec/ 1 sec. * The value is 1000 msec/ 1 sec.
*/ */
static const int BAT_icon_BG_intervall = 1000; static const int BAT_icon_BG_intervall = 1000;
//! QTimer-interval for display HAL error message //! TQTimer-interval for display HAL error message
/*! /*!
* Time intervall to delay display the HAL error message to prevent displayed * Time intervall to delay display the HAL error message to prevent displayed
* the message if only HAL or powersave is restarted. The value is 15000 msec/ 15 sec. * the message if only HAL or powersave is restarted. The value is 15000 msec/ 15 sec.
@ -245,40 +246,40 @@ private:
static const int HAL_ERROR_MSG_intervall = 15000; static const int HAL_ERROR_MSG_intervall = 15000;
//! type of current running suspend //! type of current running suspend
/*! QString store the name of the current running suspend*/ /*! TQString store the name of the current running suspend*/
QString suspendType; TQString suspendType;
//! current name of the pixmap //! current name of the pixmap
/*! /*!
* Contains the current name of the icon/pixmap. The value must be a filename of a existing iconfile. * Contains the current name of the icon/pixmap. The value must be a filename of a existing iconfile.
* \sa power_icon, no_battery_icon, charge_icon, battery, battery_RED or battery_ORANGE * \sa power_icon, no_battery_icon, charge_icon, battery, battery_RED or battery_ORANGE
*/ */
QString pixmap_name; TQString pixmap_name;
//! contains the 'real' schemenames //! contains the 'real' schemenames
/*! /*!
* This list store the real schemenames (not the i18n()-version) * This list store the real schemenames (not the i18n()-version)
* regarding to position in the scheme-menu * regarding to position in the scheme-menu
*/ */
QStringList org_schemenames; TQStringList org_schemenames;
//! a sub-menu of the kickerapplet //! a sub-menu of the kickerapplet
/*! QPopupMenu for the cpufreq-entries. */ /*! TQPopupMenu for the cpufreq-entries. */
QPopupMenu *speed_menu; TQPopupMenu *speed_menu;
//! a sub-menu of the kickerapplet //! a sub-menu of the kickerapplet
/*! QPopupMenu for the scheme-entries. */ /*! TQPopupMenu for the scheme-entries. */
QPopupMenu *scheme_menu; TQPopupMenu *scheme_menu;
//! a sub-menu of the kickerapplet //! a sub-menu of the kickerapplet
/*! QPopupMenu for the help-entries. */ /*! TQPopupMenu for the help-entries. */
QPopupMenu *help_menu; TQPopupMenu *help_menu;
//! icon-pixmap //! icon-pixmap
/*! QPixmap with the (pre-)loaded icon from \ref pixmap_name .*/ /*! TQPixmap with the (pre-)loaded icon from \ref pixmap_name .*/
QPixmap pixmap; TQPixmap pixmap;
//! icon-pixmap //! icon-pixmap
/*! QPixmap with the full draw applet Icon (to be used in other classes) .*/ /*! TQPixmap with the full draw applet Icon (to be used in other classes) .*/
QPixmap fullIcon; TQPixmap fullIcon;
//! Timer for the blinking Icon background //! Timer for the blinking Icon background
@ -286,19 +287,19 @@ private:
* This timer is used to let blink the background of a icon in kicker. * This timer is used to let blink the background of a icon in kicker.
* The timerinterval is defined in \ref BAT_icon_BG_intervall . * The timerinterval is defined in \ref BAT_icon_BG_intervall .
*/ */
QTimer *BAT_WARN_ICON_Timer; TQTimer *BAT_WARN_ICON_Timer;
//! Timer to delay the HAL error message //! Timer to delay the HAL error message
/*! /*!
* This timer is used to add a delay befor display the HAL error message * This timer is used to add a delay befor display the HAL error message
* The timerinterval is defined in \ref HAL_ERROR_MSG_intervall . * The timerinterval is defined in \ref HAL_ERROR_MSG_intervall .
*/ */
QTimer *DISPLAY_HAL_ERROR_Timer; TQTimer *DISPLAY_HAL_ERROR_Timer;
//! Timer to dimm down/up the brightness //! Timer to dimm down/up the brightness
/*! /*!
* This timer is used dimm the display up and down. The timerinterval * This timer is used dimm the display up and down. The timerinterval
* depends on calculated timePerStep in the calling function. * depends on calculated timePerStep in the calling function.
*/ */
QTimer *AUTODIMM_Timer; TQTimer *AUTODIMM_Timer;
//! draw all icon related things for \ref redrawPixmap() //! draw all icon related things for \ref redrawPixmap()
void drawIcon(); void drawIcon();
@ -314,17 +315,17 @@ private:
void updateTooltip(); void updateTooltip();
//! Eventhandler to catch mouse-press-events and react //! Eventhandler to catch mouse-press-events and react
void mousePressEvent( QMouseEvent *qme ); void mousePressEvent( TQMouseEvent *qme );
//! Event handler to catch mouse wheel events and react //! Event handler to catch mouse wheel events and react
void wheelEvent( QWheelEvent *qwe ); void wheelEvent( TQWheelEvent *qwe );
//! Eventhandler to catch mouse enter events and react //! Eventhandler to catch mouse enter events and react
void enterEvent( QEvent *qee); void enterEvent( TQEvent *qee);
//! to handle mount/umount on resume/suspend //! to handle mount/umount on resume/suspend
bool handleMounts ( bool suspend ); bool handleMounts ( bool suspend );
//! to get the i18n string for a suspend type //! to get the i18n string for a suspend type
QString getSuspendString (int type); TQString getSuspendString (int type);
private slots: private slots:
@ -366,9 +367,9 @@ private slots:
void do_downDimm(); void do_downDimm();
//! called if the user get active again and the display should get dimmed up //! called if the user get active again and the display should get dimmed up
void do_upDimm(); void do_upDimm();
//! SLOT do do the dimmining for autodimm feature //! TQT_SLOT do do the dimmining for autodimm feature
void do_dimm(); void do_dimm();
//! SLOT to set autodimm related stuff and start autodimm monitoring //! TQT_SLOT to set autodimm related stuff and start autodimm monitoring
void setAutoDimm( bool resumed ); void setAutoDimm( bool resumed );
//! to update the main menu of the kickerapplet //! to update the main menu of the kickerapplet
@ -380,7 +381,7 @@ private slots:
void updateCPUFreqMenu(); void updateCPUFreqMenu();
//! this set \ref suspendType from signal //! this set \ref suspendType from signal
void setSuspendType( QString suspendtype ); void setSuspendType( TQString suspendtype );
//! this set the autosuspend and start the monitoring //! this set the autosuspend and start the monitoring
void setAutoSuspend( bool ); void setAutoSuspend( bool );
@ -389,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 lidclosetqStatus() 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();
@ -427,7 +428,7 @@ private slots:
//! this is invoked to display powersave error message //! this is invoked to display powersave error message
void showDBusErrorMsg( int ); void showDBusErrorMsg( int );
//! this show a blocking dialog from kpowersave with the given message //! this show a blocking dialog from kpowersave with the given message
void showErrorMessage( QString msg ); void showErrorMessage( TQString msg );
//! this is called when detailed dialog is closed //! this is called when detailed dialog is closed
void closedetaileddialog(); void closedetaileddialog();
@ -443,9 +444,9 @@ k_dcop:
//! dcop function to lock the screen //! dcop function to lock the screen
bool lockScreen(); bool lockScreen();
//! dcop function to set a scheme //! dcop function to set a scheme
bool do_setScheme( QString ); bool do_setScheme( TQString );
//! dcop function to set CPU Freq policy //! dcop function to set CPU Freq policy
bool do_setCPUFreqPolicy( QString ); bool do_setCPUFreqPolicy( TQString );
//! dcop function to send 'suspend to disk' command to powersaved //! dcop function to send 'suspend to disk' command to powersaved
bool do_suspendToDisk(); bool do_suspendToDisk();
//! dcop function to send 'suspend to RAM' command to powersaved //! dcop function to send 'suspend to RAM' command to powersaved
@ -471,19 +472,19 @@ k_dcop:
int brightnessGet(); int brightnessGet();
//! dcop function to return the name of the current scheme //! dcop function to return the name of the current scheme
QString currentScheme (); TQString currentScheme ();
//! dcop function to return the current cpufreqpolicy //! dcop function to return the current cpufreqpolicy
QString currentCPUFreqPolicy(); TQString currentCPUFreqPolicy();
//! dcop function to return the supported sleeping states //! dcop function to return the supported sleeping states
QStringList allowed_sleepingStates(); TQStringList allowed_sleepingStates();
//! dcop function to return the schemes //! dcop function to return the schemes
QStringList listSchemes(); TQStringList listSchemes();
//! dcop function to return the supported CPU //! dcop function to return the supported CPU
QStringList listCPUFreqPolicies(); TQStringList listCPUFreqPolicies();
protected: protected:
void resizeEvent ( QResizeEvent * ); void resizeEvent ( TQResizeEvent * );
}; };
#endif // _KPOWERSAVE_H_ #endif // _KPOWERSAVE_H_

@ -31,7 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
// QT - Header // QT - Header
#include <qdatetime.h> #include <tqdatetime.h>
// KDE Header // KDE Header
#include <kdebug.h> #include <kdebug.h>
@ -48,8 +48,8 @@ extern bool trace;
/* /*
* macro to collect time and k_funcinfo information for kdDebug() * macro to collect time and k_funcinfo information for kdDebug()
*/ */
#define funcinfo "[" << QTime::currentTime().toString().ascii() << \ #define funcinfo "[" << TQString(TQTime::currentTime().toString()).ascii() << \
":" << QTime::currentTime().msec() << "]" << k_funcinfo ":" << TQTime::currentTime().msec() << "]" << k_funcinfo
/* /*
* macros to trace function entry and leave points * macros to trace function entry and leave points

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>log_viewer</class> <class>log_viewer</class>
<widget class="QDialog"> <widget class="TQDialog">
<property name="name"> <property name="name">
<cstring>log_viewer</cstring> <cstring>log_viewer</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -19,9 +19,9 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout4</cstring> <cstring>tqlayout4</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -35,15 +35,15 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>pB_save</cstring> <cstring>pB_save</cstring>
</property> </property>
@ -61,14 +61,14 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>330</width> <width>330</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>pB_close</cstring> <cstring>pB_close</cstring>
</property> </property>
@ -96,9 +96,9 @@
<slot>pB_save_clicked()</slot> <slot>pB_save_clicked()</slot>
</connection> </connection>
</connections> </connections>
<slots> <Q_SLOTS>
<slot>pB_close_clicked()</slot> <slot>pB_close_clicked()</slot>
<slot>pB_save_clicked()</slot> <slot>pB_save_clicked()</slot>
</slots> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -25,8 +25,8 @@
*/ */
// QT header // QT header
#include <qfile.h> #include <tqfile.h>
#include <qtextstream.h> #include <tqtextstream.h>
// KDE header // KDE header
#include <ktextedit.h> #include <ktextedit.h>
@ -38,19 +38,19 @@
#include "logviewer.h" #include "logviewer.h"
/*! This is the default constructor of the class LogViewer. */ /*! This is the default constructor of the class LogViewer. */
LogViewer::LogViewer( QString filename, QWidget *parent, const char *name) LogViewer::LogViewer( TQString filename, TQWidget *tqparent, const char *name)
:log_viewer(parent, name, false, WDestructiveClose ) { :log_viewer(tqparent, name, false, WDestructiveClose ) {
this->setCaption(i18n("KPowersave Logfile Viewer: %1").arg(filename)); this->setCaption(i18n("KPowersave Logfile Viewer: %1").tqarg(filename));
if (!QFile::exists ( filename )) if (!TQFile::exists ( filename ))
return; return;
log_file = filename; log_file = filename;
QFile file (log_file); TQFile file (log_file);
if (file.open(IO_ReadOnly)) { if (file.open(IO_ReadOnly)) {
QTextStream stream ( &file ); TQTextStream stream ( &file );
kTextEdit->setText (stream.read()); kTextEdit->setText (stream.read());
kTextEdit->setReadOnly(true); kTextEdit->setReadOnly(true);
} }
@ -59,7 +59,7 @@ LogViewer::LogViewer( QString filename, QWidget *parent, const char *name)
/*! This is the default destructor of the class LogViewer. */ /*! This is the default destructor of the class LogViewer. */
LogViewer::~LogViewer(){ LogViewer::~LogViewer(){
// no need to delete child widgets, Qt does it all for us // no need to delete child widgets, TQt does it all for us
} }
/*! /*!
@ -75,23 +75,23 @@ void LogViewer::pB_close_clicked() {
*/ */
void LogViewer::pB_save_clicked() { void LogViewer::pB_save_clicked() {
QString sFileName; TQString sFileName;
bool tryagain = true; bool tryagain = true;
while (tryagain == true) { while (tryagain == true) {
int answer; int answer;
QString msg; TQString msg;
sFileName = KFileDialog::getSaveFileName( QDir::homeDirPath() ); sFileName = KFileDialog::getSaveFileName( TQDir::homeDirPath() );
QFileInfo info (sFileName); TQFileInfo info (sFileName);
if (QFile::exists(sFileName) && info.isWritable() && info.isReadable() && info.isFile()) { if (TQFile::exists(sFileName) && info.isWritable() && info.isReadable() && info.isFile()) {
msg = i18n("File already exist. Overwrite the file?"); msg = i18n("File already exist. Overwrite the file?");
answer = KMessageBox::questionYesNo(this, msg , i18n("Error while save logfile")); answer = KMessageBox::questionYesNo(this, msg , i18n("Error while save logfile"));
if (answer == KMessageBox::Yes) { if (answer == KMessageBox::Yes) {
tryagain = false; tryagain = false;
} }
} else if (QFile::exists(sFileName)) { } else if (TQFile::exists(sFileName)) {
msg = i18n("File already exist."); msg = i18n("File already exist.");
answer = KMessageBox::warningContinueCancel(this, msg , answer = KMessageBox::warningContinueCancel(this, msg ,
i18n("Error while save logfile"), i18n("Error while save logfile"),
@ -105,11 +105,11 @@ void LogViewer::pB_save_clicked() {
} }
} }
QFile in(log_file); TQFile in(log_file);
QFile out(sFileName); TQFile out(sFileName);
if (in.open(IO_ReadOnly)) { if (in.open(IO_ReadOnly)) {
if (out.open(IO_WriteOnly)) { if (out.open(IO_WriteOnly)) {
QByteArray input(4096); TQByteArray input(4096);
long l = 0; long l = 0;
while (!in.atEnd()) { while (!in.atEnd()) {
l = in.readLine(input.data(), 4096); l = in.readLine(input.data(), 4096);

@ -38,16 +38,17 @@
class LogViewer: public log_viewer { class LogViewer: public log_viewer {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
LogViewer( QString filename, QWidget *parent = 0, const char *name = 0); LogViewer( TQString filename, TQWidget *tqparent = 0, const char *name = 0);
//! default destructor //! default destructor
~LogViewer(); ~LogViewer();
private: private:
//! name of the log file //! name of the log file
QString log_file; TQString log_file;
private slots: private slots:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

@ -52,16 +52,16 @@ screen::screen() {
xlock = NULL; xlock = NULL;
got_XScreensaver = false; got_XScreensaver = false;
checkDPMSStatus(); checkDPMStqStatus();
check_xscreensaver_timer_runs = false; check_xscreensaver_timer_runs = false;
SCREENSAVER_STATUS = -1; SCREENSAVER_STATUS = -1;
screen_save_dcop_ref = DCOPRef( "kdesktop", "KScreensaverIface" ); screen_save_dcop_ref = DCOPRef( "kdesktop", "KScreensaverIface" );
check_xscreensaver_timer = new QTimer( this ); check_xscreensaver_timer = new TQTimer( this );
connect( check_xscreensaver_timer, SIGNAL(timeout()), this, SLOT(xscreensaver_ping() )); connect( check_xscreensaver_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(xscreensaver_ping() ));
SCREENSAVER_STATUS = checkScreenSaverStatus(); SCREENSAVER_STATUS = checkScreenSavertqStatus();
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
} }
@ -80,7 +80,7 @@ screen::~screen() {
bool screen::setScreenSaver(bool enable){ bool screen::setScreenSaver(bool enable){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
screen_save_dcop_ref.send( "enable", enable); screen_save_dcop_ref.send( "enable", enable);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
@ -120,7 +120,7 @@ static int got_badwindow;
/*! Errorhandler for all X-Server related operations */ /*! Errorhandler for all X-Server related operations */
static XErrorHandler defaultHandler; static XErrorHandler defaultHandler;
//! to find/handle bad XWindows / XSetErrorHandler //! to tqfind/handle bad XWindows / XSetErrorHandler
/*! /*!
* This function is involved by the search for the window of the Xscreensaver. By this * This function is involved by the search for the window of the Xscreensaver. By this
* function we seperate the BadWindow-error and set \ref got_badwindow if we get a BadWindow. * function we seperate the BadWindow-error and set \ref got_badwindow if we get a BadWindow.
@ -150,7 +150,7 @@ static Window find_xscreensaver_window(Display * dpy) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
Window root = RootWindowOfScreen(DefaultScreenOfDisplay(dpy)); Window root = RootWindowOfScreen(DefaultScreenOfDisplay(dpy));
Window root2, parent, *kids; Window root2, tqparent, *kids;
Window retval = 0; Window retval = 0;
Atom xs_version; Atom xs_version;
unsigned int i; unsigned int i;
@ -158,7 +158,7 @@ static Window find_xscreensaver_window(Display * dpy) {
xs_version = XInternAtom(dpy, "_SCREENSAVER_VERSION", True); xs_version = XInternAtom(dpy, "_SCREENSAVER_VERSION", True);
if (!(xs_version != None && XQueryTree(dpy, root, &root2, &parent, &kids, &nkids) if (!(xs_version != None && XQueryTree(dpy, root, &root2, &tqparent, &kids, &nkids)
&& kids && nkids)) { && kids && nkids)) {
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return 0; return 0;
@ -193,7 +193,7 @@ static Window find_xscreensaver_window(Display * dpy) {
* This function is used to ping the XScreensaver. There is no direct way to stop * This function is used to ping the XScreensaver. There is no direct way to stop
* the XScreensaver without to kill/stop an restart or modify config-files of the * the XScreensaver without to kill/stop an restart or modify config-files of the
* current user. \n \n * current user. \n \n
* We ping the xscreensaver as defined in the QTimer-interval \ref xScreenSaver_timer_interval . * We ping the xscreensaver as defined in the TQTimer-interval \ref xScreenSaver_timer_interval .
* The value of \ref xScreenSaver_timer_interval is 58 sec at the moment. The intervall must be * The value of \ref xScreenSaver_timer_interval is 58 sec at the moment. The intervall must be
* smaller then 1 minute (this is the smallest interval of Xscreensaver a.t.m.). * smaller then 1 minute (this is the smallest interval of Xscreensaver a.t.m.).
*/ */
@ -243,7 +243,7 @@ void screen::xscreensaver_ping(){
* \retval 99 gnome-screensaver check is running * \retval 99 gnome-screensaver check is running
* \retval -1 else * \retval -1 else
*/ */
int screen::checkScreenSaverStatus() { int screen::checkScreenSavertqStatus() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
bool get_reply = false; bool get_reply = false;
@ -284,7 +284,7 @@ int screen::checkScreenSaverStatus() {
gnomeScreensaverCheck = new KProcess; gnomeScreensaverCheck = new KProcess;
*gnomeScreensaverCheck << "gnome-screensaver-command" << "--query"; *gnomeScreensaverCheck << "gnome-screensaver-command" << "--query";
connect( gnomeScreensaverCheck , SIGNAL(processExited(KProcess *)),SLOT(getGSExited(KProcess *))); connect( gnomeScreensaverCheck , TQT_SIGNAL(processExited(KProcess *)),TQT_SLOT(getGSExited(KProcess *)));
if(!gnomeScreensaverCheck->start(KProcess::NotifyOnExit)) if(!gnomeScreensaverCheck->start(KProcess::NotifyOnExit))
{ {
@ -299,7 +299,7 @@ int screen::checkScreenSaverStatus() {
} }
/*! /*!
* \b SLOT which called if the call of gnomescreensaver-command exited * \b TQT_SLOT which called if the call of gnomescreensaver-command exited
* \param gnomecheckcommand the KPocess which called this SLOT * \param gnomecheckcommand the KPocess which called this SLOT
*/ */
void screen::getGSExited (KProcess *gnomecheckcommand) { void screen::getGSExited (KProcess *gnomecheckcommand) {
@ -326,7 +326,7 @@ void screen::getGSExited (KProcess *gnomecheckcommand) {
* \retval 0 if DMPS is disabled * \retval 0 if DMPS is disabled
* \retval -1 if there is a error * \retval -1 if there is a error
*/ */
int screen::checkDPMSStatus(){ int screen::checkDPMStqStatus(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
CARD16 state; CARD16 state;
@ -432,7 +432,7 @@ bool screen::lockScreen(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
// screensaver status known? // screensaver status known?
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
// set lock for KScreensaver // set lock for KScreensaver
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
@ -451,8 +451,8 @@ xscreensaver:
xscreensaver_lock = new KProcess; xscreensaver_lock = new KProcess;
*xscreensaver_lock << "xscreensaver-command" << "-lock"; *xscreensaver_lock << "xscreensaver-command" << "-lock";
connect(xscreensaver_lock, SIGNAL(processExited(KProcess*)), connect(xscreensaver_lock, TQT_SIGNAL(processExited(KProcess*)),
this, SLOT(cleanProcess(KProcess*))); this, TQT_SLOT(cleanProcess(KProcess*)));
bool status = xscreensaver_lock->start(KProcess::DontCare); bool status = xscreensaver_lock->start(KProcess::DontCare);
if(!status) if(!status)
@ -469,8 +469,8 @@ xscreensaver:
gnomescreensaver_lock = new KProcess; gnomescreensaver_lock = new KProcess;
*gnomescreensaver_lock << "gnome-screensaver-command" << "--lock"; *gnomescreensaver_lock << "gnome-screensaver-command" << "--lock";
connect(gnomescreensaver_lock, SIGNAL(processExited(KProcess*)), connect(gnomescreensaver_lock, TQT_SIGNAL(processExited(KProcess*)),
this, SLOT(cleanProcess(KProcess*))); this, TQT_SLOT(cleanProcess(KProcess*)));
bool status = gnomescreensaver_lock->start(KProcess::DontCare); bool status = gnomescreensaver_lock->start(KProcess::DontCare);
if(!status) if(!status)
{ {
@ -487,8 +487,8 @@ xscreensaver:
xlock = new KProcess; xlock = new KProcess;
*xlock << "xlock"; //<< "-mode" << "blank"; *xlock << "xlock"; //<< "-mode" << "blank";
connect(xlock, SIGNAL(processExited(KProcess*)), connect(xlock, TQT_SIGNAL(processExited(KProcess*)),
this, SLOT(cleanProcess(KProcess*))); this, TQT_SLOT(cleanProcess(KProcess*)));
bool status = xlock->start(KProcess::DontCare); bool status = xlock->start(KProcess::DontCare);
if(!status) if(!status)
{ {
@ -502,14 +502,14 @@ xscreensaver:
/*! /*!
* Use this function to lock the screen with a specified lock method. * Use this function to lock the screen with a specified lock method.
* \param lock_withMethod a QString, which contain the alias for the lock * \param lock_withMethod a TQString, which contain the alias for the lock
* command. * command.
* \return boolean with the result of the operation * \return boolean with the result of the operation
* \retval true if the requested method worked * \retval true if the requested method worked
* \retval false if there was a error * \retval false if there was a error
* \todo check if we should also set blank only if the user would like!!! * \todo check if we should also set blank only if the user would like!!!
*/ */
bool screen::lockScreen( QString lock_withMethod ) { bool screen::lockScreen( TQString lock_withMethod ) {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if (lock_withMethod == "automatic") { if (lock_withMethod == "automatic") {
@ -521,8 +521,8 @@ bool screen::lockScreen( QString lock_withMethod ) {
xlock = new KProcess; xlock = new KProcess;
*xlock << "xlock"; *xlock << "xlock";
connect(xlock, SIGNAL(processExited(KProcess*)), connect(xlock, TQT_SIGNAL(processExited(KProcess*)),
this, SLOT(cleanProcess(KProcess*))); this, TQT_SLOT(cleanProcess(KProcess*)));
bool status = xlock->start(KProcess::DontCare); bool status = xlock->start(KProcess::DontCare);
if(!status) if(!status)
@ -536,8 +536,8 @@ bool screen::lockScreen( QString lock_withMethod ) {
else if (lock_withMethod == "gnomescreensaver") { else if (lock_withMethod == "gnomescreensaver") {
gnomescreensaver_lock = new KProcess; gnomescreensaver_lock = new KProcess;
*gnomescreensaver_lock << "gnome-screensaver-command" << "--lock"; *gnomescreensaver_lock << "gnome-screensaver-command" << "--lock";
connect(gnomescreensaver_lock, SIGNAL(processExited(KProcess*)), connect(gnomescreensaver_lock, TQT_SIGNAL(processExited(KProcess*)),
this, SLOT(cleanProcess(KProcess*))); this, TQT_SLOT(cleanProcess(KProcess*)));
bool status = gnomescreensaver_lock->start(KProcess::DontCare); bool status = gnomescreensaver_lock->start(KProcess::DontCare);
if(!status) if(!status)
@ -549,7 +549,7 @@ bool screen::lockScreen( QString lock_withMethod ) {
} }
else { else {
// screensaver status known? // screensaver status known?
SCREENSAVER_STATUS = checkScreenSaverStatus(); SCREENSAVER_STATUS = checkScreenSavertqStatus();
if (lock_withMethod == "kscreensaver") { if (lock_withMethod == "kscreensaver") {
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
@ -571,8 +571,8 @@ xscreensaver:
xscreensaver_lock = new KProcess; xscreensaver_lock = new KProcess;
*xscreensaver_lock << "xscreensaver-command" << "-lock"; *xscreensaver_lock << "xscreensaver-command" << "-lock";
connect(xscreensaver_lock, SIGNAL(processExited(KProcess*)), connect(xscreensaver_lock, TQT_SIGNAL(processExited(KProcess*)),
this, SLOT(cleanProcess(KProcess*))); this, TQT_SLOT(cleanProcess(KProcess*)));
bool status = xscreensaver_lock->start(KProcess::DontCare); bool status = xscreensaver_lock->start(KProcess::DontCare);
if(!status) if(!status)
@ -597,7 +597,7 @@ xscreensaver:
void screen::blankOnlyScreen( bool blankonly ){ void screen::blankOnlyScreen( bool blankonly ){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
// set KScreensaver // set KScreensaver
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
screen_save_dcop_ref.send("setBlankOnly", blankonly); screen_save_dcop_ref.send("setBlankOnly", blankonly);
@ -620,7 +620,7 @@ bool screen::resetKDEScreensaver(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if(SCREENSAVER_STATUS == -1) if(SCREENSAVER_STATUS == -1)
SCREENSAVER_STATUS = checkScreenSaverStatus(); SCREENSAVER_STATUS = checkScreenSavertqStatus();
// do this only if the screensaver is not running // do this only if the screensaver is not running
if(SCREENSAVER_STATUS == 0){ if(SCREENSAVER_STATUS == 0){
@ -648,14 +648,14 @@ bool screen::resetKDEScreensaver(){
bool screen::resetXScreensaver(){ bool screen::resetXScreensaver(){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
if(checkScreenSaverStatus() == 11) { if(checkScreenSavertqStatus() == 11) {
delete xscreensaver_reset; delete xscreensaver_reset;
xscreensaver_reset = new KProcess; xscreensaver_reset = new KProcess;
*xscreensaver_reset << "xscreensaver-command" << "-restart"; *xscreensaver_reset << "xscreensaver-command" << "-restart";
connect(xscreensaver_reset, SIGNAL(processExited(KProcess*)), connect(xscreensaver_reset, TQT_SIGNAL(processExited(KProcess*)),
this, SLOT(cleanProcess(KProcess*))); this, TQT_SLOT(cleanProcess(KProcess*)));
bool status = xscreensaver_reset->start(KProcess::DontCare); bool status = xscreensaver_reset->start(KProcess::DontCare);
if(!status) if(!status)
@ -679,8 +679,8 @@ void screen::forceDPMSOff() {
KProcess *xset = new KProcess; KProcess *xset = new KProcess;
*xset << "xset" << "dpms" << "force" << "off"; *xset << "xset" << "dpms" << "force" << "off";
connect(xset, SIGNAL(processExited(KProcess*)), connect(xset, TQT_SIGNAL(processExited(KProcess*)),
this, SLOT(cleanProcess(KProcess*))); this, TQT_SLOT(cleanProcess(KProcess*)));
if(!xset->start()) if(!xset->start())
{ {
delete xset; delete xset;

@ -22,8 +22,8 @@
/* this is needed to avoid typedef clash with X11/Xmd.h (X11/Xproto.h) /* this is needed to avoid typedef clash with X11/Xmd.h (X11/Xproto.h)
*/ */
#ifndef QT_CLEAN_NAMESPACE #ifndef TQT_CLEAN_NAMESPACE
#define QT_CLEAN_NAMESPACE #define TQT_CLEAN_NAMESPACE
#endif #endif
// KDE Header // KDE Header
@ -32,11 +32,11 @@
#include <klocale.h> #include <klocale.h>
// QT Header // QT Header
#include <qstring.h> #include <tqstring.h>
#include <qwidget.h> #include <tqwidget.h>
//#include <qvector.h> //#include <tqvector.h>
#include <qtimer.h> #include <tqtimer.h>
#include <qevent.h> #include <tqevent.h>
// X11 Header // X11 Header
#include <X11/X.h> #include <X11/X.h>
@ -53,9 +53,10 @@
* \author Danny Kukawka, <dkukawka@suse.de>, <danny.kukawka@web.de> * \author Danny Kukawka, <dkukawka@suse.de>, <danny.kukawka@web.de>
* \date 2004 - 2006 * \date 2004 - 2006
*/ */
class screen : public QWidget class screen : public TQWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
private: private:
@ -96,13 +97,13 @@ private:
*/ */
int SCREENSAVER_STATUS; int SCREENSAVER_STATUS;
//! QTimer - interval //! TQTimer - interval
/*! This is the interval to poll the Xscreensaver. The value is 58 sec */ /*! This is the interval to poll the Xscreensaver. The value is 58 sec */
static const int xScreenSaver_timer_interval = 58000; static const int xScreenSaver_timer_interval = 58000;
//! QTimer to check/ping the Xscreensaver //! TQTimer to check/ping the Xscreensaver
/*! This is the QTimer to ping the Xscreensaver. The ping-interval is defined /*! This is the TQTimer to ping the Xscreensaver. The ping-interval is defined
* through \ref xScreenSaver_timer_interval . */ * through \ref xScreenSaver_timer_interval . */
QTimer *check_xscreensaver_timer; TQTimer *check_xscreensaver_timer;
//! the active X-Display //! the active X-Display
/*! Here we store a pointer to the active X-Display of KDE or GNOME */ /*! Here we store a pointer to the active X-Display of KDE or GNOME */
@ -132,9 +133,9 @@ public:
//! to check if \ref check_xscreensaver_timer is active //! to check if \ref check_xscreensaver_timer is active
/*! /*!
* This boolean contains information about QTimer \ref check_xscreensaver_timer . * This boolean contains information about TQTimer \ref check_xscreensaver_timer .
* \li true: if the QTtimer is running * \li true: if the TQTtimer is running
* \li false: if the QTimer isn't active/ isn't in use * \li false: if the TQTimer isn't active/ isn't in use
*/ */
bool check_xscreensaver_timer_runs; bool check_xscreensaver_timer_runs;
//! info about DPMS on the machine //! info about DPMS on the machine
@ -157,7 +158,7 @@ public:
//! lock the screen //! lock the screen
bool lockScreen(); bool lockScreen();
//! lock the screen with a give alias for the lock method //! lock the screen with a give alias for the lock method
bool lockScreen( QString ); bool lockScreen( TQString );
//! to set DPMS on/off //! to set DPMS on/off
bool setDPMS( bool ); bool setDPMS( bool );
//! to set the DPMS Timeouts //! to set the DPMS Timeouts
@ -166,9 +167,9 @@ public:
bool setScreenSaver( bool ); bool setScreenSaver( bool );
//! for check the status of the screensaver //! for check the status of the screensaver
int checkScreenSaverStatus(); int checkScreenSavertqStatus();
//! for check the actual status of DPMS on the machine //! for check the actual status of DPMS on the machine
int checkDPMSStatus(); int checkDPMStqStatus();
//! default constructor //! default constructor
screen(); screen();

@ -51,14 +51,14 @@ Settings::~Settings()
/*! /*!
* Loads the scheme settings from kpowersaverc and fills the related variables. * Loads the scheme settings from kpowersaverc and fills the related variables.
* \param schemeName QString with the name (realname not i18n() version) of the * \param schemeName TQString with the name (realname not i18n() version) of the
* scheme which setting should be load. If the scheme could not * scheme which setting should be load. If the scheme could not
* be loaded, this function try to load "default-scheme" * be loaded, this function try to load "default-scheme"
* \return the result of the load * \return the result of the load
* \retval true if the settings could be loaded * \retval true if the settings could be loaded
* \retval false if there was no group named like schemeName or named "default-scheme" * \retval false if there was no group named like schemeName or named "default-scheme"
*/ */
bool Settings::load_scheme_settings(QString schemeName){ bool Settings::load_scheme_settings(TQString schemeName){
kconfig->reparseConfiguration(); kconfig->reparseConfiguration();
bool setToDefault = false; bool setToDefault = false;
@ -149,7 +149,7 @@ bool Settings::load_scheme_settings(QString schemeName){
kconfig->setGroup(schemeName); kconfig->setGroup(schemeName);
} }
QString _autoInactiveAction = kconfig->readEntry("autoInactiveAction", "NULL"); TQString _autoInactiveAction = kconfig->readEntry("autoInactiveAction", "NULL");
if( _autoInactiveAction != "NULL") { if( _autoInactiveAction != "NULL") {
autoInactiveAction = _autoInactiveAction; autoInactiveAction = _autoInactiveAction;
} }
@ -198,7 +198,7 @@ bool Settings::load_scheme_settings(QString schemeName){
disableNotifications = kconfig->readBoolEntry("disableNotifications",false); disableNotifications = kconfig->readBoolEntry("disableNotifications",false);
QString _cpufreqpolicy = kconfig->readEntry("cpuFreqPolicy", "NULL"); TQString _cpufreqpolicy = kconfig->readEntry("cpuFreqPolicy", "NULL");
if( _cpufreqpolicy == "NULL") { if( _cpufreqpolicy == "NULL") {
kconfig->setGroup("default-scheme"); kconfig->setGroup("default-scheme");
_cpufreqpolicy = kconfig->readEntry("cpuFreqPolicy", "NULL"); _cpufreqpolicy = kconfig->readEntry("cpuFreqPolicy", "NULL");
@ -317,10 +317,10 @@ bool Settings::load_general_settings(){
/*! /*!
* Map the string value from the config file to the type from \ref action * Map the string value from the config file to the type from \ref action
* \param _action a QString to map * \param _action a TQString to map
* \return a integer value with the result of the mapping as \ref action * \return a integer value with the result of the mapping as \ref action
*/ */
action Settings::mapActionToType (QString _action) { action Settings::mapActionToType (TQString _action) {
if (_action.isEmpty()) { if (_action.isEmpty()) {
return NONE; return NONE;
@ -332,12 +332,12 @@ action Settings::mapActionToType (QString _action) {
return GO_SUSPEND2DISK; return GO_SUSPEND2DISK;
} else if (_action.startsWith("SUSPEND2RAM")) { } else if (_action.startsWith("SUSPEND2RAM")) {
return GO_SUSPEND2RAM; return GO_SUSPEND2RAM;
} else if (_action.startsWith("CPUFREQ_POWERSAVE")) { } else if (_action.startsWith("CPUFRETQ_POWERSAVE")) {
return CPUFREQ_POWERSAVE; return CPUFRETQ_POWERSAVE;
} else if (_action.startsWith("CPUFREQ_DYNAMIC")) { } else if (_action.startsWith("CPUFRETQ_DYNAMIC")) {
return CPUFREQ_DYNAMIC; return CPUFRETQ_DYNAMIC;
} else if (_action.startsWith("CPUFREQ_PERFORMANCE")) { } else if (_action.startsWith("CPUFRETQ_PERFORMANCE")) {
return CPUFREQ_PERFORMANCE; return CPUFRETQ_PERFORMANCE;
} else if (_action.startsWith("BRIGHTNESS")) { } else if (_action.startsWith("BRIGHTNESS")) {
return BRIGHTNESS; return BRIGHTNESS;
} else { } else {
@ -370,7 +370,7 @@ void Settings::load_kde(){
kde->enabled = _kconfig->readBoolEntry("Enabled", true); kde->enabled = _kconfig->readBoolEntry("Enabled", true);
kde->lock = _kconfig->readBoolEntry("Lock", true); kde->lock = _kconfig->readBoolEntry("Lock", true);
QString _savername = _kconfig->readEntry("Saver", "KBlankscreen.desktop"); TQString _savername = _kconfig->readEntry("Saver", "KBlankscreen.desktop");
if (_savername.startsWith("KBlankscreen.desktop")) if (_savername.startsWith("KBlankscreen.desktop"))
kde->blanked = true; kde->blanked = true;
else else

@ -29,8 +29,8 @@
#include <kconfig.h> #include <kconfig.h>
// QT - Header // QT - Header
#include <qstring.h> #include <tqstring.h>
#include <qstringlist.h> #include <tqstringlist.h>
// own headers // own headers
#include "hardware.h" #include "hardware.h"
@ -44,9 +44,9 @@ enum action{
GO_SUSPEND2DISK, GO_SUSPEND2DISK,
SWITCH_SCHEME, SWITCH_SCHEME,
BRIGHTNESS, BRIGHTNESS,
CPUFREQ_POWERSAVE, CPUFRETQ_POWERSAVE,
CPUFREQ_DYNAMIC, CPUFRETQ_DYNAMIC,
CPUFREQ_PERFORMANCE CPUFRETQ_PERFORMANCE
}; };
/*! /*!
@ -131,26 +131,26 @@ public:
/* START ************************** General settings *******************************/ /* START ************************** General settings *******************************/
//! name of the default "onAC" scheme //! name of the default "onAC" scheme
QString ac_scheme; TQString ac_scheme;
//! name of the default "on Battery" scheme //! name of the default "on Battery" scheme
QString battery_scheme; TQString battery_scheme;
//! a list with the names of the currently available schemes. //! a list with the names of the currently available schemes.
/*! /*!
* List with the names of the currently configured schemes. The name of the * List with the names of the currently configured schemes. The name of the
* schemes are the same as we use for the related selection in the configure file. * schemes are the same as we use for the related selection in the configure file.
* Note: Be sure that the name for the default schemes is not translated !!! * Note: Be sure that the name for the default schemes is not translated !!!
*/ */
QStringList schemes; TQStringList schemes;
//! the name of the lock method //! the name of the lock method
/*! /*!
* This QString contains a alias to the selected method for lock screen. Possible values: * This TQString contains a alias to the selected method for lock screen. Possible values:
* \li automatic for automatically selected (sequence: kscreensaver, xscreensaver, xlock) * \li automatic for automatically selected (sequence: kscreensaver, xscreensaver, xlock)
* \li kscreensaver for KDE KScreensaver * \li kscreensaver for KDE KScreensaver
* \li xscreensaver for XScreensaver (default used on GNOME) * \li xscreensaver for XScreensaver (default used on GNOME)
* \li xlock for xlock * \li xlock for xlock
*/ */
QString lockmethod; TQString lockmethod;
//! if the messages from powersave should popup as Kpassivepopup //! if the messages from powersave should popup as Kpassivepopup
/*! /*!
@ -267,7 +267,7 @@ public:
/* START ************************ Scheme settings and values ***********************/ /* START ************************ Scheme settings and values ***********************/
//! name of the scheme representing the current settings //! name of the scheme representing the current settings
QString currentScheme; TQString currentScheme;
// ---------- Screensaver/DPMS section ------------ // // ---------- Screensaver/DPMS section ------------ //
//! if kpowersave use own screensaver settings //! if kpowersave use own screensaver settings
@ -371,23 +371,23 @@ public:
int autoInactiveActionAfter; int autoInactiveActionAfter;
//! action which execute after a defined time of inactivity //! action which execute after a defined time of inactivity
/*! /*!
* This QString contains the action/command which should be execute * This TQString contains the action/command which should be execute
* after a trough \ref autoInactiveActionAfter defined time. If nothing * after a trough \ref autoInactiveActionAfter defined time. If nothing
* should happens this QString is empty or '_NONE_' * should happens this TQString is empty or '_NONE_'
*/ */
QString autoInactiveAction; TQString autoInactiveAction;
//! general list with running programs which prevent the autosuspend //! general list with running programs which prevent the autosuspend
/*! /*!
* This QStringList contains names of programs which prevent, if one of * This TQStringList contains names of programs which prevent, if one of
* them is running/active the autossuspend. * them is running/active the autossuspend.
*/ */
QStringList autoInactiveGBlist; TQStringList autoInactiveGBlist;
//! scheme list with running programs which prevent the autosuspend //! scheme list with running programs which prevent the autosuspend
/*! /*!
* This QStringList contains names of programs which prevent, if one of * This TQStringList contains names of programs which prevent, if one of
* them is running/active the autossuspend. * them is running/active the autossuspend.
*/ */
QStringList autoInactiveSBlist; TQStringList autoInactiveSBlist;
// ------ Autosuspend countdown dialog section -------- // // ------ Autosuspend countdown dialog section -------- //
//! if KPowersave should display a dialog with a warning for autosuspend //! if KPowersave should display a dialog with a warning for autosuspend
@ -438,17 +438,17 @@ public:
int autoDimmTo; int autoDimmTo;
//! general list with running programs which prevent the autodimm //! general list with running programs which prevent the autodimm
/*! /*!
* This QStringList contains names of programs which prevent, if one of * This TQStringList contains names of programs which prevent, if one of
* them is running/active the autodimm of the display panel. * them is running/active the autodimm of the display panel.
*/ */
QStringList autoDimmGBlist; TQStringList autoDimmGBlist;
//! scheme specific list with running programs which prevent the autodimm //! scheme specific list with running programs which prevent the autodimm
/*! /*!
* This QStringList contains names of programs which prevent, if one of * This TQStringList contains names of programs which prevent, if one of
* them is running/active the autodimm of the display panel. This list is * them is running/active the autodimm of the display panel. This list is
* scheme specific. * scheme specific.
*/ */
QStringList autoDimmSBlist; TQStringList autoDimmSBlist;
// ------------ CPU Frequency section ---------------- // // ------------ CPU Frequency section ---------------- //
@ -483,7 +483,7 @@ public:
//! to load the global KDE settings //! to load the global KDE settings
void load_kde(); void load_kde();
//! to load settings of a specific scheme //! to load settings of a specific scheme
bool load_scheme_settings(QString); bool load_scheme_settings(TQString);
private: private:
@ -491,6 +491,6 @@ private:
KConfig *kconfig; KConfig *kconfig;
//! to map a battery action string to the related type //! to map a battery action string to the related type
action mapActionToType (QString _action); action mapActionToType (TQString _action);
}; };
#endif #endif

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>suspend_Dialog</class> <class>suspend_Dialog</class>
<widget class="QDialog"> <widget class="TQDialog">
<property name="name"> <property name="name">
<cstring>suspend_Dialog</cstring> <cstring>suspend_Dialog</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -20,23 +20,23 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>90</height> <height>90</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>90</height> <height>90</height>
</size> </size>
</property> </property>
<widget class="QProgressBar"> <widget class="TQProgressBar">
<property name="name"> <property name="name">
<cstring>progressBar</cstring> <cstring>progressBar</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>70</x> <x>70</x>
<y>21</y> <y>21</y>
@ -45,11 +45,11 @@
</rect> </rect>
</property> </property>
</widget> </widget>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>message</cstring> <cstring>message</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>60</y> <y>60</y>
@ -61,11 +61,11 @@
<string></string> <string></string>
</property> </property>
</widget> </widget>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>iconPixmap</cstring> <cstring>iconPixmap</cstring>
</property> </property>
<property name="geometry"> <property name="tqgeometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
@ -73,13 +73,13 @@
<height>48</height> <height>48</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>48</width> <width>48</width>
<height>48</height> <height>48</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>48</width> <width>48</width>
<height>48</height> <height>48</height>
@ -98,5 +98,5 @@
<data format="XPM.GZ" length="2304">789c8593c9721a311086ef3cc5947573a5dacc303043a57230b6f1beef4ee530128bc1069bcd5b2aef9e5f52b702d855410cf0a9b7bf5b626d35ba39398c56d74a936931ed99c8dc17e368b5351b0cde7ffefaf1bbb4922411de59354a56be9556681c994895ddcbf12c70eeb8c19cb27d12d8d955c7711efc47cc6ca7a970ece2559739e77c3781bdff85b0f7a71d66c3fecf81bdff8be7b8ccfe75cb71b96c98ef3cc7a27f37b08fbf1266ff3eb3e879779c076e0ab3ff03b3e88985d95eb69cd42b329f4761b6f798a57ed572250efcc12cf56acc92ffd2732af932c775b03f9f4238f1f637cb699c72bc3281bdbe7bcbd5a456653e715c04ce99eb5c6f10d8db9f84b9de3a738bede7c2deae7cbd228bd99e58ae2562a7d47316b37f8bb9caac1c17b9c46f0973fc2db3e8df6716fd1b96b34a883f6516ff0ab3f4776839d745c1f98f2cd7d3c07b81eb8ebbcc6dd64b9e75c2fe078e8d663b5d5b2e52dde67a9bc21cdff36c12d63f0cecfd5bc29c6f9bb9c6f74f0973bc0eecedafc21c7fc65c707c4798ef4fdbb191fa4a0b73fc31b3d433817d3e89977a0533e73f9d06ce3d93a282d4fcb73ccbfbbedf85a5977861f9fa4bb93496a116b53fd798cbdfe1dc5dbaa71ef5e9811e69005aa839af1f11437aa2671ad1982678a634a317c4bc7ea95fc3fbcd79cee81d153e5063e2f80d96aff4af5303b9fbb4419bd0afd1c11635113d428d3658f46fb3ee1df8efd21ee77aa57d3aa043c48fa1f1888e17f41b3a419e199d22dad019f6cee9822e5169cbf5f3f4497f0fbb57748daeb79d36eb7543b788b8c3aff2d27c0ce637418c71bfd7e16975af439546e7638ad14d27e4b7937cc0ee87d36dbdc7e8654c899b5b0f99faf6f4e6f2b7713a53ecb6a802dd13e4f64f0a3d764655d273fa35340fb03b41779b5443fe017237dcca506744f9bff9b8b32d30cf3a229a98e0266ad83b94baf3b027b6a3e8d3fd39c644ed79f695822a5bf34015dc47e6e2b717ee8f565a19d7a93de30f74d9740a6d8d866a7dca8fa5dad0fd8c8899bf71aa8333cfe0ddc5ccf457f71f73eae22c7b98f73b6632806ef4a1eedd348ba5fbc97da81e3e87f018867d7916ef7f31f75feab86f1df6cd57faffbf56fe7c2ffd0519fbee77</data> <data format="XPM.GZ" length="2304">789c8593c9721a311086ef3cc5947573a5dacc303043a57230b6f1beef4ee530128bc1069bcd5b2aef9e5f52b702d855410cf0a9b7bf5b626d35ba39398c56d74a936931ed99c8dc17e368b5351b0cde7ffefaf1bbb4922411de59354a56be9556681c994895ddcbf12c70eeb8c19cb27d12d8d955c7711efc47cc6ca7a970ece2559739e77c3781bdff85b0f7a71d66c3fecf81bdff8be7b8ccfe75cb71b96c98ef3cc7a27f37b08fbf1266ff3eb3e879779c076e0ab3ff03b3e88985d95eb69cd42b329f4761b6f798a57ed572250efcc12cf56acc92ffd2732af932c775b03f9f4238f1f637cb699c72bc3281bdbe7bcbd5a456653e715c04ce99eb5c6f10d8db9f84b9de3a738bede7c2deae7cbd228bd99e58ae2562a7d47316b37f8bb9caac1c17b9c46f0973fc2db3e8df6716fd1b96b34a883f6516ff0ab3f4776839d745c1f98f2cd7d3c07b81eb8ebbcc6dd64b9e75c2fe078e8d663b5d5b2e52dde67a9bc21cdff36c12d63f0cecfd5bc29c6f9bb9c6f74f0973bc0eecedafc21c7fc65c707c4798ef4fdbb191fa4a0b73fc31b3d433817d3e89977a0533e73f9d06ce3d93a282d4fcb73ccbfbbedf85a5977861f9fa4bb93496a116b53fd798cbdfe1dc5dbaa71ef5e9811e69005aa839af1f11437aa2671ad1982678a634a317c4bc7ea95fc3fbcd79cee81d153e5063e2f80d96aff4af5303b9fbb4419bd0afd1c11635113d428d3658f46fb3ee1df8efd21ee77aa57d3aa043c48fa1f1888e17f41b3a419e199d22dad019f6cee9822e5169cbf5f3f4497f0fbb57748daeb79d36eb7543b788b8c3aff2d27c0ce637418c71bfd7e16975af439546e7638ad14d27e4b7937cc0ee87d36dbdc7e8654c899b5b0f99faf6f4e6f2b7713a53ecb6a802dd13e4f64f0a3d764655d273fa35340fb03b41779b5443fe017237dcca506744f9bff9b8b32d30cf3a229a98e0266ad83b94baf3b027b6a3e8d3fd39c644ed79f695822a5bf34015dc47e6e2b717ee8f565a19d7a93de30f74d9740a6d8d866a7dca8fa5dad0fd8c8899bf71aa8333cfe0ddc5ccf457f71f73eae22c7b98f73b6632806ef4a1eedd348ba5fbc97da81e3e87f018867d7916ef7f31f75feab86f1df6cd57faffbf56fe7c2ffd0519fbee77</data>
</image> </image>
</images> </images>
<layoutdefaults spacing="6" margin="11"/> <tqlayoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -29,19 +29,19 @@
#include <kiconloader.h> #include <kiconloader.h>
// QT - Headers // QT - Headers
#include <qdialog.h> #include <tqdialog.h>
#include <qlabel.h> #include <tqlabel.h>
#include <qstring.h> #include <tqstring.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qprogressbar.h> #include <tqprogressbar.h>
#include "suspenddialog.h" #include "suspenddialog.h"
/*! This is the default constructor of the class. */ /*! This is the default constructor of the class. */
suspendDialog::suspendDialog(QWidget *parent, const char *name) suspendDialog::suspendDialog(TQWidget *tqparent, const char *name)
:suspend_Dialog(parent, name, true, Qt::WStyle_StaysOnTop | Qt::WDestructiveClose ) :suspend_Dialog(tqparent, name, true, TQt::WStyle_StaysOnTop | TQt::WDestructiveClose )
{ {
this->setIcon(SmallIcon("kpowersave", QIconSet::Automatic)); this->setIcon(SmallIcon("kpowersave", TQIconSet::Automatic));
} }
/*! This is the default destructor of the class. */ /*! This is the default destructor of the class. */
@ -52,12 +52,12 @@ suspendDialog::~suspendDialog()
/*! /*!
* This used to set Icon/pixmap for the dialog. * This used to set Icon/pixmap for the dialog.
* \param type QString with the type of the current suspend * \param type TQString with the type of the current suspend
* to set the pixmap in the dialog * to set the pixmap in the dialog
*/ */
void suspendDialog::setPixmap( QString type ) void suspendDialog::setPixmap( TQString type )
{ {
QPixmap pixmap = 0; TQPixmap pixmap = 0;
if(type.startsWith("suspend2disk")){// || type.startsWith("NULL")) { if(type.startsWith("suspend2disk")){// || type.startsWith("NULL")) {
pixmap = KGlobal::iconLoader()->loadIcon("suspend_to_disk", KIcon::NoGroup, KIcon::SizeLarge); pixmap = KGlobal::iconLoader()->loadIcon("suspend_to_disk", KIcon::NoGroup, KIcon::SizeLarge);
} else if (type.startsWith("suspend2ram")) { } else if (type.startsWith("suspend2ram")) {
@ -83,10 +83,10 @@ void suspendDialog::setProgressbar( int percent )
/*! /*!
* This used to set the message of current suspend action to the the dialog. * This used to set the message of current suspend action to the the dialog.
* \param messageText QString with the message of the current running suspend * \param messageText TQString with the message of the current running suspend
* prepare action * prepare action
*/ */
void suspendDialog::setTextLabel( QString messageText ) void suspendDialog::setTextLabel( TQString messageText )
{ {
message->show(); message->show();
message->setText(messageText); message->setText(messageText);

@ -36,20 +36,21 @@
class suspendDialog: public suspend_Dialog { class suspendDialog: public suspend_Dialog {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
//! default constructor //! default constructor
suspendDialog(QWidget *parent = 0, const char *name = 0); suspendDialog(TQWidget *tqparent = 0, const char *name = 0);
//! default destructor //! default destructor
~suspendDialog(); ~suspendDialog();
//! set all needed icons //! set all needed icons
void setPixmap( QString ); void setPixmap( TQString );
//! set the value for the progressbar //! set the value for the progressbar
void setProgressbar( int ); void setProgressbar( int );
//! set the message for the textlabel //! set the message for the textlabel
void setTextLabel( QString ); void setTextLabel( TQString );
}; };

Loading…
Cancel
Save