Rename a number of old tq methods that are no longer tq specific

pull/1/head
Timothy Pearson 12 years ago
parent df7f6bd803
commit f3cf754cc9

@ -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_tqdevice_is_caller_privileged() to check
function: libhal_device_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_tqdevice_is_caller_privileged() in libhal.
check for libhal_device_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 tqdevice with laptop_panel found. This
should prevent problems if the laptop panel tqdevice get removed
QDict<QString> udis if no device with laptop_panel found. This
should prevent problems if the laptop panel device get removed
from HAL.
2007-06-13 Danny Kukawka <danny.kukawka@web.de>
* src/hardware.cpp: Added code to react if a latop panel tqdevice
get added/remove. Added also all tqdevice_type values to the
* src/hardware.cpp: Added code to react if a latop panel device
get added/remove. Added also all device_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 tqdevice_type for laptop
* src/hardware.h: Added new value to enum device_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 tqlayout and (re)added
* src/configure_Dialog.ui: Fixed layout 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
tqdevices is not empty before use them.
devices 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 tqdevice (e.g. on a HAL_DEVICE::DeviceAdded
event) and to get the type of the tqdevice (added a new enum
tqdevice_type).
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).
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 tqdevices. Added new code to the func
one QStringList for the devices. Added new code to the func
to collect the battery UDIs.
Added code to store the UDIs of all tqdevices we handle and
Added code to store the UDIs of all devices we handle and
want to monitor. This should allow us a finer grained filter
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 tqdevices except batteries (e.g. AC, Lid, buttons ...)
for udis of devices except batteries (e.g. AC, Lid, buttons ...)
* src/pdaemon.cpp: added comments about the state of port code
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 tqdevices and to get tqdevice
contains now mew functions to search for devices and to get device
information from HAL. Also added: new function to call
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 tqlayout for
* src/detaileddialog.cpp, src/detaileddialog.h: replaced layout 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.

@ -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 tqdevice handling to react if a
tqdevice get added/removed to/from HAL
- fixed laptop panel/backlight device handling to react if a
device 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.

@ -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 tqlayout you can give
In addition, if you use an unusual directory layout 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.

@ -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_tqdevice_is_caller_privileged], [LIBHAL_POLICYCHECK=yes], [LIBHAL_POLICYCHECK=no])
AC_CHECK_LIB([hal], [libhal_device_is_caller_privileged], [LIBHAL_POLICYCHECK=yes], [LIBHAL_POLICYCHECK=no])
if test "x$LIBHAL_POLICYCHECK" = "xyes"; then
AC_DEFINE([USE_LIBHAL_POLICYCHECK],1,[Set if should use libhal to check policy.])
fi

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>305</width>
<height>20</height>
@ -143,7 +143,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>140</height>
@ -196,7 +196,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>220</width>
<height>110</height>
@ -205,7 +205,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignBottom</set>
</property>
</widget>

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>250</width>
<height>20</height>
@ -223,7 +223,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -284,7 +284,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>160</width>
<height>20</height>
@ -398,7 +398,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -428,7 +428,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>40</width>
<height>30</height>
@ -448,7 +448,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>231</width>
<height>31</height>
@ -465,7 +465,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@ -521,7 +521,7 @@
<property name="name">
<cstring>tL_brightness</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
@ -530,7 +530,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -573,13 +573,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>100</width>
<height>20</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@ -637,7 +637,7 @@
<property name="text">
<string>after:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@ -684,7 +684,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>50</height>
@ -701,7 +701,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
@ -813,7 +813,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@ -836,7 +836,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@ -861,7 +861,7 @@
<property name="text">
<string>after:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@ -919,7 +919,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@ -941,7 +941,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@ -997,7 +997,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@ -1025,7 +1025,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -1066,7 +1066,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@ -1078,7 +1078,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@ -1112,7 +1112,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@ -1167,7 +1167,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>75</width>
<height>0</height>
@ -1179,7 +1179,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1187,7 +1187,7 @@
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@ -1204,7 +1204,7 @@
<property name="name">
<cstring>textLabel1_2_2</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@ -1221,7 +1221,7 @@
<property name="name">
<cstring>textLabel1_2_3</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@ -1244,7 +1244,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@ -1288,7 +1288,7 @@
<property name="name">
<cstring>cB_batWarning</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -1299,7 +1299,7 @@
<property name="name">
<cstring>cB_batLow</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -1310,7 +1310,7 @@
<property name="name">
<cstring>cB_batCritical</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -1459,7 +1459,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
@ -1471,7 +1471,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1529,7 +1529,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -1546,7 +1546,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -1563,7 +1563,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -1580,7 +1580,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -1591,7 +1591,7 @@
<property name="name">
<cstring>cB_SleepButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -1602,7 +1602,7 @@
<property name="name">
<cstring>cB_LidcloseButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -1613,7 +1613,7 @@
<property name="name">
<cstring>cB_PowerButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -1624,7 +1624,7 @@
<property name="name">
<cstring>cB_S2DiskButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -1641,7 +1641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -1676,7 +1676,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@ -1688,7 +1688,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1707,7 +1707,7 @@
<property name="name">
<cstring>cB_acScheme</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
@ -1724,7 +1724,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@ -1741,7 +1741,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@ -1752,7 +1752,7 @@
<property name="name">
<cstring>cB_batteryScheme</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
@ -1780,7 +1780,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>75</height>
@ -1829,7 +1829,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>163</width>
<height>20</height>
@ -1865,7 +1865,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
@ -1925,7 +1925,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@ -1942,7 +1942,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@ -1988,7 +1988,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -2034,7 +2034,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@ -2051,7 +2051,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>

