diff options
Diffstat (limited to 'kmilo/kmilo_kvaio/kcmkvaio')
| -rw-r--r-- | kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui | 8 | ||||
| -rw-r--r-- | kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui index c9ad68b..27778ef 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui +++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui @@ -71,7 +71,7 @@ <property name="text"> <string>Remaining battery capacity:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -109,7 +109,7 @@ <property name="text"> <string>AC</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -150,7 +150,7 @@ <property name="text"> <string>Bat 1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -186,7 +186,7 @@ <property name="text"> <string>Bat 2</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index 0624c1e..52a5e68 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -20,7 +20,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqtimer.h> #include <tqslider.h> @@ -61,10 +61,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList setAboutData( about ); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); mKVaioGeneral = new KCMKVaioGeneral(this); - tqlayout->addWidget( mKVaioGeneral ); - tqlayout->addStretch(); + layout->addWidget( mKVaioGeneral ); + layout->addStretch(); mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this)); mDriverAvailable = mDriver->connectToDriver(false); @@ -156,7 +156,7 @@ void KVaioModule::timeout() bool bat1Avail = false, bat2Avail = false, acConnected = false; int bat1Remaining = 0, bat1Max = 0, bat2Remaining = 0, bat2Max = 0; - if(mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max, + if(mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max, bat2Avail, bat2Remaining, bat2Max, acConnected) ) { |