summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:03 -0600
commit80f772ad054f92e81e0eb3bc7319a32e8a4e8a05 (patch)
treeaf9a620cca9e626f475b3dac43160735288f43a4
parentf3cf754cc9c54fc1de34ef06110a6810d655390a (diff)
downloadtdepowersave-80f772ad054f92e81e0eb3bc7319a32e8a4e8a05.tar.gz
tdepowersave-80f772ad054f92e81e0eb3bc7319a32e8a4e8a05.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit f3cf754cc9c54fc1de34ef06110a6810d655390a.
Diffstat
-rw-r--r--ChangeLog34
-rw-r--r--ChangeLog.package4
-rw-r--r--INSTALL2
-rw-r--r--configure.in.in2
-rw-r--r--src/blacklistedit_Dialog.ui14
-rw-r--r--src/configure_Dialog.ui118
-rw-r--r--src/configuredialog.cpp4
-rw-r--r--src/countdown_Dialog.ui18
-rw-r--r--src/countdowndialog.cpp4
-rw-r--r--src/dbusHAL.cpp2
-rw-r--r--src/detailed_Dialog.ui62
-rw-r--r--src/detaileddialog.cpp20
-rw-r--r--src/dummy.cpp40
-rw-r--r--src/hardware.cpp4
-rw-r--r--src/hardware.h4
-rw-r--r--src/info_Dialog.ui24
-rw-r--r--src/kpowersave.cpp46
-rw-r--r--src/kpowersave.h2
-rw-r--r--src/log_viewer.ui6
-rw-r--r--src/logviewer.cpp4
-rw-r--r--src/screen.cpp20
-rw-r--r--src/screen.h4
-rw-r--r--src/suspend_Dialog.ui8
23 files changed, 223 insertions, 223 deletions
diff --git a/ChangeLog b/ChangeLog
index 2908cd0..f226149 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -164,7 +164,7 @@
* configure.in.in: Don't check any longer for PolicyKit
>= 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
D-Bus interface.
@@ -401,7 +401,7 @@
* configure.in.in: Changed detection if we need to call
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>
@@ -707,17 +707,17 @@
2007-06-13 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.cpp: Remove laptop_panel entry from the
- QDict<QString> udis if no device with laptop_panel found. This
- should prevent problems if the laptop panel device get removed
+ QDict<QString> udis if no tqdevice with laptop_panel found. This
+ should prevent problems if the laptop panel tqdevice get removed
from HAL.
2007-06-13 Danny Kukawka <danny.kukawka@web.de>
- * src/hardware.cpp: Added code to react if a latop panel device
- get added/remove. Added also all device_type values to the
+ * src/hardware.cpp: Added code to react if a latop panel tqdevice
+ get added/remove. Added also all tqdevice_type values to the
switch of the HAL_DEVICE case.
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).
2007-06-13 Danny Kukawka <danny.kukawka@web.de>
@@ -1667,7 +1667,7 @@
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
Q_SLOTS for Q_SIGNALS and actions.
2007-01-21 Danny Kukawka <danny.kukawka@web.de>
@@ -2546,7 +2546,7 @@
* src/hardware.[cpp,h]: Added some new functions to get access
to battery list and the primary battery collection.
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
2006-11-02 Danny Kukawka <danny.kukawka@web.de>
@@ -2617,9 +2617,9 @@
2006-10-25 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.[cpp,h]: Added new function to check if we should
- handle a special device (e.g. on a HAL_DEVICE::DeviceAdded
- event) and to get the type of the device (added a new enum
- device_type).
+ handle a special tqdevice (e.g. on a HAL_DEVICE::DeviceAdded
+ event) and to get the type of the tqdevice (added a new enum
+ tqdevice_type).
Added some new Q_SIGNALS for: HAL error handling, data changes and
if the sleep button was pressed.
@@ -2823,9 +2823,9 @@
2006-10-19 Danny Kukawka <danny.kukawka@web.de>
* 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.
- 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
functions for HAL events.
* src/hardware_battery.[cpp,h]: Changed one constructor to
@@ -3004,7 +3004,7 @@
* src/dbusHAL.[cpp,h]: code comments
* 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
and functions to class dbusHAL
@@ -3054,7 +3054,7 @@
* src/Makefile.am: added dbusHAL class to make
* src/dbusHAL.[cpp,h]: Changed name of the class to dbusHAL and
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
org.freedesktop.Hal.Device.SystemPowerManagement methodes on HAL
via DBUS.
@@ -4130,7 +4130,7 @@
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
have the same size. Replaced picture for total battery fuel state
with a string. Cleaned up the code.
diff --git a/ChangeLog.package b/ChangeLog.package
index 3be2a74..4f6edf2 100644
--- a/ChangeLog.package
+++ b/ChangeLog.package
@@ -125,8 +125,8 @@ Tue Jul 24 15:54:27 CEST 2007 - dkukawka@suse.de
section) to disable call SetPowerSave() on HAL.
- Fixed Segmentation Fault from b.n.c bug #284622.
- added arabic po-file from Youssef Chahibi <chahibi@gmail.com>
- - fixed laptop panel/backlight device handling to react if a
- device get added/removed to/from HAL
+ - fixed laptop panel/backlight tqdevice handling to react if a
+ tqdevice get added/removed to/from HAL
- use now kdebug/kdDebug() functions to debug instead of own
macros, added --dbg-trace option to allow trace function entry
and leave points.
diff --git a/INSTALL b/INSTALL
index 23e5f25..98a5258 100644
--- a/INSTALL
+++ b/INSTALL
@@ -113,7 +113,7 @@ pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
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
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
diff --git a/configure.in.in b/configure.in.in
index 7cf2fb5..213e7a3 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -147,7 +147,7 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_SOCKET, ["$DBUS_SYSTEM_BUS_SOCKET"],
#check for PolicyKit version
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
AC_DEFINE([USE_LIBHAL_POLICYCHECK],1,[Set if should use libhal to check policy.])
fi
diff --git a/src/blacklistedit_Dialog.ui b/src/blacklistedit_Dialog.ui
index d916c05..792b810 100644
--- a/src/blacklistedit_Dialog.ui
+++ b/src/blacklistedit_Dialog.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<grid>
<property name="name">
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>305</width>
<height>20</height>
@@ -143,7 +143,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>150</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>140</height>
@@ -196,7 +196,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>220</width>
<height>110</height>
@@ -205,7 +205,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignBottom</set>
</property>
</widget>
diff --git a/src/configure_Dialog.ui b/src/configure_Dialog.ui
index 98f2dfb..8d1b17b 100644
--- a/src/configure_Dialog.ui
+++ b/src/configure_Dialog.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<grid>
<property name="name">
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>250</width>
<height>20</height>
@@ -223,7 +223,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -284,7 +284,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>160</width>
<height>20</height>
@@ -398,7 +398,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -428,7 +428,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>40</width>
<height>30</height>
@@ -448,7 +448,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>231</width>
<height>31</height>
@@ -465,7 +465,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -521,7 +521,7 @@
<property name="name">
<cstring>tL_brightness</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>50</height>
@@ -530,7 +530,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -573,13 +573,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>20</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>20</height>
@@ -637,7 +637,7 @@
<property name="text">
<string>after:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -684,7 +684,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>50</height>
@@ -701,7 +701,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>21</height>
@@ -813,7 +813,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -836,7 +836,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -861,7 +861,7 @@
<property name="text">
<string>after:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -919,7 +919,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -941,7 +941,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>20</height>
@@ -997,7 +997,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -1025,7 +1025,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1066,7 +1066,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -1078,7 +1078,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<grid>
<property name="name">
@@ -1112,7 +1112,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1167,7 +1167,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>75</width>
<height>0</height>
@@ -1179,7 +1179,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -1187,7 +1187,7 @@
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -1204,7 +1204,7 @@
<property name="name">
<cstring>textLabel1_2_2</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -1221,7 +1221,7 @@
<property name="name">
<cstring>textLabel1_2_3</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -1244,7 +1244,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -1288,7 +1288,7 @@
<property name="name">
<cstring>cB_batWarning</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -1299,7 +1299,7 @@
<property name="name">
<cstring>cB_batLow</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -1310,7 +1310,7 @@
<property name="name">
<cstring>cB_batCritical</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -1459,7 +1459,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>30</height>
@@ -1471,7 +1471,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -1529,7 +1529,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -1546,7 +1546,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -1563,7 +1563,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -1580,7 +1580,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -1591,7 +1591,7 @@
<property name="name">
<cstring>cB_SleepButton</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -1602,7 +1602,7 @@
<property name="name">
<cstring>cB_LidcloseButton</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -1613,7 +1613,7 @@
<property name="name">
<cstring>cB_PowerButton</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -1624,7 +1624,7 @@
<property name="name">
<cstring>cB_S2DiskButton</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -1641,7 +1641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1676,7 +1676,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -1688,7 +1688,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -1707,7 +1707,7 @@
<property name="name">
<cstring>cB_acScheme</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>175</width>
<height>0</height>
@@ -1724,7 +1724,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -1741,7 +1741,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -1752,7 +1752,7 @@
<property name="name">
<cstring>cB_batteryScheme</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>175</width>
<height>0</height>
@@ -1780,7 +1780,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>75</height>
@@ -1829,7 +1829,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>163</width>
<height>20</height>
@@ -1865,7 +1865,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>110</height>
@@ -1925,7 +1925,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>100</width>
<height>21</height>
@@ -1942,7 +1942,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>100</width>
<height>21</height>
@@ -1988,7 +1988,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -2034,7 +2034,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>100</width>
<height>21</height>
@@ -2051,7 +2051,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>100</width>
<height>21</height>
diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 1ca5fea..892c380 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -105,7 +105,7 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti
tL_valueBrightness->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
tL_valueBrightness->setBackgroundMode(TQt::PaletteBase);
- tL_valueBrightness->setAlignment(TQt::AlignCenter);
+ tL_valueBrightness->tqsetAlignment(TQt::AlignCenter);
tL_valueBrightness->setFocusPolicy(TQ_NoFocus);
// hide Lid item if this is not a laptop
@@ -1074,7 +1074,7 @@ void ConfigureDialog::pB_deleteScheme_clicked(){
if (pB_deleteScheme->isEnabled()) {
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("Delete"), i18n("Cancel"));
if (answer == KMessageBox::Yes) {
diff --git a/src/countdown_Dialog.ui b/src/countdown_Dialog.ui
index 5531538..ea0899c 100644
--- a/src/countdown_Dialog.ui
+++ b/src/countdown_Dialog.ui
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>142</width>
<height>21</height>
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>144</width>
<height>21</height>
@@ -96,13 +96,13 @@
<property name="name">
<cstring>iconPixmap</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>48</width>
<height>48</height>
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>5</width>
<height>20</height>
@@ -142,7 +142,7 @@
<property name="textFormat">
<enum>AutoText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -175,7 +175,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>20</height>
diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp
index f8d268d..6abaf90 100644
--- a/src/countdowndialog.cpp
+++ b/src/countdowndialog.cpp
@@ -114,7 +114,7 @@ bool countDownDialog::showDialog() {
if (!textLabel->text().isEmpty() && timeOut > 0) {
// init the progressbar
- progressBar->setFormat(i18n("%1 seconds").arg(remaining));
+ progressBar->setFormat(i18n("%1 seconds").tqarg(remaining));
progressBar->setPercentageVisible(true);
progressBar->setProgress(100);
progressBar->setEnabled(true);
@@ -160,7 +160,7 @@ void countDownDialog::updateProgress() {
int setTo = (int)((100.0/(float)timeOut)*(float)remaining);
// set the progressBar
- progressBar->setFormat(i18n("%1 seconds").arg(remaining));
+ progressBar->setFormat(i18n("%1 seconds").tqarg(remaining));
progressBar->setPercentageVisible(true);
progressBar->setProgress(setTo);
progressBar->setEnabled(true);
diff --git a/src/dbusHAL.cpp b/src/dbusHAL.cpp
index 4bac9c8..6983eb3 100644
--- a/src/dbusHAL.cpp
+++ b/src/dbusHAL.cpp
@@ -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 )) {
((dbusHAL*) myInstance)->emitMsgReceived( CONSOLEKIT_SESSION_ACTIVE,
- session, TQString("%1").arg((int)active));
+ session, TQString("%1").tqarg((int)active));
} else {
if (dbus_error_is_set( &error )) dbus_error_free( &error );
}
diff --git a/src/detailed_Dialog.ui b/src/detailed_Dialog.ui
index 46309ff..3a8eea5 100644
--- a/src/detailed_Dialog.ui
+++ b/src/detailed_Dialog.ui
@@ -66,7 +66,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>tqlayout17</cstring>
</property>
<grid>
<property name="name">
@@ -92,7 +92,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop|AlignRight</set>
</property>
</widget>
@@ -111,7 +111,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>50</height>
@@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout18</cstring>
+ <cstring>tqlayout18</cstring>
</property>
<vbox>
<property name="name">
@@ -155,13 +155,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -205,7 +205,7 @@
</sizepolicy>
</property>
<property name="title">
- <string>Battery Status</string>
+ <string>Battery tqStatus</string>
</property>
<grid>
<property name="name">
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>118</height>
@@ -230,7 +230,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout15</cstring>
+ <cstring>tqlayout15</cstring>
</property>
<grid>
<property name="name">
@@ -238,7 +238,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<hbox>
<property name="name">
@@ -270,7 +270,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>5</width>
<height>20</height>
@@ -300,7 +300,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>5</width>
<height>20</height>
@@ -309,7 +309,7 @@
</spacer>
<widget class="TQLabel">
<property name="name">
- <cstring>LabelACStatus</cstring>
+ <cstring>LabelACtqStatus</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -322,7 +322,7 @@
<property name="text">
<string>plugged in</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -351,7 +351,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -386,7 +386,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>5</height>
@@ -397,7 +397,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout12</cstring>
+ <cstring>tqlayout12</cstring>
</property>
<grid>
<property name="name">
@@ -413,7 +413,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -432,13 +432,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -465,7 +465,7 @@
</sizepolicy>
</property>
<property name="title">
- <string>Processor Status</string>
+ <string>Processor tqStatus</string>
</property>
<grid>
<property name="name">
@@ -473,7 +473,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout12_2</cstring>
+ <cstring>tqlayout12_2</cstring>
</property>
<grid>
<property name="name">
@@ -489,7 +489,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -508,13 +508,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -543,7 +543,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout16</cstring>
+ <cstring>tqlayout16</cstring>
</property>
<grid>
<property name="name">
@@ -580,7 +580,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -592,7 +592,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>layout19</cstring>
+ <cstring>tqlayout19</cstring>
</property>
<grid>
<property name="name">
@@ -608,7 +608,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>230</width>
<height>20</height>
diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp
index 573d1bb..56910b1 100644
--- a/src/detaileddialog.cpp
+++ b/src/detaileddialog.cpp
@@ -34,7 +34,7 @@
// QT headers:
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqtimer.h>
#include <tqgroupbox.h>
@@ -78,9 +78,9 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
if ((primaryBatteries->getNumBatteries() > 1) && (i == 0))
Label->setText( i18n( "Total:" ));
else if ((primaryBatteries->getNumBatteries() > 1) && (i > 0))
- Label->setText( i18n( "Battery %1" ).arg(i));
+ Label->setText( i18n( "Battery %1" ).tqarg(i));
else
- Label->setText( i18n( "Battery %1" ).arg(i + 1));
+ Label->setText( i18n( "Battery %1" ).tqarg(i + 1));
BatteryGridLayout->addWidget( Label, i , 0);
@@ -111,7 +111,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
for (int i = 0; i < numOfCPUs; i++) {
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);
KProgress *CPUPBar = new KProgress(ProcessorFrame, "ProcessorPBar");
@@ -123,7 +123,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
ProcessorFrame->adjustSize();
connect(OkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeDetailedDlg()));
- connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(setAC()));
+ connect(hwinfo, TQT_SIGNAL(ACtqStatus(bool)), this, TQT_SLOT(setAC()));
// TODO: replace event
//connect(pd, TQT_SIGNAL(schemeDataChanged()), this, TQT_SLOT(setInfos()));
connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setInfos()));
@@ -242,10 +242,10 @@ void detaileddialog::setBattery() {
// this should fix apm, where we have no time info if charging
BatteryPBar[i]->setFormat("%p% " + i18n("charged"));
} else if (_c_state == CHARGING) {
- TQString 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);
} else if (_c_state == DISCHARGING) {
- TQString 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);
} else {
@@ -355,7 +355,7 @@ void detaileddialog::setProcessorThrottling() {
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
ProcessorPBar[i]->setTotalSteps(100);
- TQString ProgressString = TQString("%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]->setProgress(100 - cpuInfo->cpu_throttling[i]);
ProcessorPBar[i]->setEnabled(true);
@@ -388,11 +388,11 @@ void detaileddialog::setAC() {
kdDebugFuncIn(trace);
if (hwinfo->getAcAdapter()) {
- LabelACStatus->setText( i18n("plugged in") );
+ LabelACtqStatus->setText( i18n("plugged in") );
LedAC->on();
} else {
LedAC->off();
- LabelACStatus->setText( i18n("unplugged") );
+ LabelACtqStatus->setText( i18n("unplugged") );
}
setInfos();
diff --git a/src/dummy.cpp b/src/dummy.cpp
index 5f5b01f..bd3f2f9 100644
--- a/src/dummy.cpp
+++ b/src/dummy.cpp
@@ -57,20 +57,20 @@ class dummy {
dummy = i18n("activated");
dummy = i18n("deactivated");
dummy = i18n("do nothing");
- dummy = i18n("Deactivate following devices:");
- dummy = i18n("Activate following devices");
- dummy = i18n("Reactivate following devices");
- dummy = i18n("Deactivate following device classes:");
- dummy = i18n("Activate following devices classes");
- dummy = i18n("Reactivate following device classes");
- dummy = i18n("If the scheme switched all devices are again activated.");
+ dummy = i18n("Deactivate following tqdevices:");
+ dummy = i18n("Activate following tqdevices");
+ dummy = i18n("Reactivate following tqdevices");
+ dummy = i18n("Deactivate following tqdevice classes:");
+ dummy = i18n("Activate following tqdevices classes");
+ dummy = i18n("Reactivate following tqdevice classes");
+ dummy = i18n("If the scheme switched all tqdevices are again activated.");
dummy = i18n("This is a experimental feature.");
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 device 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 device classes and click on ");
- dummy = i18n("Please note: If you e.g. deactivate a network device you may lose your "
+ dummy = i18n("Select one of the available tqdevices and click on ");
+ dummy = i18n("Select one of the available tqdevice classes and click on ");
+ dummy = i18n("Select one or more of the available tqdevices and click on ");
+ dummy = i18n("Select one or more of the available tqdevice classes and click on ");
+ dummy = i18n("Please note: If you e.g. deactivate a network tqdevice you may lose your "
"internet connection.");
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 "
@@ -92,11 +92,11 @@ class dummy {
// for kpowersave.cpp:
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 Activate 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 tqdevices: %2").tqarg("").tqarg("");
dummy = i18n("Report ...");
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");
// for screen.cpp
@@ -116,12 +116,12 @@ class dummy {
dummy = i18n("Session active:");
// 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
- dummy = i18n("Could not call %1. The current desktop session is not active.").arg("");
- dummy = i18n("Could not set %1. The current desktop session is not active.").arg("");
- dummy = i18n("Stopped %1. The current desktop session is now inactive.").arg("");
- dummy = i18n("Restarted %1. The current desktop session is now active again.").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.").tqarg("");
+ dummy = i18n("Stopped %1. The current desktop session is now inactive.").tqarg("");
+ dummy = i18n("Restarted %1. The current desktop session is now active again.").tqarg("");
}
};
diff --git a/src/hardware.cpp b/src/hardware.cpp
index 2053180..fa37a98 100644
--- a/src/hardware.cpp
+++ b/src/hardware.cpp
@@ -866,7 +866,7 @@ void HardwareInfo::checkACAdapterState() {
if (_state != acadapter) {
acadapter = _state;
update_info_ac_changed = true;
- emit ACStatus( acadapter );
+ emit ACtqStatus( acadapter );
} else {
update_info_ac_changed = false;
}
@@ -891,7 +891,7 @@ void HardwareInfo::checkLidcloseState() {
if (dbus_HAL->halGetPropertyBool(*udis["lidclose"] , "button.state.value", &_state )) {
if (_state != lidclose) {
lidclose = _state;
- emit lidcloseStatus( lidclose );
+ emit lidclosetqStatus( lidclose );
}
} else {
lidclose = false;
diff --git a/src/hardware.h b/src/hardware.h
index b3864b8..9443675 100644
--- a/src/hardware.h
+++ b/src/hardware.h
@@ -362,9 +362,9 @@ signals:
void currentCPUFreqPolicyChanged();
//! signal the AC adapter
- void ACStatus( bool );
+ void ACtqStatus( bool );
//! signal for the lidclose button
- void lidcloseStatus ( bool );
+ void lidclosetqStatus ( bool );
//! signal for pressed the power button
void powerButtonPressed ();
//! signal for pressed sleep (suspend2ram) button
diff --git a/src/info_Dialog.ui b/src/info_Dialog.ui
index 1b95e5e..71b7c6e 100644
--- a/src/info_Dialog.ui
+++ b/src/info_Dialog.ui
@@ -23,7 +23,7 @@
<property name="name">
<cstring>buttonOK</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>171</width>
<height>21</height>
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -74,13 +74,13 @@
<property name="name">
<cstring>iconPixmap</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -97,7 +97,7 @@
<property name="name">
<cstring>msgText</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>370</width>
<height>50</height>
@@ -106,7 +106,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -165,7 +165,7 @@
<property name="name">
<cstring>dontShowAgain</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>330</width>
<height>0</height>
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>21</height>
diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp
index 47961c9..fbbfc17 100644
--- a/src/kpowersave.cpp
+++ b/src/kpowersave.cpp
@@ -97,7 +97,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0
// connect to signals for changes
connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(update()));
connect(hwinfo, TQT_SIGNAL(primaryBatteryChanged()), this, TQT_SLOT(update()));
- connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(handleACStatusChange (bool)));
+ connect(hwinfo, TQT_SIGNAL(ACtqStatus(bool)), this, TQT_SLOT(handleACStatusChange (bool)));
connect(hwinfo, TQT_SIGNAL(resumed(int)), this, TQT_SLOT(forwardResumeSignal(int)));
// connect to error mesages
@@ -106,7 +106,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0
connect(hwinfo, TQT_SIGNAL(dbusRunning(int)), this, TQT_SLOT(showDBusErrorMsg(int)));
// connect to events
- connect(hwinfo, TQT_SIGNAL(lidcloseStatus(bool)), this, TQT_SLOT(handleLidEvent(bool)));
+ connect(hwinfo, TQT_SIGNAL(lidclosetqStatus(bool)), this, TQT_SLOT(handleLidEvent(bool)));
connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent()));
connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSleepButtonEvent()));
connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent()));
@@ -474,26 +474,26 @@ void kpowersave::updateTooltip(){
else if (minutes > 0){
if (charging_state == CHARGING)
tmp = i18n("Plugged in -- %1% charged (%2:%3 h until full "
- "charged)").arg(percent).arg(minutes / 60).arg(num3);
+ "charged)").tqarg(percent).tqarg(minutes / 60).tqarg(num3);
else
tmp = i18n("Plugged in -- %1% charged (%2:%3 remaining hours)")
- .arg(percent).arg(minutes / 60).arg(num3);
+ .tqarg(percent).tqarg(minutes / 60).tqarg(num3);
}
else if (charging_state == CHARGING && hwinfo->hasAPM()) {
- tmp = i18n("Plugged in -- %1% charged").arg(percent);
+ tmp = i18n("Plugged in -- %1% charged").tqarg(percent);
}
else{
if (percent == -1) tmp = i18n("Plugged in -- no battery");
- else tmp = i18n("Plugged in -- %1% charged").arg(percent);
+ else tmp = i18n("Plugged in -- %1% charged").tqarg(percent);
}
}
} else{
if (minutes >= 0){
tmp = i18n("Running on batteries -- %1% charged (%2:%3 hours remaining)")
- .arg(percent).arg(minutes / 60).arg(num3);
+ .tqarg(percent).tqarg(minutes / 60).tqarg(num3);
}
else {
- tmp = i18n("Running on batteries -- %1% charged").arg(percent);
+ tmp = i18n("Running on batteries -- %1% charged").tqarg(percent);
}
}
// add string whether battery is charging, but only if < 100% to avoid
@@ -873,7 +873,7 @@ void kpowersave::do_autosuspendWarn() {
// TODO: rework this after translation round for openSUSE 10.3 !
message = i18n("Inactivity detected.") + " " +
i18n("To stop the %1 press the 'Cancel' button before the countdown "
- "expire.").arg(i18n("Autosuspend")) + "\n\n" +
+ "expire.").tqarg(i18n("Autosuspend")) + "\n\n" +
i18n("The computer autosuspend in: ");
countdown->setMessageText(message);
@@ -1104,13 +1104,13 @@ bool kpowersave::handleMounts( bool suspend ) {
_msg = "<qt>" +
i18n("Could not umount external media before suspend/standby. \n "
"(Reason: %1)\n \n Would you like to continue suspend/standby "
- "anyway? \n(Warning: Continue suspend can cause data loss!)").arg(_e_msg) +
+ "anyway? \n(Warning: Continue suspend can cause data loss!)").tqarg(_e_msg) +
"</qt>";
_suspend = getSuspendString(calledSuspend);
int answer = KMessageBox::questionYesNo( 0, _msg,
- i18n("Error while prepare %1").arg(_suspend),
+ i18n("Error while prepare %1").tqarg(_suspend),
i18n("Suspend anyway"), i18n("Cancel suspend"),
"ignoreMountOnSuspend");
@@ -1306,7 +1306,7 @@ void kpowersave::do_setSpeedPolicy(int menu_id){
if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) {
KPassivePopup::message(i18n("WARNING"),
- i18n("CPU Freq Policy %1 could not be set.").arg(speed_menu->text(menu_id)),
+ i18n("CPU Freq Policy %1 could not be set.").tqarg(speed_menu->text(menu_id)),
SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 10000);
} else {
hwinfo->checkCurrentCPUFreqPolicy();
@@ -1335,7 +1335,7 @@ void kpowersave::do_setActiveScheme( int i ){
notifySchemeSwitch();
} else if (!settings->schemes[i]){
KPassivePopup::message( i18n("WARNING"),
- i18n("Scheme %1 could not be activated.").arg(scheme_menu->text(i)),
+ i18n("Scheme %1 could not be activated.").tqarg(scheme_menu->text(i)),
SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 5000);
}
@@ -1990,7 +1990,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) {
if (!settings->disableNotifications)
KNotifyClient::event(this->winId(), "battery_warning_event",
i18n("Battery state changed to WARNING -- remaining time: "
- "%1 hours and %2 minutes.").arg(min/60).arg(min%60));
+ "%1 hours and %2 minutes.").tqarg(min/60).tqarg(min%60));
// set/call related actions
handleActionCall(settings->batteryWarningLevelAction,
settings->batteryWarningLevelActionValue);
@@ -1999,7 +1999,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) {
if (!settings->disableNotifications)
KNotifyClient::event(this->winId(), "battery_low_event",
i18n("Battery state changed to LOW -- remaining time: "
- "%1 hours and %2 minutes.").arg(min/60).arg(min%60));
+ "%1 hours and %2 minutes.").tqarg(min/60).tqarg(min%60));
// set/call related actions
handleActionCall(settings->batteryLowLevelAction,
settings->batteryLowLevelActionValue);
@@ -2014,7 +2014,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) {
"Shut down your system or plug in the power "
"cable immediately. Otherwise the machine\n"
"will go shutdown in 30 seconds")
- .arg(min/ 60).arg(min%60));
+ .tqarg(min/ 60).tqarg(min%60));
TQTimer::singleShot(30000, this, TQT_SLOT(handleCriticalBatteryActionCall()));
} else {
@@ -2024,7 +2024,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) {
"remaining time: %1 hours and %2 minutes.\n"
"Shut down your system or plug in the power "
"cable immediately.")
- .arg(min/ 60).arg(min%60));
+ .tqarg(min/ 60).tqarg(min%60));
handleActionCall(settings->batteryCriticalLevelAction,
settings->batteryCriticalLevelActionValue);
@@ -2181,7 +2181,7 @@ void kpowersave::notifySchemeSwitch() {
eventType = "scheme_" + _scheme;
KNotifyClient::event( this->winId(), eventType,
- i18n("Switched to scheme: %1").arg(i18n(_scheme.ascii())).ascii());
+ i18n("Switched to scheme: %1").tqarg(i18n(_scheme.ascii())).ascii());
}
kdDebugFuncOut(trace);
@@ -2258,17 +2258,17 @@ void kpowersave::handleResumeSignal() {
switch (calledSuspend) {
case SUSPEND2DISK:
KNotifyClient::event( this->winId(), "resume_from_suspend2disk_event",
- i18n("System is resumed from %1.").arg(
+ i18n("System is resumed from %1.").tqarg(
i18n("Suspend to Disk")));
break;
case SUSPEND2RAM:
KNotifyClient::event( this->winId(), "resume_from_suspend2ram_event",
- i18n("System is resumed from %1.").arg(
+ i18n("System is resumed from %1.").tqarg(
i18n("Suspend to RAM")));
break;
case STANDBY:
KNotifyClient::event( this->winId(), "resume_from_standby_event",
- i18n("System is resumed from %1.").arg(
+ i18n("System is resumed from %1.").tqarg(
i18n("Standby")));
break;
default:
@@ -2297,7 +2297,7 @@ void kpowersave::handleResumeSignal() {
TQString msg;
msg = i18n("An unknown error occurred while %1. The errorcode is: '%2'").
- arg(getSuspendString(calledSuspend)).arg(resume_result);
+ tqarg(getSuspendString(calledSuspend)).tqarg(resume_result);
#if defined(DISTRO_IS_SUSE) || defined(DISTRO_IS_SLES_SLED) || defined(DISTRO_IS_PARDUS)
// okay we know this system use pm-utils and log is under /var/log/pm-suspend.log
@@ -2328,7 +2328,7 @@ void kpowersave::handleResumeSignal() {
#endif
}
#else
- KMessageBox::error(0, msg, i18n("Error while %1").arg(getSuspendString(calledSuspend)));
+ KMessageBox::error(0, msg, i18n("Error while %1").tqarg(getSuspendString(calledSuspend)));
#endif
}
// set back ... suspend is handled
diff --git a/src/kpowersave.h b/src/kpowersave.h
index 62a22eb..e6f12ed 100644
--- a/src/kpowersave.h
+++ b/src/kpowersave.h
@@ -390,7 +390,7 @@ private slots:
//! set for a battery status the related actions
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 );
//! show the login dialog after locked the screen
void activateLoginScreen();
diff --git a/src/log_viewer.ui b/src/log_viewer.ui
index d4be935..74464bd 100644
--- a/src/log_viewer.ui
+++ b/src/log_viewer.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<grid>
<property name="name">
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>330</width>
<height>20</height>
diff --git a/src/logviewer.cpp b/src/logviewer.cpp
index c84c2b1..f63e797 100644
--- a/src/logviewer.cpp
+++ b/src/logviewer.cpp
@@ -26,7 +26,7 @@
// QT header
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
// KDE header
#include <ktextedit.h>
@@ -41,7 +41,7 @@
LogViewer::LogViewer( TQString filename, TQWidget *parent, const char *name)
:log_viewer(parent, name, false, WDestructiveClose ) {
- this->setCaption(i18n("KPowersave Logfile Viewer: %1").arg(filename));
+ this->setCaption(i18n("KPowersave Logfile Viewer: %1").tqarg(filename));
if (!TQFile::exists ( filename ))
return;
diff --git a/src/screen.cpp b/src/screen.cpp
index 8caf48b..877583a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -52,7 +52,7 @@ screen::screen() {
xlock = NULL;
got_XScreensaver = false;
- checkDPMSStatus();
+ checkDPMStqStatus();
check_xscreensaver_timer_runs = false;
SCREENSAVER_STATUS = -1;
@@ -61,7 +61,7 @@ screen::screen() {
check_xscreensaver_timer = new TQTimer( this );
connect( check_xscreensaver_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(xscreensaver_ping() ));
- SCREENSAVER_STATUS = checkScreenSaverStatus();
+ SCREENSAVER_STATUS = checkScreenSavertqStatus();
kdDebugFuncOut(trace);
}
@@ -80,7 +80,7 @@ screen::~screen() {
bool screen::setScreenSaver(bool enable){
kdDebugFuncIn(trace);
- if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
+ if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
screen_save_dcop_ref.send( "enable", enable);
kdDebugFuncOut(trace);
@@ -243,7 +243,7 @@ void screen::xscreensaver_ping(){
* \retval 99 gnome-screensaver check is running
* \retval -1 else
*/
-int screen::checkScreenSaverStatus() {
+int screen::checkScreenSavertqStatus() {
kdDebugFuncIn(trace);
bool get_reply = false;
@@ -326,7 +326,7 @@ void screen::getGSExited (KProcess *gnomecheckcommand) {
* \retval 0 if DMPS is disabled
* \retval -1 if there is a error
*/
-int screen::checkDPMSStatus(){
+int screen::checkDPMStqStatus(){
kdDebugFuncIn(trace);
CARD16 state;
@@ -432,7 +432,7 @@ bool screen::lockScreen(){
kdDebugFuncIn(trace);
// screensaver status known?
- if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
+ if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
// set lock for KScreensaver
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
@@ -549,7 +549,7 @@ bool screen::lockScreen( TQString lock_withMethod ) {
}
else {
// screensaver status known?
- SCREENSAVER_STATUS = checkScreenSaverStatus();
+ SCREENSAVER_STATUS = checkScreenSavertqStatus();
if (lock_withMethod == "kscreensaver") {
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
@@ -597,7 +597,7 @@ xscreensaver:
void screen::blankOnlyScreen( bool blankonly ){
kdDebugFuncIn(trace);
- if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
+ if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
// set KScreensaver
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
screen_save_dcop_ref.send("setBlankOnly", blankonly);
@@ -620,7 +620,7 @@ bool screen::resetKDEScreensaver(){
kdDebugFuncIn(trace);
if(SCREENSAVER_STATUS == -1)
- SCREENSAVER_STATUS = checkScreenSaverStatus();
+ SCREENSAVER_STATUS = checkScreenSavertqStatus();
// do this only if the screensaver is not running
if(SCREENSAVER_STATUS == 0){
@@ -648,7 +648,7 @@ bool screen::resetKDEScreensaver(){
bool screen::resetXScreensaver(){
kdDebugFuncIn(trace);
- if(checkScreenSaverStatus() == 11) {
+ if(checkScreenSavertqStatus() == 11) {
delete xscreensaver_reset;
diff --git a/src/screen.h b/src/screen.h
index 1d28f55..231dd6d 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -167,9 +167,9 @@ public:
bool setScreenSaver( bool );
//! for check the status of the screensaver
- int checkScreenSaverStatus();
+ int checkScreenSavertqStatus();
//! for check the actual status of DPMS on the machine
- int checkDPMSStatus();
+ int checkDPMStqStatus();
//! default constructor
screen();
diff --git a/src/suspend_Dialog.ui b/src/suspend_Dialog.ui
index 926a726..0a0d39b 100644
--- a/src/suspend_Dialog.ui
+++ b/src/suspend_Dialog.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>300</width>
<height>90</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>300</width>
<height>90</height>
@@ -73,13 +73,13 @@
<height>48</height>
</rect>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>48</width>
<height>48</height>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-08 11:33:28 +0000