summaryrefslogtreecommitdiffstats
path: root/kmilo
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:52:55 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:52:55 +0000
commit5f5ee2367157176ed223b86343eb0a9e4022e020 (patch)
tree6a9c87f14ee38e90eff3c77c784f14e4f38fd5a1 /kmilo
parent4facf42feec57b22dcf46badc115ad6c5b5cc512 (diff)
downloadtdeutils-5f5ee2367157176ed223b86343eb0a9e4022e020.tar.gz
tdeutils-5f5ee2367157176ed223b86343eb0a9e4022e020.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1157653 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmilo')
-rw-r--r--kmilo/asus/asus.cpp20
-rw-r--r--kmilo/asus/asus.h4
-rw-r--r--kmilo/delli8k/delli8k.cpp2
-rw-r--r--kmilo/delli8k/delli8k.h2
-rw-r--r--kmilo/demo/demo.cpp2
-rw-r--r--kmilo/demo/demo.h2
-rw-r--r--kmilo/generic/generic_monitor.cpp52
-rw-r--r--kmilo/generic/generic_monitor.h6
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.cpp30
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.h4
-rw-r--r--kmilo/kmilo_kvaio/kmilo_kvaio.cpp4
-rw-r--r--kmilo/kmilo_kvaio/kmilo_kvaio.h8
-rw-r--r--kmilo/kmilo_kvaio/kvaio.cpp42
-rw-r--r--kmilo/kmilo_kvaio/kvaio.h10
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.cpp10
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.h6
-rw-r--r--kmilo/kmilod/defaultskin.cpp34
-rw-r--r--kmilo/kmilod/defaultskin.h16
-rw-r--r--kmilo/kmilod/displayskin.h10
-rw-r--r--kmilo/kmilod/kmilod.cpp20
-rw-r--r--kmilo/kmilod/kmilod.h20
-rw-r--r--kmilo/kmilod/kmilointerface.h16
-rw-r--r--kmilo/kmilod/monitor.cpp8
-rw-r--r--kmilo/kmilod/monitor.h16
-rw-r--r--kmilo/powerbook/pb_monitor.cpp2
-rw-r--r--kmilo/powerbook/pb_monitor.h2
-rw-r--r--kmilo/powerbook2/pb_monitor.cpp12
-rw-r--r--kmilo/powerbook2/pb_monitor.h6
-rw-r--r--kmilo/thinkpad/kcmthinkpad/main.cpp26
-rw-r--r--kmilo/thinkpad/kcmthinkpad/main.h4
-rw-r--r--kmilo/thinkpad/thinkpad.cpp8
-rw-r--r--kmilo/thinkpad/thinkpad.h18
32 files changed, 211 insertions, 211 deletions
diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp
index e1fbfa0..1af8780 100644
--- a/kmilo/asus/asus.cpp
+++ b/kmilo/asus/asus.cpp
@@ -26,8 +26,8 @@
#include <krun.h>
#include <kurl.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
#include "kmilointerface.h"
@@ -42,7 +42,7 @@
namespace KMilo {
-AsusMonitor::AsusMonitor(QObject* parent, const char* name, const QStringList& args): Monitor(parent, name, args)
+AsusMonitor::AsusMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args)
{
}
@@ -69,7 +69,7 @@ bool AsusMonitor::init()
}
#else
// we need to read the /proc file system and store the current values into a struct
- QDir dir("/proc/acpi/asus");
+ TQDir dir("/proc/acpi/asus");
if (!dir.exists())
{
kdDebug() << "/proc/acpi/asus doesn't exist, check that the asus_acpi module is loaded" << endl;
@@ -172,22 +172,22 @@ bool AsusMonitor::readProc(asus_state_struct* asus_state)
if ( sysctl(video_mib, 4, &value, &value_len, NULL, 0) != -1 )
asus_state->display = value;
#else
- asus_state->brightness = readProcEntry(QString("brn"));
- //asus_state->lcd = readProcEntry(QString("lcd"));
+ asus_state->brightness = readProcEntry(TQString("brn"));
+ //asus_state->lcd = readProcEntry(TQString("lcd"));
//disabled because it does not yet work on my S5200N (asus_acpi bug)
- //asus_state->display = readProcEntry(QString("disp"));
+ //asus_state->display = readProcEntry(TQString("disp"));
//FIXME
#endif
return true;
}
-int AsusMonitor::readProcEntry(const QString &name)
+int AsusMonitor::readProcEntry(const TQString &name)
{
- QFile f(QString("/proc/acpi/asus/%1").arg(name).local8Bit());
+ TQFile f(TQString("/proc/acpi/asus/%1").arg(name).local8Bit());
if (f.open(IO_ReadOnly))
{
- QString line;
+ TQString line;
if (f.readLine(line, 1024) > 0)
{
line = line.stripWhiteSpace();
diff --git a/kmilo/asus/asus.h b/kmilo/asus/asus.h
index 90361d8..c809eea 100644
--- a/kmilo/asus/asus.h
+++ b/kmilo/asus/asus.h
@@ -42,7 +42,7 @@ typedef struct
*/
class AsusMonitor: public Monitor {
public:
- AsusMonitor(QObject *parent, const char *name, const QStringList&);
+ AsusMonitor(TQObject *parent, const char *name, const TQStringList&);
virtual ~AsusMonitor();
/**
@@ -72,7 +72,7 @@ class AsusMonitor: public Monitor {
asus_state_struct asus_state;
bool readProc(asus_state_struct* );
- int readProcEntry(const QString &);
+ int readProcEntry(const TQString &);
void clearStruct(asus_state_struct& asus_state);
diff --git a/kmilo/delli8k/delli8k.cpp b/kmilo/delli8k/delli8k.cpp
index 74c0d60..d63c8c7 100644
--- a/kmilo/delli8k/delli8k.cpp
+++ b/kmilo/delli8k/delli8k.cpp
@@ -43,7 +43,7 @@
namespace KMilo
{
-DellI8kMonitor::DellI8kMonitor( QObject* parent, const char* name, const QStringList& args )
+DellI8kMonitor::DellI8kMonitor( TQObject* parent, const char* name, const TQStringList& args )
: Monitor( parent, name, args )
{
}
diff --git a/kmilo/delli8k/delli8k.h b/kmilo/delli8k/delli8k.h
index d33f6ff..424f80a 100644
--- a/kmilo/delli8k/delli8k.h
+++ b/kmilo/delli8k/delli8k.h
@@ -45,7 +45,7 @@ namespace KMilo {
class DellI8kMonitor: public Monitor
{
public:
- DellI8kMonitor( QObject *parent, const char *name, const QStringList& );
+ DellI8kMonitor( TQObject *parent, const char *name, const TQStringList& );
virtual ~DellI8kMonitor();
/**
diff --git a/kmilo/demo/demo.cpp b/kmilo/demo/demo.cpp
index 668d137..c985e08 100644
--- a/kmilo/demo/demo.cpp
+++ b/kmilo/demo/demo.cpp
@@ -26,7 +26,7 @@
namespace KMilo {
-Demo::Demo(QObject *parent, const char *name, const QStringList& args)
+Demo::Demo(TQObject *parent, const char *name, const TQStringList& args)
: Monitor(parent, name, args) {
}
diff --git a/kmilo/demo/demo.h b/kmilo/demo/demo.h
index 6f57cfc..a1d02d4 100644
--- a/kmilo/demo/demo.h
+++ b/kmilo/demo/demo.h
@@ -26,7 +26,7 @@
class Demo : public KMilo::Monitor {
public:
- Demo(QObject *parent, const char *name, const QStringList&);
+ Demo(TQObject *parent, const char *name, const TQStringList&);
virtual ~Demo();
virtual bool init();
diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp
index bc104dc..14e79e0 100644
--- a/kmilo/generic/generic_monitor.cpp
+++ b/kmilo/generic/generic_monitor.cpp
@@ -33,16 +33,16 @@
#include "generic_monitor.h"
#include "kmilointerface.h"
-#include <qmessagebox.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqmessagebox.h>
+#include <tqfile.h>
+#include <tqdir.h>
#define CONFIG_FILE "kmilodrc"
using namespace KMilo;
-GenericMonitor::GenericMonitor(QObject *parent, const char *name, const QStringList& args)
+GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args)
: Monitor(parent, name, args)
{
_poll = false;
@@ -79,23 +79,23 @@ bool GenericMonitor::init()
return false; // exit early if we are not supposed to run
static const ShortcutInfo shortcuts[] = {
- { "Search", KShortcut("XF86Search"), SLOT(launchSearch()) },
- { "Home Folder", KShortcut("XF86MyComputer"), SLOT(launchHomeFolder()) },
- { "Mail", KShortcut("XF86Mail"), SLOT(launchMail()) },
- { "Audio Media", KShortcut("XF86AudioMedia"), SLOT(launchMusic()) },
- { "Music", KShortcut("XF86Music"), SLOT(launchMusic()) },
- { "Browser", KShortcut("XF86WWW"), SLOT(launchBrowser()) },
- { "Calculator", KShortcut("XF86Calculator"), SLOT(launchCalculator()) },
- { "Terminal", KShortcut("XF86Terminal"), SLOT(launchTerminal()) },
- { "Eject", KShortcut("XF86Eject"), SLOT(eject()) },
- { "Help", KShortcut("XF86Launch0"), SLOT(launchHelp()) },
- { "Light Bulb", KShortcut("XF86LightBulb"), SLOT(lightBulb()) },
- { "Battery", KShortcut("XF86LaunchB"), SLOT(pmBattery()) },
- { "FastVolumeUp", Qt::Key_VolumeUp, SLOT(fastVolumeUp()) },
- { "FastVolumeDown", Qt::Key_VolumeDown, SLOT(fastVolumeDown()) },
- { "SlowVolumeUp", Qt::CTRL+Qt::Key_VolumeUp, SLOT(slowVolumeUp()) },
- { "SlowVolumeDown", Qt::CTRL+Qt::Key_VolumeDown, SLOT(slowVolumeDown()) },
- { "Mute", KShortcut("XF86AudioMute"), SLOT(mute()) }
+ { "Search", KShortcut("XF86Search"), TQT_SLOT(launchSearch()) },
+ { "Home Folder", KShortcut("XF86MyComputer"), TQT_SLOT(launchHomeFolder()) },
+ { "Mail", KShortcut("XF86Mail"), TQT_SLOT(launchMail()) },
+ { "Audio Media", KShortcut("XF86AudioMedia"), TQT_SLOT(launchMusic()) },
+ { "Music", KShortcut("XF86Music"), TQT_SLOT(launchMusic()) },
+ { "Browser", KShortcut("XF86WWW"), TQT_SLOT(launchBrowser()) },
+ { "Calculator", KShortcut("XF86Calculator"), TQT_SLOT(launchCalculator()) },
+ { "Terminal", KShortcut("XF86Terminal"), TQT_SLOT(launchTerminal()) },
+ { "Eject", KShortcut("XF86Eject"), TQT_SLOT(eject()) },
+ { "Help", KShortcut("XF86Launch0"), TQT_SLOT(launchHelp()) },
+ { "Light Bulb", KShortcut("XF86LightBulb"), TQT_SLOT(lightBulb()) },
+ { "Battery", KShortcut("XF86LaunchB"), TQT_SLOT(pmBattery()) },
+ { "FastVolumeUp", Qt::Key_VolumeUp, TQT_SLOT(fastVolumeUp()) },
+ { "FastVolumeDown", Qt::Key_VolumeDown, TQT_SLOT(fastVolumeDown()) },
+ { "SlowVolumeUp", Qt::CTRL+Qt::Key_VolumeUp, TQT_SLOT(slowVolumeUp()) },
+ { "SlowVolumeDown", Qt::CTRL+Qt::Key_VolumeDown, TQT_SLOT(slowVolumeDown()) },
+ { "Mute", KShortcut("XF86AudioMute"), TQT_SLOT(mute()) }
};
ga = new KGlobalAccel(this, "miloGenericAccel");
@@ -105,7 +105,7 @@ bool GenericMonitor::init()
for (int i = 0; i < len; i++) {
si = shortcuts[i];
- ga->insert(si.name, QString::null, QString::null,
+ ga->insert(si.name, TQString::null, TQString::null,
si.symbol, si.symbol,
this,
si.slot, false);
@@ -310,7 +310,7 @@ void GenericMonitor::mute()
return;
m_mute = !m_mute;
- QString muteText;
+ TQString muteText;
if (m_mute)
{
muteText = i18n("Mute on");
@@ -335,9 +335,9 @@ Monitor::DisplayType GenericMonitor::poll()
return m_displayType;
}
-void GenericMonitor::launch(QString configKey, QString defaultApplication)
+void GenericMonitor::launch(TQString configKey, TQString defaultApplication)
{
- QString application = config->readEntry(configKey, defaultApplication);
+ TQString application = config->readEntry(configKey, defaultApplication);
KProcess proc;
proc << application;
proc.start(KProcess::DontCare);
@@ -361,7 +361,7 @@ void GenericMonitor::launchSearch()
void GenericMonitor::launchHomeFolder()
{
- QString home = QDir::home().path();
+ TQString home = TQDir::home().path();
KProcess proc;
proc << "kfmclient" << "exec" << home;
proc.start(KProcess::DontCare);
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index 1ad5304..6d67ac8 100644
--- a/kmilo/generic/generic_monitor.h
+++ b/kmilo/generic/generic_monitor.h
@@ -36,7 +36,7 @@
namespace KMilo {
-// now the key data (from kkeyserver_x11.h and $QTDIR/include/qnamespace.h)
+// now the key data (from kkeyserver_x11.h and $QTDIR/include/tqnamespace.h)
struct ShortcutInfo
{
const char* name;
@@ -50,7 +50,7 @@ class GenericMonitor : public Monitor
Q_OBJECT
public:
- GenericMonitor(QObject *parent, const char *name, const QStringList&);
+ GenericMonitor(TQObject *parent, const char *name, const TQStringList&);
virtual ~GenericMonitor();
virtual bool init();
@@ -82,7 +82,7 @@ private:
bool retrieveMute();
bool retrieveVolume();
void displayVolume();
- void launch(QString configKey, QString defaultApplication);
+ void launch(TQString configKey, TQString defaultApplication);
KGlobalAccel *ga;
KConfig* config;
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index ce27c94..4cf9707 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -19,11 +19,11 @@
*
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qtimer.h>
-#include <qslider.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqtimer.h>
+#include <tqslider.h>
#include <dcopclient.h>
#include <kgenericfactory.h>
@@ -40,13 +40,13 @@
#include "main.h"
#include "main.moc"
-typedef KGenericFactory<KVaioModule, QWidget> KVaioModuleFactory;
+typedef KGenericFactory<KVaioModule, TQWidget> KVaioModuleFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio"))
#define CONFIG_FILE "kmilodrc"
-KVaioModule::KVaioModule(QWidget *parent, const char *name, const QStringList &)
+KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KVaioModuleFactory::instance(), parent, name)
{
KAboutData *about =
@@ -61,14 +61,14 @@ KVaioModule::KVaioModule(QWidget *parent, const char *name, const QStringList &)
"mirko@kde.org");
setAboutData( about );
- QVBoxLayout *layout = new QVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
mKVaioGeneral = new KCMKVaioGeneral(this);
layout->addWidget( mKVaioGeneral );
layout->addStretch();
mDriver = new KVaioDriverInterface(this);
mDriverAvailable = mDriver->connectToDriver(false);
- mTimer = new QTimer(this);
+ mTimer = new TQTimer(this);
mTimer->start(231);
load();
@@ -82,10 +82,10 @@ KVaioModule::KVaioModule(QWidget *parent, const char *name, const QStringList &)
// mKVaioGeneral->frameMain->setEnabled (true);
}
- connect(mKVaioGeneral, SIGNAL(changed()),
- SLOT(changed()));
- connect(mTimer, SIGNAL(timeout()), SLOT(timeout()));
- connect(mDriver, SIGNAL (vaioEvent(int)), SLOT (vaioEvent(int) ) );
+ connect(mKVaioGeneral, TQT_SIGNAL(changed()),
+ TQT_SLOT(changed()));
+ connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
+ connect(mDriver, TQT_SIGNAL (vaioEvent(int)), TQT_SLOT (vaioEvent(int) ) );
}
void KVaioModule::save()
@@ -108,8 +108,8 @@ void KVaioModule::save()
if(mClient.attach())
{
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if (!mClient.call("kded", "kmilod", "reconfigure()",
data, replyType, replyData))
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h
index c19b648..7d47b74 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.h
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h
@@ -33,7 +33,7 @@ class KVaioModule : public KCModule
Q_OBJECT
public:
- KVaioModule(QWidget *parent, const char *name, const QStringList &);
+ KVaioModule(TQWidget *parent, const char *name, const TQStringList &);
void save();
void load();
@@ -46,7 +46,7 @@ protected slots:
private:
KCMKVaioGeneral *mKVaioGeneral;
KVaioDriverInterface *mDriver;
- QTimer *mTimer;
+ TQTimer *mTimer;
bool mDriverAvailable;
};
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
index 6389759..1f4a886 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
@@ -26,8 +26,8 @@
#include "kvaio.h"
#include "kmilointerface.h"
-KMiloKVaio::KMiloKVaio(QObject *parent, const char *name,
- const QStringList& args)
+KMiloKVaio::KMiloKVaio(TQObject *parent, const char *name,
+ const TQStringList& args)
: Monitor(parent, name, args),
m_kvaio(0)
{
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h
index fccd7e9..ffcc604 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.h
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h
@@ -37,8 +37,8 @@ class KMiloKVaio : public KMilo::Monitor {
// Q_OBJECT
public:
- KMiloKVaio(QObject *parent,
- const char *name, const QStringList&);
+ KMiloKVaio(TQObject *parent,
+ const char *name, const TQStringList&);
virtual ~KMiloKVaio();
virtual bool init();
@@ -48,11 +48,11 @@ class KMiloKVaio : public KMilo::Monitor {
virtual void reconfigure(KConfig*);
- bool showTextMsg(const QString& msg) {
+ bool showTextMsg(const TQString& msg) {
_interface->displayText(msg);
return true;
}
- bool showProgressMsg(const QString& msg, int progress) {
+ bool showProgressMsg(const TQString& msg, int progress) {
_interface->displayProgress(msg,progress);
return true;
}
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index 8a02098..167ddcb 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -31,10 +31,10 @@
#include "kvaio.h"
#include "kmilointerface.h"
-#include <qlabel.h>
-#include <qcstring.h>
-#include <qevent.h>
-#include <qdatastream.h>
+#include <tqlabel.h>
+#include <tqcstring.h>
+#include <tqevent.h>
+#include <tqdatastream.h>
#include <kmainwindow.h>
#include <klocale.h>
#include <kdebug.h>
@@ -56,9 +56,9 @@ extern "C" {
KVaio::KVaio(KMiloKVaio *parent, const char* name)
- : QObject(parent, name),
+ : TQObject(parent, name),
mDisp(0),
- mTimer (new QTimer (this) )
+ mTimer (new TQTimer (this) )
{
myparent = parent;
@@ -70,8 +70,8 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name)
kdDebug() << "KVaio: Cannot connect to driver." << endl;
} else {
kdDebug() << "KVaio: Connected to SonyPI driver." << endl;
- connect(mDriver, SIGNAL(vaioEvent(int)), SLOT(slotVaioEvent(int)));
- connect (mTimer, SIGNAL (timeout ()), SLOT (slotTimeout() ) );
+ connect(mDriver, TQT_SIGNAL(vaioEvent(int)), TQT_SLOT(slotVaioEvent(int)));
+ connect (mTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (slotTimeout() ) );
mTimer->start (10000, true);
}
@@ -126,8 +126,8 @@ KVaio::~KVaio()
void KVaio::slotVaioEvent(int event)
{
- QString text;
- QTextStream stream(text, IO_WriteOnly);
+ TQString text;
+ TQTextStream stream(text, IO_WriteOnly);
switch(event)
{
@@ -174,14 +174,14 @@ void KVaio::slotVaioEvent(int event)
}
}
-bool KVaio::showTextMsg(const QString& msg)
+bool KVaio::showTextMsg(const TQString& msg)
{
return myparent->showTextMsg(msg);
}
-bool KVaio::showProgressMsg(const QString& msg, int value)
+bool KVaio::showProgressMsg(const TQString& msg, int value)
{
m_progress = value;
return myparent->showProgressMsg(msg,value);
@@ -193,9 +193,9 @@ void KVaio::blankScreen()
if (isKScreensaverAvailable()) {
- QByteArray data, replyData;
- QDataStream arg(data, IO_WriteOnly);
- QCString replyType;
+ TQByteArray data, replyData;
+ TQDataStream arg(data, IO_WriteOnly);
+ TQCString replyType;
/* Set the screensave to BlankOnly mode */
blankonly = true;
@@ -223,9 +223,9 @@ void KVaio::blankScreen()
void KVaio::suspendToDisk()
{
- QByteArray data, replyData;
- QDataStream arg(data, IO_WriteOnly);
- QCString replyType;
+ TQByteArray data, replyData;
+ TQDataStream arg(data, IO_WriteOnly);
+ TQCString replyType;
mClient.call("kpowersave","KPowersaveIface","do_suspendToDisk()",
data, replyType, replyData) ;
@@ -340,8 +340,8 @@ bool KVaio::showBatteryStatus ( bool force )
bool displayBatteryMsg = false;
bool displayACStatus = false;
- QString text, acMsg;
- QTextStream stream(text, IO_WriteOnly);
+ TQString text, acMsg;
+ TQTextStream stream(text, IO_WriteOnly);
// -----
// only display on startup if mReportPowerStatus is true:
@@ -584,7 +584,7 @@ void KVaio::mute()
m_mute = !m_mute;
int newVolume;
- QString muteText;
+ TQString muteText;
if (m_mute)
{
m_oldVolume = m_volume;
diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h
index c16f27e..fac0290 100644
--- a/kmilo/kmilo_kvaio/kvaio.h
+++ b/kmilo/kmilo_kvaio/kvaio.h
@@ -26,7 +26,7 @@
#include <config.h>
#endif
-#include <qtimer.h>
+#include <tqtimer.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -57,7 +57,7 @@ class KVaio : public QObject
{
Q_OBJECT
public:
-// KVaio(QObject *parent = 0, const char *name =0);
+// KVaio(TQObject *parent = 0, const char *name =0);
KVaio(KMiloKVaio *parent = 0, const char *name =0);
virtual ~KVaio();
@@ -71,8 +71,8 @@ protected:
DCOPClient mClient;
bool isKScreensaverAvailable();
bool isKMiloDAvailable();
- bool showTextMsg(const QString& msg);
- bool showProgressMsg(const QString& msg, int progress);
+ bool showTextMsg(const TQString& msg);
+ bool showProgressMsg(const TQString& msg, int progress);
bool showBatteryStatus ( bool force = false);
protected slots:
void slotVaioEvent(int);
@@ -107,7 +107,7 @@ private:
bool mReportUnknownEvents;
bool mReportPowerStatus;
bool mShowPowerStatusOnBackButton;
- QTimer *mTimer;
+ TQTimer *mTimer;
};
#endif // _KVAIO_H
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
index 32da70a..20a7a72 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
@@ -37,7 +37,7 @@ extern "C" {
#include "./sonypi.h"
}
-#include <qsocketnotifier.h>
+#include <tqsocketnotifier.h>
#include <kdebug.h>
// Taken from Stelian Pop's spicctrl utility:
@@ -64,8 +64,8 @@ extern "C" {
#define SONYPI_IOCGBLUE _IOR('v', 8, __u8)
#define SONYPI_IOCSBLUE _IOW('v', 9, __u8)
-KVaioDriverInterface::KVaioDriverInterface(QObject *parent)
- : QObject(parent),
+KVaioDriverInterface::KVaioDriverInterface(TQObject *parent)
+ : TQObject(parent),
mFd(0),
mNotifier(0)
{
@@ -90,8 +90,8 @@ bool KVaioDriverInterface::connectToDriver(bool listen)
if(listen)
{
- mNotifier = new QSocketNotifier(mFd, QSocketNotifier::Read, this);
- connect(mNotifier, SIGNAL(activated(int)), SLOT(socketActivated(int)));
+ mNotifier = new TQSocketNotifier(mFd, TQSocketNotifier::Read, this);
+ connect(mNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(socketActivated(int)));
}
return true;
}
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
index 55c32b6..9259248 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
@@ -18,7 +18,7 @@
#ifndef KVAIO_DRIVERINTERFACE_H
#define KVAIO_DRIVERINTERFACE_H
-#include <qobject.h>
+#include <tqobject.h>
class QTimer;
@@ -35,7 +35,7 @@ class KVaioDriverInterface : public QObject
{
Q_OBJECT
public:
- KVaioDriverInterface(QObject *parent=0);
+ KVaioDriverInterface(TQObject *parent=0);
bool connectToDriver(bool listen = true);
void disconnectFromDriver();
/** Return the current display brightness, a value between 0 and
@@ -51,7 +51,7 @@ public slots:
protected:
int mFd;
fd_set mRfds;
- QSocketNotifier *mNotifier;
+ TQSocketNotifier *mNotifier;
signals:
void vaioEvent(int);
// void brightnessChanged(int);
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index a0ef2b0..6667a88 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -23,11 +23,11 @@
#include "defaultwidget.h"
-#include <qprogressbar.h>
-#include <qwidget.h>
-#include <qwidgetstack.h>
-#include <qlabel.h>
-#include <qapplication.h>
+#include <tqprogressbar.h>
+#include <tqwidget.h>
+#include <tqwidgetstack.h>
+#include <tqlabel.h>
+#include <tqapplication.h>
#include <kwin.h>
#include <netwm.h>
@@ -39,10 +39,10 @@
DefaultSkin::DefaultSkin() {
- connect(&_timer, SIGNAL(timeout()), this, SLOT(timeout()));
+ connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
_widget = new DefaultWidget(0, "Screen Indicator", Qt::WX11BypassWM);
- _widget->setFocusPolicy(QWidget::NoFocus);
+ _widget->setFocusPolicy(TQWidget::NoFocus);
KWin::setOnAllDesktops(_widget->winId(), true);
KWin::setState( _widget->winId(), NET::StaysOnTop | NET::Sticky
@@ -65,11 +65,11 @@ void DefaultSkin::reconfigure( KConfig *config ) {
config->setGroup("DefaultSkin");
- QFont *defaultFont = new QFont("Sans", 10, QFont::Bold );
- QSize *defaultSize = new QSize( 80, 30 );
- QColor *defaultpaletteForegroundColor = new QColor( 200, 200, 200 );
- QColor *defaultpaletteBackgroundColor = new QColor( 100, 100, 100 );
- QFont *defaultProgressFont = new QFont("Sans", 8, QFont::Bold );
+ TQFont *defaultFont = new TQFont("Sans", 10, TQFont::Bold );
+ TQSize *defaultSize = new TQSize( 80, 30 );
+ TQColor *defaultpaletteForegroundColor = new TQColor( 200, 200, 200 );
+ TQColor *defaultpaletteBackgroundColor = new TQColor( 100, 100, 100 );
+ TQFont *defaultProgressFont = new TQFont("Sans", 8, TQFont::Bold );
_widget->resize( config->readSizeEntry("Size", defaultSize ) );
_widget->setFont( config->readFontEntry("Font", defaultFont ) );
@@ -98,20 +98,20 @@ void DefaultSkin::clear() {
void DefaultSkin::show() {
#if KDE_IS_VERSION(3,1,90)
- QRect r = KGlobalSettings::splashScreenDesktopGeometry();
+ TQRect r = KGlobalSettings::splashScreenDesktopGeometry();
#else
- QRect r = QApplication::desktop()->geometry();
+ TQRect r = TQApplication::desktop()->geometry();
#endif
// _label->resize(_label->minimumSizeHint());
// _widget->resize(_label->minimumSizeHint());
_widget->move(r.center() -
- QPoint(_widget->width()/2, _widget->height()/2));
+ TQPoint(_widget->width()/2, _widget->height()/2));
_widget->show();
_timer.start(750, true);
}
-void DefaultSkin::displayText(const QString& text, const QPixmap& customPixmap) {
+void DefaultSkin::displayText(const TQString& text, const TQPixmap& customPixmap) {
Q_UNUSED(customPixmap)
_timer.stop();
_widget->_widgetStack->raiseWidget(0);
@@ -120,7 +120,7 @@ void DefaultSkin::displayText(const QString& text, const QPixmap& customPixmap)
}
-void DefaultSkin::displayProgress(const QString& text, int percent, const QPixmap& customPixmap) {
+void DefaultSkin::displayProgress(const TQString& text, int percent, const TQPixmap& customPixmap) {
Q_UNUSED(customPixmap)
_timer.stop();
_widget->_progressText->setText(text);
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 1610152..62bea16 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -23,14 +23,14 @@
#ifndef _DEFAULTSKIN_H_
#define _DEFAULTSKIN_H_
-#include <qstring.h>
-#include <qobject.h>
-#include <qtimer.h>
+#include <tqstring.h>
+#include <tqobject.h>
+#include <tqtimer.h>
#include "displayskin.h"
class DefaultWidget;
-class DefaultSkin : public QObject, public KMilo::DisplaySkin {
+class DefaultSkin : public TQObject, public KMilo::DisplaySkin {
Q_OBJECT
public:
DefaultSkin();
@@ -39,9 +39,9 @@ class DefaultSkin : public QObject, public KMilo::DisplaySkin {
virtual void clear();
virtual void reconfigure( KConfig *config );
- virtual void displayText(const QString& text, const QPixmap& customPixmap=QPixmap());
- virtual void displayProgress(const QString& text,
- int percent, const QPixmap& customPixmap=QPixmap());
+ virtual void displayText(const TQString& text, const TQPixmap& customPixmap=TQPixmap());
+ virtual void displayProgress(const TQString& text,
+ int percent, const TQPixmap& customPixmap=TQPixmap());
private slots:
void timeout();
@@ -50,7 +50,7 @@ class DefaultSkin : public QObject, public KMilo::DisplaySkin {
void show();
DefaultWidget *_widget;
- QTimer _timer;
+ TQTimer _timer;
};
diff --git a/kmilo/kmilod/displayskin.h b/kmilo/kmilod/displayskin.h
index 4e74e0c..46bd445 100644
--- a/kmilo/kmilod/displayskin.h
+++ b/kmilo/kmilod/displayskin.h
@@ -25,8 +25,8 @@
#include <kdemacros.h>
-#include <qstring.h>
-#include <qpixmap.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
namespace KMilo {
@@ -37,9 +37,9 @@ class KDE_EXPORT DisplaySkin {
virtual void clear() = 0;
- virtual void displayText(const QString& text,const QPixmap& customPixmap=QPixmap()) = 0;
- virtual void displayProgress(const QString& text,
- int percent, const QPixmap& customPixmap=QPixmap()) = 0;
+ virtual void displayText(const TQString& text,const TQPixmap& customPixmap=TQPixmap()) = 0;
+ virtual void displayProgress(const TQString& text,
+ int percent, const TQPixmap& customPixmap=TQPixmap()) = 0;
};
}
diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp
index 98203b1..aa40b6d 100644
--- a/kmilo/kmilod/kmilod.cpp
+++ b/kmilo/kmilod/kmilod.cpp
@@ -28,7 +28,7 @@
#include "kmilod.h"
#include "monitor.h"
-#include <qfile.h>
+#include <tqfile.h>
#include <klocale.h>
#include <kdebug.h>
@@ -43,13 +43,13 @@
using namespace KMilo;
extern "C" {
- KDE_EXPORT KDEDModule *create_kmilod(const QCString &name) {
+ KDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) {
return new KMiloD(name);
}
}
-KMiloD::KMiloD(const QCString &name) : KDEDModule(name), _interval(100)
+KMiloD::KMiloD(const TQCString &name) : KDEDModule(name), _interval(100)
{
_monitors.setAutoDelete(true);
_miface = new KMiloInterface(this);
@@ -80,7 +80,7 @@ KMiloD::KMiloD(const QCString &name) : KDEDModule(name), _interval(100)
}
// Start the timer
- QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(doTimer()));
+ TQObject::connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimer()));
if (shouldPoll) {
_timer.start(_interval);
}
@@ -192,21 +192,21 @@ void KMiloD::doTimer() {
}
-void KMiloD::displayText(const QString& text) {
- _display->displayText(text, QPixmap());
+void KMiloD::displayText(const TQString& text) {
+ _display->displayText(text, TQPixmap());
}
-void KMiloD::displayText(const QString& text, const QPixmap& customPixmap) {
+void KMiloD::displayText(const TQString& text, const TQPixmap& customPixmap) {
_display->displayText(text, customPixmap);
}
-void KMiloD::displayProgress(const QString& text, int progress) {
- _display->displayProgress(text, progress, QPixmap());
+void KMiloD::displayProgress(const TQString& text, int progress) {
+ _display->displayProgress(text, progress, TQPixmap());
}
-void KMiloD::displayProgress(const QString& text, int progress, const QPixmap& customPixmap ) {
+void KMiloD::displayProgress(const TQString& text, int progress, const TQPixmap& customPixmap ) {
_display->displayProgress(text, progress, customPixmap);
}
diff --git a/kmilo/kmilod/kmilod.h b/kmilo/kmilod/kmilod.h
index d97027b..6fdfb52 100644
--- a/kmilo/kmilod/kmilod.h
+++ b/kmilo/kmilod/kmilod.h
@@ -24,9 +24,9 @@
#define _KMILOD_H_
#include <kdedmodule.h>
-#include <qstring.h>
-#include <qtimer.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqtimer.h>
+#include <tqptrlist.h>
#include "monitor.h"
#include "displayskin.h"
@@ -38,7 +38,7 @@ class KMiloD : public KDEDModule {
Q_OBJECT
K_DCOP
public:
- KMiloD(const QCString &name);
+ KMiloD(const TQCString &name);
virtual ~KMiloD();
k_dcop:
@@ -49,10 +49,10 @@ class KMiloD : public KDEDModule {
virtual int pollMilliSeconds() const;
virtual bool setPollMilliSeconds(int ms);
- virtual void displayText(const QString& text);
- virtual void displayText(const QString& text, const QPixmap& customPixmap);
- virtual void displayProgress(const QString& text, int progress, const QPixmap& customPixmap);
- virtual void displayProgress(const QString& text, int progress);
+ virtual void displayText(const TQString& text);
+ virtual void displayText(const TQString& text, const TQPixmap& customPixmap);
+ virtual void displayProgress(const TQString& text, int progress, const TQPixmap& customPixmap);
+ virtual void displayProgress(const TQString& text, int progress);
virtual void reconfigure();
@@ -60,9 +60,9 @@ class KMiloD : public KDEDModule {
virtual void doTimer();
private:
- QTimer _timer;
+ TQTimer _timer;
int _interval;
- QPtrList<Monitor> _monitors;
+ TQPtrList<Monitor> _monitors;
DisplaySkin *_display;
KMiloInterface *_miface;
};
diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h
index d1edbb9..16e1567 100644
--- a/kmilo/kmilod/kmilointerface.h
+++ b/kmilo/kmilod/kmilointerface.h
@@ -23,28 +23,28 @@
#ifndef _KMILOI_H_
#define _KMILOI_H_
-#include <qobject.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
#include "kmilod.h"
namespace KMilo {
// FIXME: make put the methods into .cpp file when the header is installed.
-class KMiloInterface : public QObject {
+class KMiloInterface : public TQObject {
Q_OBJECT
public:
- KMiloInterface(KMiloD *p) : QObject() { _p = p; }
+ KMiloInterface(KMiloD *p) : TQObject() { _p = p; }
virtual ~KMiloInterface() {}
public slots:
int pollMilliSeconds() const { return _p->pollMilliSeconds(); }
bool setPollMilliSeconds(int ms) { return _p->setPollMilliSeconds(ms); }
- void displayText(const QString& text) { _p->displayText(text); }
- void displayText(const QString& text, const QPixmap& customPixmap) { _p->displayText(text, customPixmap); }
+ void displayText(const TQString& text) { _p->displayText(text); }
+ void displayText(const TQString& text, const TQPixmap& customPixmap) { _p->displayText(text, customPixmap); }
- void displayProgress(const QString& text, int progress, const QPixmap& customPixmap) { _p->displayProgress(text, progress, customPixmap); }
- void displayProgress(const QString& text, int progress) { _p->displayProgress(text, progress); }
+ void displayProgress(const TQString& text, int progress, const TQPixmap& customPixmap) { _p->displayProgress(text, progress, customPixmap); }
+ void displayProgress(const TQString& text, int progress) { _p->displayProgress(text, progress); }
void reconfigure() { _p->reconfigure(); }
diff --git a/kmilo/kmilod/monitor.cpp b/kmilo/kmilod/monitor.cpp
index f427ce4..84f0e03 100644
--- a/kmilo/kmilod/monitor.cpp
+++ b/kmilo/kmilod/monitor.cpp
@@ -22,8 +22,8 @@
#include "monitor.h"
-KMilo::Monitor::Monitor(QObject *parent, const char *name, const QStringList&)
-: QObject(parent, name) {
+KMilo::Monitor::Monitor(TQObject *parent, const char *name, const TQStringList&)
+: TQObject(parent, name) {
_poll = true;
}
@@ -38,7 +38,7 @@ KMilo::Monitor::DisplayType KMilo::Monitor::poll() { return None; }
int KMilo::Monitor::progress() const { return 42; }
-QString KMilo::Monitor::message() const { return QString::null; }
-QPixmap KMilo::Monitor::customPixmap() const { return QPixmap(); }
+TQString KMilo::Monitor::message() const { return TQString::null; }
+TQPixmap KMilo::Monitor::customPixmap() const { return TQPixmap(); }
bool KMilo::Monitor::init() { return true; }
diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h
index ee1581c..d50045b 100644
--- a/kmilo/kmilod/monitor.h
+++ b/kmilo/kmilod/monitor.h
@@ -23,10 +23,10 @@
#ifndef _MONITOR_H_
#define _MONITOR_H_
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qpixmap.h>
-#include <qobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqpixmap.h>
+#include <tqobject.h>
#include <kdemacros.h>
@@ -35,9 +35,9 @@ class KConfig;
namespace KMilo {
class KMiloInterface;
-class KDE_EXPORT Monitor : public QObject {
+class KDE_EXPORT Monitor : public TQObject {
public:
- Monitor(QObject *parent, const char *name, const QStringList&);
+ Monitor(TQObject *parent, const char *name, const TQStringList&);
virtual ~Monitor();
/**
@@ -73,13 +73,13 @@ class KDE_EXPORT Monitor : public QObject {
* Message displayed for DisplayType's that are not int
* measurable ( DisplayType::Tap for example )
*/
- virtual QString message() const;
+ virtual TQString message() const;
/**
* Custom pixmap that can be displayed be the themes
* when displaying the DisplayType.
*/
- virtual QPixmap customPixmap() const;
+ virtual TQPixmap customPixmap() const;
bool shouldPoll() const { return _poll; }
diff --git a/kmilo/powerbook/pb_monitor.cpp b/kmilo/powerbook/pb_monitor.cpp
index 6279854..5b1fae2 100644
--- a/kmilo/powerbook/pb_monitor.cpp
+++ b/kmilo/powerbook/pb_monitor.cpp
@@ -33,7 +33,7 @@ extern "C" {
namespace KMilo {
-PowerBookMonitor::PowerBookMonitor(QObject *parent, const char *name, const QStringList& args)
+PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name, const TQStringList& args)
: Monitor(parent, name, args) {
_serverPort = -1;
_clientPort = -1;
diff --git a/kmilo/powerbook/pb_monitor.h b/kmilo/powerbook/pb_monitor.h
index 6d2736d..13b9885 100644
--- a/kmilo/powerbook/pb_monitor.h
+++ b/kmilo/powerbook/pb_monitor.h
@@ -26,7 +26,7 @@
class PowerBookMonitor : public KMilo::Monitor {
public:
- PowerBookMonitor(QObject *parent, const char *name, const QStringList&);
+ PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&);
virtual ~PowerBookMonitor();
virtual bool init();
diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp
index 84c72d5..340d38b 100644
--- a/kmilo/powerbook2/pb_monitor.cpp
+++ b/kmilo/powerbook2/pb_monitor.cpp
@@ -45,12 +45,12 @@ extern "C" {
}
#define BUFFERLEN 200
-const QString tpmodes[] = { I18N_NOOP("No Tap"), I18N_NOOP("Tap"), I18N_NOOP("Drag"), I18N_NOOP("Lock") };
+const TQString tpmodes[] = { I18N_NOOP("No Tap"), I18N_NOOP("Tap"), I18N_NOOP("Drag"), I18N_NOOP("Lock") };
namespace KMilo {
-PowerBookMonitor::PowerBookMonitor(QObject *parent, const char *name,
- const QStringList& args)
+PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name,
+ const TQStringList& args)
: Monitor(parent, name, args),
m_progress( 0 )
{
@@ -79,7 +79,7 @@ Monitor::DisplayType PowerBookMonitor::poll()
Monitor::DisplayType rc = None;
// Drain the queue, send the last message
struct tagitem* tag = readMessage();
- m_message = QString::null;
+ m_message = TQString::null;
while ( tag && tag->tag != TAG_END ) {
switch ( tag->tag ) {
case TAG_VOLUME:
@@ -97,7 +97,7 @@ Monitor::DisplayType PowerBookMonitor::poll()
case TAG_TPMODE:
{
rc = Monitor::Tap;
- QString marg = tpmodes[ tag->data & 3 ];
+ TQString marg = tpmodes[ tag->data & 3 ];
m_message = i18n( "Operating mode set to: %1." ).arg( marg );
}
break;
@@ -120,7 +120,7 @@ int PowerBookMonitor::progress() const
return m_progress;
}
-QString PowerBookMonitor::message() const
+TQString PowerBookMonitor::message() const
{
return m_message;
}
diff --git a/kmilo/powerbook2/pb_monitor.h b/kmilo/powerbook2/pb_monitor.h
index a6bf651..e9dfb71 100644
--- a/kmilo/powerbook2/pb_monitor.h
+++ b/kmilo/powerbook2/pb_monitor.h
@@ -34,19 +34,19 @@ namespace KMilo {
class PowerBookMonitor : public KMilo::Monitor
{
public:
- PowerBookMonitor(QObject *parent, const char *name, const QStringList&);
+ PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&);
virtual ~PowerBookMonitor();
virtual bool init();
virtual DisplayType poll();
virtual int progress() const;
- virtual QString message() const;
+ virtual TQString message() const;
private:
struct tagitem* readMessage();
private:
int m_progress;
- QString m_message;
+ TQString m_message;
bool m_sleep;
};
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index 1b8b4bd..b98dc28 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -22,12 +22,12 @@
*
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qspinbox.h>
-#include <qfile.h>
-#include <qbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqspinbox.h>
+#include <tqfile.h>
+#include <tqbuttongroup.h>
#include <dcopclient.h>
#include <kgenericfactory.h>
@@ -49,12 +49,12 @@
#include "main.h"
#include "main.moc"
-typedef KGenericFactory<KCMThinkpadModule, QWidget> KCMThinkpadModuleFactory;
+typedef KGenericFactory<KCMThinkpadModule, TQWidget> KCMThinkpadModuleFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad"))
#define CONFIG_FILE "kmilodrc"
-KCMThinkpadModule::KCMThinkpadModule(QWidget* parent, const char* name, const QStringList&)
+KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&)
: KCModule(KCMThinkpadModuleFactory::instance(), parent, name) {
KAboutData* about =
new KAboutData(I18N_NOOP("kcmthinkpad"),
@@ -68,7 +68,7 @@ KCMThinkpadModule::KCMThinkpadModule(QWidget* parent, const char* name, const QS
"jr@jriddell.org");
setAboutData( about );
- QVBoxLayout* layout = new QVBoxLayout(this);
+ TQVBoxLayout* layout = new TQVBoxLayout(this);
m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this);
layout->addWidget( m_KCMThinkpadGeneral );
layout->addStretch();
@@ -97,7 +97,7 @@ KCMThinkpadModule::KCMThinkpadModule(QWidget* parent, const char* name, const QS
"R30/R31 models, or using a custom volume "
"change step is disabled."));
#else
- QFile nvramFile(m_nvramFile);
+ TQFile nvramFile(m_nvramFile);
if ( nvramFile.open(IO_ReadOnly) ) {
m_nvramReadable = true;
nvramFile.close();
@@ -122,7 +122,7 @@ KCMThinkpadModule::KCMThinkpadModule(QWidget* parent, const char* name, const QS
m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration"));
}
- connect( m_KCMThinkpadGeneral, SIGNAL(changed()), SLOT(changed()));
+ connect( m_KCMThinkpadGeneral, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
}
@@ -146,8 +146,8 @@ void KCMThinkpadModule::save() {
config.sync();
if (client.attach()) {
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if (!client.call("kded", "kmilod", "reconfigure()", data, replyType, replyData)) {
kdDebug() << "KCMThinkpad::showTextMsg: "
diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h
index 53534ed..1fdedb5 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.h
+++ b/kmilo/thinkpad/kcmthinkpad/main.h
@@ -33,7 +33,7 @@ class KCMThinkpadModule : public KCModule {
Q_OBJECT
public:
- KCMThinkpadModule(QWidget* parent, const char* name, const QStringList&);
+ KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&);
void save();
void load();
@@ -41,7 +41,7 @@ class KCMThinkpadModule : public KCModule {
void defaults();
private:
KCMThinkpadGeneral* m_KCMThinkpadGeneral;
- QString m_nvramFile;
+ TQString m_nvramFile;
bool m_nvramReadable;
bool m_nvramWriteable;
};
diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp
index 74770cf..034c6bd 100644
--- a/kmilo/thinkpad/thinkpad.cpp
+++ b/kmilo/thinkpad/thinkpad.cpp
@@ -43,7 +43,7 @@
namespace KMilo {
-ThinkPadMonitor::ThinkPadMonitor(QObject* parent, const char* name, const QStringList& args): Monitor(parent, name, args) {
+ThinkPadMonitor::ThinkPadMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args) {
m_progress = 0;
m_volume = 50; //set in retrieveVolume()
}
@@ -265,7 +265,7 @@ int ThinkPadMonitor::progress() const {
return m_progress;
}
-QString ThinkPadMonitor::message() const {
+TQString ThinkPadMonitor::message() const {
//unused
//return i18n("yer maw!");
return "";
@@ -426,8 +426,8 @@ void ThinkPadMonitor::clearStruct(thinkpad_state_struct& thinkpad_state) {
thinkpad_state.bluetooth_toggle = 0;
}
-void ThinkPadMonitor::showToggleMessage(QString onMessage, QString offMessage, bool state) {
- QString message;
+void ThinkPadMonitor::showToggleMessage(TQString onMessage, TQString offMessage, bool state) {
+ TQString message;
if (state) {
message = onMessage;
} else {
diff --git a/kmilo/thinkpad/thinkpad.h b/kmilo/thinkpad/thinkpad.h
index f195b2e..dc843ca 100644
--- a/kmilo/thinkpad/thinkpad.h
+++ b/kmilo/thinkpad/thinkpad.h
@@ -83,7 +83,7 @@ typedef struct {
*/
class ThinkPadMonitor : public Monitor {
public:
- ThinkPadMonitor(QObject *parent, const char *name, const QStringList&);
+ ThinkPadMonitor(TQObject *parent, const char *name, const TQStringList&);
virtual ~ThinkPadMonitor();
/**
@@ -109,7 +109,7 @@ class ThinkPadMonitor : public Monitor {
* Reimplemented from KMilo::Monitor.
* Not used, we just set the message ourselves using _interface->displayText()
*/
- virtual QString message() const;
+ virtual TQString message() const;
protected:
/**
* Reimplemented from KMilo::Monitor.
@@ -136,7 +136,7 @@ class ThinkPadMonitor : public Monitor {
* Displays paramater message followed by 'on' or
* 'off' depending on state
*/
- void showToggleMessage(QString onMessage, QString offMessage, bool state);
+ void showToggleMessage(TQString onMessage, TQString offMessage, bool state);
/**
* Returned by progress()
@@ -146,7 +146,7 @@ class ThinkPadMonitor : public Monitor {
/**
* The file to read data from, default is /dev/nvram
*/
- QString m_nvramFile;
+ TQString m_nvramFile;
/**
* Some thinkpads change volume in hardware, others we
@@ -168,27 +168,27 @@ class ThinkPadMonitor : public Monitor {
/**
* Thinkpad button
*/
- QString m_buttonThinkpad;
+ TQString m_buttonThinkpad;
/**
* Home button
*/
- QString m_buttonHome;
+ TQString m_buttonHome;
/**
* Search button
*/
- QString m_buttonSearch;
+ TQString m_buttonSearch;
/**
* Mail button
*/
- QString m_buttonMail;
+ TQString m_buttonMail;
/**
* Zoom button
*/
- QString m_buttonZoom;
+ TQString m_buttonZoom;
/**
* Used for changing the volume if m_softwareVolume is true