summaryrefslogtreecommitdiffstats
path: root/kmilo
diff options
context:
space:
mode:
Diffstat (limited to 'kmilo')
-rw-r--r--kmilo/asus/asus.cpp2
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui8
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.cpp10
-rw-r--r--kmilo/kmilo_kvaio/kvaio.cpp30
-rw-r--r--kmilo/kmilo_kvaio/kvaio.h4
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.cpp2
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.h2
-rw-r--r--kmilo/kmilod/defaultskin.cpp6
-rw-r--r--kmilo/kmilod/defaultwidget.ui4
-rw-r--r--kmilo/powerbook2/pb_monitor.cpp2
-rw-r--r--kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui2
-rw-r--r--kmilo/thinkpad/kcmthinkpad/main.cpp10
12 files changed, 41 insertions, 41 deletions
diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp
index a83235d..1af8780 100644
--- a/kmilo/asus/asus.cpp
+++ b/kmilo/asus/asus.cpp
@@ -183,7 +183,7 @@ bool AsusMonitor::readProc(asus_state_struct* asus_state)
int AsusMonitor::readProcEntry(const TQString &name)
{
- TQFile f(TQString("/proc/acpi/asus/%1").tqarg(name).local8Bit());
+ TQFile f(TQString("/proc/acpi/asus/%1").arg(name).local8Bit());
if (f.open(IO_ReadOnly))
{
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
"[email protected]");
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) )
{
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index 3f52ae9..437d188 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -163,7 +163,7 @@ void KVaio::slotVaioEvent(int event)
case SONYPI_EVENT_BACK_PRESSED:
if (mShowPowerStatusOnBackButton)
{
- showBatterytqStatus (true);
+ showBatteryStatus (true);
}
break;
default:
@@ -306,7 +306,7 @@ void KVaio::loadConfiguration(KConfig *k)
mReportUnknownEvents =
k->readBoolEntry("Report_Unknown_Events", false);
- mReportPowertqStatus =
+ mReportPowerStatus =
k->readBoolEntry("PeriodicallyReportPowerStatus", false);
mShowPowerStatusOnBackButton =
k->readBoolEntry("PowerStatusOnBackButton", true);
@@ -315,7 +315,7 @@ void KVaio::loadConfiguration(KConfig *k)
<< " mReportUnknownEvents: "
<< mReportUnknownEvents << endl
<< " mReportPowerStatus: "
- << mReportPowertqStatus << endl
+ << mReportPowerStatus << endl
<< "mShowPowerStatusOnBackButton: "
<< mShowPowerStatusOnBackButton << endl;
}
@@ -327,31 +327,31 @@ const KVaioDriverInterface* KVaio::driver()
void KVaio::slotTimeout ()
{
- showBatterytqStatus ();
+ showBatteryStatus ();
mTimer->start (4000, true);
}
-bool KVaio::showBatterytqStatus ( bool force )
+bool KVaio::showBatteryStatus ( bool force )
{
static bool acConnectedCache = false;
static int previousChargeCache = -1;
bool bat1Avail = false, bat2Avail = false, acConnected = false;
int bat1Remaining = 0, bat1Max = 0, bat2Remaining = 0, bat2Max = 0;
bool displayBatteryMsg = false;
- bool displayACtqStatus = false;
+ bool displayACStatus = false;
TQString text, acMsg;
TQTextStream stream(text, IO_WriteOnly);
// -----
- // only display on startup if mReportPowertqStatus is true:
- if (mReportPowertqStatus==false || !force)
+ // only display on startup if mReportPowerStatus is true:
+ if (mReportPowerStatus==false || !force)
{
return true;
}
// query all necessary information:
- (void) mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max,
+ (void) mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max,
bat2Avail, bat2Remaining, bat2Max,
acConnected);
@@ -364,7 +364,7 @@ bool KVaio::showBatterytqStatus ( bool force )
if (acConnectedCache != acConnected || force)
{
- displayACtqStatus = true;
+ displayACStatus = true;
acConnectedCache = acConnected;
}
@@ -379,10 +379,10 @@ bool KVaio::showBatterytqStatus ( bool force )
}
// ----- prepare text messages
- if (displayACtqStatus || displayBatteryMsg)
+ if (displayACStatus || displayBatteryMsg)
{
- if (displayACtqStatus)
+ if (displayACStatus)
{
acMsg = acConnected ? i18n ("AC Connected") : i18n ("AC Disconnected");
}
@@ -397,7 +397,7 @@ bool KVaio::showBatterytqStatus ( bool force )
case 3:
case 2:
case 1:
- stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").tqarg(remaining);
+ stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").arg(remaining);
break;
case 0:
stream << i18n("Alert: Battery is Empty!");
@@ -406,11 +406,11 @@ bool KVaio::showBatterytqStatus ( bool force )
stream << i18n("No Battery Inserted.");
break;
default:
- stream << i18n("Remaining Battery Capacity: %1%").tqarg( remaining );
+ stream << i18n("Remaining Battery Capacity: %1%").arg( remaining );
};
// show a message if the battery status changed by more then 10% or on startup
- if (displayACtqStatus)
+ if (displayACStatus)
{
stream << endl << acMsg;
}
diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h
index c012c66..ba2bf98 100644
--- a/kmilo/kmilo_kvaio/kvaio.h
+++ b/kmilo/kmilo_kvaio/kvaio.h
@@ -74,7 +74,7 @@ protected:
bool isKMiloDAvailable();
bool showTextMsg(const TQString& msg);
bool showProgressMsg(const TQString& msg, int progress);
- bool showBatterytqStatus ( bool force = false);
+ bool showBatteryStatus ( bool force = false);
protected slots:
void slotVaioEvent(int);
void slotTimeout();
@@ -106,7 +106,7 @@ private:
int m_BrightnessStep;
bool mReportUnknownEvents;
- bool mReportPowertqStatus;
+ bool mReportPowerStatus;
bool mShowPowerStatusOnBackButton;
TQTimer *mTimer;
};
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
index 3aa8e4f..088ae51 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
@@ -162,7 +162,7 @@ void KVaioDriverInterface::setBrightness(int value)
}
}
-bool KVaioDriverInterface::getBatterytqStatus(
+bool KVaioDriverInterface::getBatteryStatus(
bool& bat1Avail, int& bat1Remaining, int& bat1Max,
bool& bat2Avail, int& bat2Remaining, int& bat2Max,
bool& acConnected)
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
index 2cf7fee..2d051c2 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
@@ -43,7 +43,7 @@ public:
255. Returns -1 if the setting cannot be retrieved. */
int brightness();
/** Get the battery status. */
- bool getBatterytqStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max,
+ bool getBatteryStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max,
bool& bat2Avail, int& bat2Remaining, int& bat2Max,
bool& acConnected);
public slots:
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index 7271ea3..6bc35c7 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -100,10 +100,10 @@ void DefaultSkin::show() {
#if KDE_IS_VERSION(3,1,90)
TQRect r = KGlobalSettings::splashScreenDesktopGeometry();
#else
- TQRect r = TQApplication::desktop()->tqgeometry();
+ TQRect r = TQApplication::desktop()->geometry();
#endif
- // _label->resize(_label->tqminimumSizeHint());
- // _widget->resize(_label->tqminimumSizeHint());
+ // _label->resize(_label->minimumSizeHint());
+ // _widget->resize(_label->minimumSizeHint());
_widget->move(r.center() -
TQPoint(_widget->width()/2, _widget->height()/2));
_widget->show();
diff --git a/kmilo/kmilod/defaultwidget.ui b/kmilo/kmilod/defaultwidget.ui
index c987ed3..77bc3f3 100644
--- a/kmilo/kmilod/defaultwidget.ui
+++ b/kmilo/kmilod/defaultwidget.ui
@@ -33,7 +33,7 @@ Released under the terms of the GNU GPL.</comment>
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -57,7 +57,7 @@ Released under the terms of the GNU GPL.</comment>
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp
index cf3b927..313a32d 100644
--- a/kmilo/powerbook2/pb_monitor.cpp
+++ b/kmilo/powerbook2/pb_monitor.cpp
@@ -98,7 +98,7 @@ Monitor::DisplayType PowerBookMonitor::poll()
{
rc = Monitor::Tap;
TQString marg = tpmodes[ tag->data & 3 ];
- m_message = i18n( "Operating mode set to: %1." ).tqarg( marg );
+ m_message = i18n( "Operating mode set to: %1." ).arg( marg );
}
break;
default:
diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
index 47d3874..5fb8d90 100644
--- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
+++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
@@ -62,7 +62,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout27</cstring>
+ <cstring>layout27</cstring>
</property>
<grid>
<property name="name">
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index 7ad2b08..31a9417 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -23,7 +23,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqfile.h>
@@ -68,10 +68,10 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T
"[email protected]");
setAboutData( about );
- TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout* layout = new TQVBoxLayout(this);
m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this);
- tqlayout->addWidget( m_KCMThinkpadGeneral );
- tqlayout->addStretch();
+ layout->addWidget( m_KCMThinkpadGeneral );
+ layout->addStretch();
load();
@@ -116,7 +116,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T
"R30/R31 models and to use a custom volume "
"change step, set the nvram device to world "
"writeable: <em>chmod 666 "
- "/dev/nvram</em>").tqarg(m_nvramFile));
+ "/dev/nvram</em>").arg(m_nvramFile));
#endif
} else {
m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration"));
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 13:01:00 +0000