diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 10:00:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 10:00:17 -0600 |
| commit | 955e20356d63ed405198c8143617a8a0ca8bfc02 (patch) | |
| tree | 9a9ab22c86d212a5655014ad752e96b04c0c86a9 /kmilo/kmilo_kvaio/kcmkvaio/main.cpp | |
| parent | bf280726d5d22f33d33e4f9e771220c725249407 (diff) | |
| download | tdeutils-955e20356d63ed405198c8143617a8a0ca8bfc02.tar.gz tdeutils-955e20356d63ed405198c8143617a8a0ca8bfc02.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.
Diffstat (limited to 'kmilo/kmilo_kvaio/kcmkvaio/main.cpp')
| -rw-r--r-- | kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index 52a5e68..0624c1e 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -20,7 +20,7 @@ */ #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.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 *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); mKVaioGeneral = new KCMKVaioGeneral(this); - layout->addWidget( mKVaioGeneral ); - layout->addStretch(); + tqlayout->addWidget( mKVaioGeneral ); + tqlayout->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->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max, + if(mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max, bat2Avail, bat2Remaining, bat2Max, acConnected) ) { |