@ -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->tqsetAlignment(TQt::AlignCenter);
tL_valueBrightness->setAlignment(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?").tqarg(schemes[currentScheme]),
"%1 scheme?").arg(schemes[currentScheme]),
i18n("Confirm delete scheme"),
i18n("Delete"), i18n("Cancel"));
if (answer == KMessageBox::Yes) {

@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>142</width>
<height>21</height>
@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>144</width>
<height>21</height>
@ -96,13 +96,13 @@
<property name="name">
<cstring>iconPixmap</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@ -142,7 +142,7 @@
<property name="textFormat">
<enum>AutoText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@ -175,7 +175,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>20</height>

@ -114,7 +114,7 @@ bool countDownDialog::showDialog() {
if (!textLabel->text().isEmpty() && timeOut > 0) {
// init the progressbar
progressBar->setFormat(i18n("%1 seconds").tqarg(remaining));
progressBar->setFormat(i18n("%1 seconds").arg(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").tqarg(remaining));
progressBar->setFormat(i18n("%1 seconds").arg(remaining));
progressBar->setPercentageVisible(true);
progressBar->setProgress(setTo);
progressBar->setEnabled(true);

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

@ -66,7 +66,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<grid>
<property name="name">
@ -92,7 +92,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
</widget>
@ -111,7 +111,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>10</width>
<height>50</height>
@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout18</cstring>
<cstring>layout18</cstring>
</property>
<vbox>
<property name="name">
@ -155,13 +155,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@ -181,7 +181,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@ -205,7 +205,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Battery tqStatus</string>
<string>Battery Status</string>
</property>
<grid>
<property name="name">
@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>118</height>
@ -230,7 +230,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@ -238,7 +238,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout14</cstring>
<cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@ -270,7 +270,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@ -300,7 +300,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@ -309,7 +309,7 @@
</spacer>
<widget class="TQLabel">
<property name="name">
<cstring>LabelACtqStatus</cstring>
<cstring>LabelACStatus</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@ -322,7 +322,7 @@
<property name="text">
<string>plugged in</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -351,7 +351,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -386,7 +386,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@ -397,7 +397,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<grid>
<property name="name">
@ -413,7 +413,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@ -432,13 +432,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@ -465,7 +465,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Processor tqStatus</string>
<string>Processor Status</string>
</property>
<grid>
<property name="name">
@ -473,7 +473,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout12_2</cstring>
<cstring>layout12_2</cstring>
</property>
<grid>
<property name="name">
@ -489,7 +489,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@ -508,13 +508,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@ -543,7 +543,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<grid>
<property name="name">
@ -580,7 +580,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>10</width>
<height>20</height>
@ -592,7 +592,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout19</cstring>
<cstring>layout19</cstring>
</property>
<grid>
<property name="name">
@ -608,7 +608,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>230</width>
<height>20</height>

@ -34,7 +34,7 @@
// QT headers:
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.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" ).tqarg(i));
Label->setText( i18n( "Battery %1" ).arg(i));
else
Label->setText( i18n( "Battery %1" ).tqarg(i + 1));
Label->setText( i18n( "Battery %1" ).arg(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" ).tqarg(i + 1));
Label->setText( i18n( "Processor %1" ).arg(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(ACtqStatus(bool)), this, TQT_SLOT(setAC()));
connect(hwinfo, TQT_SIGNAL(ACStatus(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").tqarg(hours).tqarg(minutes);
TQString temp = i18n("%1:%2 h until charged").arg(hours).arg(minutes);
BatteryPBar[i]->setFormat(temp);
} else if (_c_state == DISCHARGING) {
TQString temp = i18n("%1:%2 h remaining").tqarg(hours).tqarg(minutes);
TQString temp = i18n("%1:%2 h remaining").arg(hours).arg(minutes);
BatteryPBar[i]->setFormat(temp);
} 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)").tqarg(100 - cpuInfo->cpu_throttling[i]).tqarg(cpuInfo->cpufreq_speed[i]);
TQString ProgressString = TQString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufreq_speed[i]);
ProcessorPBar[i]->setFormat(i18n(ProgressString.ascii()));
ProcessorPBar[i]->setProgress(100 - cpuInfo->cpu_throttling[i]);
ProcessorPBar[i]->setEnabled(true);
@ -388,11 +388,11 @@ void detaileddialog::setAC() {
kdDebugFuncIn(trace);
if (hwinfo->getAcAdapter()) {
LabelACtqStatus->setText( i18n("plugged in") );
LabelACStatus->setText( i18n("plugged in") );
LedAC->on();
} else {
LedAC->off();
LabelACtqStatus->setText( i18n("unplugged") );
LabelACStatus->setText( i18n("unplugged") );
}
setInfos();

@ -57,20 +57,20 @@ class dummy {
dummy = i18n("activated");
dummy = i18n("deactivated");
dummy = i18n("do nothing");
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("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("This is a experimental feature.");
dummy = i18n("If you have problems with this feature, please report them.");
dummy = i18n("Select one of the available tqdevices and click on ");
dummy = i18n("Select one of the available 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 "
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 "
"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 tqdevices: %2").tqarg("").tqarg("");
dummy = i18n("Scheme switched to %1. \n Activate following tqdevices: %2").tqarg("").tqarg("");
dummy = i18n("Scheme switched to %1. \n Deactivate following devices: %2").arg("").arg("");
dummy = i18n("Scheme switched to %1. \n Activate following devices: %2").arg("").arg("");
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!").tqarg("").tqarg("");
dummy = i18n("Additionally, please mail the output of %1 to %2 . Thanks!").arg("").arg("");
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: ").tqarg(30);
dummy = i18n("The display get dimmed down to %1% in: ").arg(30);
// other ConsoleKit related stuff
dummy = i18n("Could not call %1. The current desktop session is not active.").tqarg("");
</