TQt4 port kdeutils

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

35 files changed, 170 insertions, 161 deletions

diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp
index 1af8780..12690f1 100644
--- a/kmilo/asus/asus.cpp
+++ b/kmilo/asus/asus.cpp
@@ -42,7 +42,7 @@
 
 namespace KMilo {
 
-AsusMonitor::AsusMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args)
+AsusMonitor::AsusMonitor(TQObject* tqparent, const char* name, const TQStringList& args): Monitor(tqparent, name, args)
 {
 }
 
@@ -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").arg(name).local8Bit());
+	TQFile f(TQString("/proc/acpi/asus/%1").tqarg(name).local8Bit());
 
 	if (f.open(IO_ReadOnly))
 	{
diff --git a/kmilo/asus/asus.h b/kmilo/asus/asus.h
index c809eea..1d1132d 100644
--- a/kmilo/asus/asus.h
+++ b/kmilo/asus/asus.h
@@ -42,7 +42,7 @@ typedef struct
  */
 class AsusMonitor: public Monitor {
 	public:
-		AsusMonitor(TQObject *parent, const char *name, const TQStringList&);
+		AsusMonitor(TQObject *tqparent, const char *name, const TQStringList&);
 		virtual ~AsusMonitor();
 
 		/**
diff --git a/kmilo/delli8k/delli8k.cpp b/kmilo/delli8k/delli8k.cpp
index d63c8c7..063fa74 100644
--- a/kmilo/delli8k/delli8k.cpp
+++ b/kmilo/delli8k/delli8k.cpp
@@ -43,8 +43,8 @@
 namespace KMilo
 {
 
-DellI8kMonitor::DellI8kMonitor( TQObject* parent, const char* name, const TQStringList& args )
-    : Monitor( parent, name, args )
+DellI8kMonitor::DellI8kMonitor( TQObject* tqparent, const char* name, const TQStringList& args )
+    : Monitor( tqparent, name, args )
 {
 }
 
diff --git a/kmilo/delli8k/delli8k.h b/kmilo/delli8k/delli8k.h
index 424f80a..1d3ead8 100644
--- a/kmilo/delli8k/delli8k.h
+++ b/kmilo/delli8k/delli8k.h
@@ -45,7 +45,7 @@ namespace KMilo {
 class DellI8kMonitor: public Monitor 
 {
 	public:
-		DellI8kMonitor( TQObject *parent, const char *name, const TQStringList& );
+		DellI8kMonitor( TQObject *tqparent, const char *name, const TQStringList& );
 		virtual ~DellI8kMonitor();
 
 		/**
diff --git a/kmilo/demo/demo.cpp b/kmilo/demo/demo.cpp
index c985e08..a2875f6 100644
--- a/kmilo/demo/demo.cpp
+++ b/kmilo/demo/demo.cpp
@@ -26,8 +26,8 @@
 
 namespace KMilo {
 
-Demo::Demo(TQObject *parent, const char *name, const TQStringList& args)
-: Monitor(parent, name, args) {
+Demo::Demo(TQObject *tqparent, const char *name, const TQStringList& args)
+: Monitor(tqparent, name, args) {
 }
 
 
diff --git a/kmilo/demo/demo.h b/kmilo/demo/demo.h
index a1d02d4..5a1aabe 100644
--- a/kmilo/demo/demo.h
+++ b/kmilo/demo/demo.h
@@ -26,7 +26,7 @@
 
 class Demo : public KMilo::Monitor {
 	public:
-		Demo(TQObject *parent, const char *name, const TQStringList&);
+		Demo(TQObject *tqparent, 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 14e79e0..a97726e 100644
--- a/kmilo/generic/generic_monitor.cpp
+++ b/kmilo/generic/generic_monitor.cpp
@@ -42,8 +42,8 @@
 
 using namespace KMilo;
 
-GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args)
-: Monitor(parent, name, args)
+GenericMonitor::GenericMonitor(TQObject *tqparent, const char *name, const TQStringList& args)
+: Monitor(tqparent, name, args)
 {
 	_poll = false;
 	m_displayType = Monitor::None;
@@ -91,10 +91,10 @@ bool GenericMonitor::init()
  		{ "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()) },
+		{ "FastVolumeUp", TQt::Key_VolumeUp, TQT_SLOT(fastVolumeUp()) },
+		{ "FastVolumeDown", TQt::Key_VolumeDown, TQT_SLOT(fastVolumeDown()) },
+		{ "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQT_SLOT(slowVolumeUp()) },
+		{ "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQT_SLOT(slowVolumeDown()) },
 		{ "Mute", KShortcut("XF86AudioMute"), TQT_SLOT(mute()) }
 	};
 
@@ -105,7 +105,7 @@ bool GenericMonitor::init()
 	for (int i = 0; i < len; i++) {
 		si = shortcuts[i];
 
-		ga->insert(si.name, TQString::null, TQString::null,
+		ga->insert(si.name, TQString(), TQString(),
 							 si.symbol, si.symbol,
 							 this,
 							 si.slot, false);
@@ -218,10 +218,10 @@ void GenericMonitor::volumeChange(int direction, int step)
 	/* Following snippet of code may seem to be overcomplicated, but it works for both devices with
 	 * volume grain < 100 (32 tested) and devices with volume grain > 100 (256 tested) while preserving
 	 * accuracy for devices with fine grain and preserving usability for devices with rough grain. */
-	int userVisibleVolume = qRound(m_volume * 100.0 / (m_maxVolume - m_minVolume));
+	int userVisibleVolume = tqRound(m_volume * 100.0 / (m_maxVolume - m_minVolume));
 	userVisibleVolume += direction * step; // add requested volume step
 	long previousVolume = m_volume;
-	m_volume = qRound(m_minVolume + userVisibleVolume * (m_maxVolume - m_minVolume) / 100.0);
+	m_volume = tqRound(m_minVolume + userVisibleVolume * (m_maxVolume - m_minVolume) / 100.0);
 	if (m_volume == previousVolume) // if the change was rounded to zero
 		m_volume += direction;
 
@@ -240,7 +240,7 @@ void GenericMonitor::fastVolumeDown() { volumeChange(-1, m_volumeStepFast); }
 
 void GenericMonitor::displayVolume()
 {
-	_interface->displayProgress(i18n("Volume"), qRound(m_volume * 100.0 / (m_maxVolume - m_minVolume)));
+	_interface->displayProgress(i18n("Volume"), tqRound(m_volume * 100.0 / (m_maxVolume - m_minVolume)));
 
 	// If we got this far, the DCOP communication with kmix works,
 	// so we don't have to test the result.
@@ -248,7 +248,7 @@ void GenericMonitor::displayVolume()
 	kmixClient->send("setAbsoluteVolume", m_volumeDeviceIdx, m_volume);
 	if(m_extraDeviceIdx != -1)
 		// for simplicity, use relative volume rather that absolute (extra precision is not needed here)
-		kmixClient->send("setVolume", m_extraDeviceIdx, qRound(m_volume * 100.0 / (m_maxVolume - m_minVolume)));
+		kmixClient->send("setVolume", m_extraDeviceIdx, tqRound(m_volume * 100.0 / (m_maxVolume - m_minVolume)));
 
 	// if mute then unmute
 	if (m_mute)
@@ -356,7 +356,7 @@ void GenericMonitor::launchBrowser()
 
 void GenericMonitor::launchSearch()
 {
-	launch("search", "kfind");
+	launch("search", "ktqfind");
 }
 
 void GenericMonitor::launchHomeFolder()
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index 6d67ac8..5c35b61 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/tqnamespace.h)
+// now the key data (from kkeyserver_x11.h and $TQTDIR/include/tqnamespace.h)
 struct ShortcutInfo
 {
 	const char* name;
@@ -48,9 +48,10 @@ struct ShortcutInfo
 class GenericMonitor : public Monitor
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	GenericMonitor(TQObject *parent, const char *name, const TQStringList&);
+	GenericMonitor(TQObject *tqparent, const char *name, const TQStringList&);
 	virtual ~GenericMonitor();
 
 	virtual bool init();
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
index ac376f3..e77244f 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
+++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KCMKVaioGeneral</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KCMKVaioGeneral</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>tlOff</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <string>Cannot find the &lt;i&gt;Sony Programmable Interrupt Controller&lt;/i&gt;. If this is a Sony Vaio Laptop, make sure the &lt;b&gt;sonypi&lt;/b&gt; driver module loads without failures.</string>
             </property>
         </widget>
-        <widget class="QFrame">
+        <widget class="TQFrame">
             <property name="name">
                 <cstring>frameMain</cstring>
             </property>
@@ -53,7 +53,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>bgBattery</cstring>
                     </property>
@@ -64,14 +64,14 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mTLBattery</cstring>
                             </property>
                             <property name="text">
                                 <string>Remaining battery capacity:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -98,7 +98,7 @@
                                 </color>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>tlAC</cstring>
                             </property>
@@ -109,7 +109,7 @@
                             <property name="text">
                                 <string>AC</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -139,7 +139,7 @@
                                 </color>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>tlBat1</cstring>
                             </property>
@@ -150,7 +150,7 @@
                             <property name="text">
                                 <string>Bat 1</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -175,7 +175,7 @@
                                 </color>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>tlBat2</cstring>
                             </property>
@@ -186,13 +186,13 @@
                             <property name="text">
                                 <string>Bat 2</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>bgGeneral</cstring>
                     </property>
@@ -203,7 +203,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>mCbPowerMsgs</cstring>
                             </property>
@@ -211,7 +211,7 @@
                                 <string>Periodically inform about battery and AC adapter status</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>mCbBackButtonMsg</cstring>
                             </property>
@@ -219,7 +219,7 @@
                                 <string>Show battery and AC status on Back button press</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>cbReportUnknownEvents</cstring>
                             </property>
@@ -256,14 +256,14 @@
 <includes>
     <include location="local" impldecl="in implementation">kcmkvaio_general.ui.h</include>
 </includes>
-<signals>
+<Q_SIGNALS>
     <signal>changed();</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
     <slot>slotChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>kled.h</includehint>
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui.h b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui.h
index 96d4938..e017799 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui.h
+++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index 4cf9707..e8a05e2 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -46,8 +46,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio"))
 #define CONFIG_FILE "kmilodrc"
 
 
-KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &)
-    : KCModule(KVaioModuleFactory::instance(), parent, name)
+KVaioModule::KVaioModule(TQWidget *tqparent, const char *name, const TQStringList &)
+    : KCModule(KVaioModuleFactory::instance(), tqparent, name)
 {
     KAboutData *about =
         new KAboutData(I18N_NOOP("kcmkvaio"),
@@ -61,12 +61,12 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList
                      "mirko@kde.org");
     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(this);
+    mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this));
     mDriverAvailable = mDriver->connectToDriver(false);
     mTimer = new TQTimer(this);
     mTimer->start(231);
@@ -100,7 +100,7 @@ void KVaioModule::save()
 
     config.writeEntry("Report_Unknown_Events",
                       mKVaioGeneral->cbReportUnknownEvents->isChecked());
-    config.writeEntry("PeriodicallyReportPowerStatus",
+    config.writeEntry("PeriodicallyReportPowertqStatus",
 		      mKVaioGeneral->mCbPowerMsgs->isChecked() );
     config.writeEntry("PowerStatusOnBackButton",
 		      mKVaioGeneral->mCbBackButtonMsg->isChecked() );
@@ -139,7 +139,7 @@ void KVaioModule::load(bool useDefaults)
     mKVaioGeneral->cbReportUnknownEvents->setChecked
         (config.readBoolEntry("Report_Unknown_Events", false));
     mKVaioGeneral->mCbPowerMsgs->setChecked
-	(config.readBoolEntry("PeriodicallyReportPowerStatus", false) );
+	(config.readBoolEntry("PeriodicallyReportPowertqStatus", false) );
     mKVaioGeneral->mCbBackButtonMsg->setChecked
 	(config.readBoolEntry("PowerStatusOnBackButton", true) );
 
@@ -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) )
     {
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h
index bf014c9..b7dbade 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.h
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h
@@ -31,9 +31,10 @@ class KCMKVaioGeneral;
 class KVaioModule : public KCModule
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KVaioModule(TQWidget *parent, const char *name, const TQStringList &);
+    KVaioModule(TQWidget *tqparent, const char *name, const TQStringList &);
 
     void  save();
     void  load();
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
index 1f4a886..fa22f0b 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
    $Id$
@@ -26,9 +26,9 @@
 #include "kvaio.h"
 #include "kmilointerface.h"
 
-KMiloKVaio::KMiloKVaio(TQObject *parent, const char *name,
+KMiloKVaio::KMiloKVaio(TQObject *tqparent, const char *name,
 		       const TQStringList& args)
-    : Monitor(parent, name, args),
+    : Monitor(tqparent, name, args),
       m_kvaio(0)
 {
     _poll = false;
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h
index ffcc604..b351f58 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.h
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
    $Id$
@@ -35,9 +35,10 @@ class KVaio;
 
 class KMiloKVaio : public KMilo::Monitor {
 //	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KMiloKVaio(TQObject *parent, 
+		KMiloKVaio(TQObject *tqparent, 
 			   const char *name, const TQStringList&);
 		virtual ~KMiloKVaio();
 
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index 167ddcb..b19c8ef 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
    $Id$
@@ -55,12 +55,12 @@ extern "C" {
 }
 
 
-KVaio::KVaio(KMiloKVaio *parent, const char* name)
-    : TQObject(parent, name),
+KVaio::KVaio(KMiloKVaio *tqparent, const char* name)
+    : TQObject(tqparent, name),
       mDisp(0),
       mTimer (new TQTimer (this) )
 {
-    myparent = parent;
+    mytqparent = tqparent;
     
     mDriver = new KVaioDriverInterface(this);
 
@@ -163,7 +163,7 @@ void KVaio::slotVaioEvent(int event)
 	case SONYPI_EVENT_BACK_PRESSED:
 	    if (mShowPowerStatusOnBackButton)
 	    {
-		showBatteryStatus (true);
+		showBatterytqStatus (true);
 	    }
 	    break;
 	default:
@@ -176,7 +176,7 @@ void KVaio::slotVaioEvent(int event)
 
 bool KVaio::showTextMsg(const TQString& msg)
 {
-    return myparent->showTextMsg(msg);    
+    return mytqparent->showTextMsg(msg);    
 }
 
 
@@ -184,7 +184,7 @@ bool KVaio::showTextMsg(const TQString& msg)
 bool KVaio::showProgressMsg(const TQString& msg, int value)
 {
     m_progress = value;
-    return myparent->showProgressMsg(msg,value);
+    return mytqparent->showProgressMsg(msg,value);
 }
 
 void KVaio::blankScreen()
@@ -244,7 +244,7 @@ bool KVaio::isKScreensaverAvailable()
             // kdDebug() << "KVaio::showTextMsg: kded is registered at dcop server."
             //           << endl;
             objects = mClient.remoteObjects("kdesktop");
-            if(objects.contains("KScreensaverIface"))
+            if(objects.tqcontains("KScreensaverIface"))
             {
                 // kdDebug() << "KVaio::showTextMsg: kmilod is available at kded."
                 //           << endl;
@@ -278,7 +278,7 @@ bool KVaio::isKMiloDAvailable()
             // kdDebug() << "KVaio::showTextMsg: kded is registered at dcop server."
             //           << endl;
             objects = mClient.remoteObjects("kded");
-            if(objects.contains("kmilod"))
+            if(objects.tqcontains("kmilod"))
             {
                 // kdDebug() << "KVaio::showTextMsg: kmilod is available at kded."
                 //           << endl;
@@ -306,16 +306,16 @@ void KVaio::loadConfiguration(KConfig *k)
 
     mReportUnknownEvents =
 	k->readBoolEntry("Report_Unknown_Events", false);
-    mReportPowerStatus =
-	k->readBoolEntry("PeriodicallyReportPowerStatus", false);
+    mReportPowertqStatus =
+	k->readBoolEntry("PeriodicallyReportPowertqStatus", false);
     mShowPowerStatusOnBackButton =
 	k->readBoolEntry("PowerStatusOnBackButton", true);
 
     kdDebug() << "KVaio::loadConfiguration: " << endl
               << "       mReportUnknownEvents:      "
 	      << mReportUnknownEvents << endl
-	      << "       mReportPowerStatus:        "
-	      << mReportPowerStatus << endl
+	      << "       mReportPowertqStatus:        "
+	      << mReportPowertqStatus << endl
 	      << "mShowPowerStatusOnBackButton:     "
 	      << mShowPowerStatusOnBackButton << endl;
 }
@@ -327,31 +327,31 @@ const KVaioDriverInterface* KVaio::driver()
 
 void KVaio::slotTimeout ()
 {
-    showBatteryStatus ();
+    showBatterytqStatus ();
     mTimer->start (4000, true);
 }
 
-bool KVaio::showBatteryStatus ( bool force )
+bool KVaio::showBatterytqStatus ( 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 displayACStatus = false;
+    bool displayACtqStatus = false;
 
     TQString text, acMsg;
     TQTextStream stream(text, IO_WriteOnly);
 
     // -----
-    // only display on startup if mReportPowerStatus is true:
-    if (mReportPowerStatus==false || !force)
+    // only display on startup if mReportPowertqStatus is true:
+    if (mReportPowertqStatus==false || !force)
     {
         return true;
     }
 
     // query all necessary information:
-    (void) mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max,
+    (void) mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max,
                                  bat2Avail, bat2Remaining, bat2Max,
                                  acConnected);
 
@@ -364,7 +364,7 @@ bool KVaio::showBatteryStatus ( bool force )
 
     if (acConnectedCache != acConnected || force)
     {
-	displayACStatus = true;
+	displayACtqStatus = true;
 	acConnectedCache = acConnected;
     }
 
@@ -379,10 +379,10 @@ bool KVaio::showBatteryStatus ( bool force )
     }
 
     // ----- prepare text messages
-    if (displayACStatus || displayBatteryMsg)
+    if (displayACtqStatus || displayBatteryMsg)
     {
 
-	if (displayACStatus)
+	if (displayACtqStatus)
 	{
 	    acMsg = acConnected ? i18n ("AC Connected") : i18n ("AC Disconnected");
 	}
@@ -397,7 +397,7 @@ bool KVaio::showBatteryStatus ( bool force )
 	    case 3:
 	    case 2:
 	    case 1:
-		stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").arg(remaining);
+		stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").tqarg(remaining);
 		break;
 	    case 0:
 		stream << i18n("Alert: Battery is Empty!");
@@ -406,11 +406,11 @@ bool KVaio::showBatteryStatus ( bool force )
                 stream << i18n("No Battery Inserted.");
                 break;
 	    default:
-		stream << i18n("Remaining Battery Capacity: %1%").arg( remaining );
+		stream << i18n("Remaining Battery Capacity: %1%").tqarg( remaining );
 	};
 
 	// show a message if the battery status changed by more then 10% or on startup
-	if (displayACStatus)
+	if (displayACtqStatus)
 	{
 	    stream << endl << acMsg;
 	}
diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h
index fac0290..2e2d723 100644
--- a/kmilo/kmilo_kvaio/kvaio.h
+++ b/kmilo/kmilo_kvaio/kvaio.h
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
    $Id$
@@ -53,12 +53,13 @@ class KMiloKVaio;
  * @author Mirko Boehm <mirko@hackerbuero.org>
  * @version 0.2
  */
-class KVaio : public QObject
+class KVaio : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-//    KVaio(TQObject *parent = 0, const char *name =0);
-    KVaio(KMiloKVaio *parent = 0, const char *name =0);
+//    KVaio(TQObject *tqparent = 0, const char *name =0);
+    KVaio(KMiloKVaio *tqparent = 0, const char *name =0);
 
     virtual ~KVaio();
     const KVaioDriverInterface *driver();
@@ -73,7 +74,7 @@ protected:
     bool isKMiloDAvailable();
     bool showTextMsg(const TQString& msg);
     bool showProgressMsg(const TQString& msg, int progress);
-    bool showBatteryStatus ( bool force = false);
+    bool showBatterytqStatus ( bool force = false);
 protected slots:
     void slotVaioEvent(int);
     void slotTimeout();
@@ -90,7 +91,7 @@ private:
     bool retrieveVolume();
     void displayVolume();
 
-    KMiloKVaio *myparent;
+    KMiloKVaio *mytqparent;
 
     DCOPRef *kmixClient, *kmixWindow;
 
@@ -105,7 +106,7 @@ private:
     int  m_BrightnessStep;
 
     bool mReportUnknownEvents;
-    bool mReportPowerStatus;
+    bool mReportPowertqStatus;
     bool mShowPowerStatusOnBackButton;
     TQTimer *mTimer;
 };
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
index 20a7a72..873633d 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
@@ -9,7 +9,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
    $Id$
@@ -64,8 +64,8 @@ extern "C" {
 #define SONYPI_IOCGBLUE         _IOR('v', 8, __u8)
 #define SONYPI_IOCSBLUE         _IOW('v', 9, __u8)
 
-KVaioDriverInterface::KVaioDriverInterface(TQObject *parent)
-    : TQObject(parent),
+KVaioDriverInterface::KVaioDriverInterface(TQObject *tqparent)
+    : TQObject(tqparent),
       mFd(0),
       mNotifier(0)
 {
@@ -162,7 +162,7 @@ void KVaioDriverInterface::setBrightness(int value)
     }
 }
 
-bool KVaioDriverInterface::getBatteryStatus(
+bool KVaioDriverInterface::getBatterytqStatus(
     bool& bat1Avail, int& bat1Remaining, int& bat1Max,
     bool& bat2Avail, int& bat2Remaining, int& bat2Max,
     bool& acConnected)
@@ -181,7 +181,7 @@ bool KVaioDriverInterface::getBatteryStatus(
         bat2Avail = batFlags & SONYPI_BFLAGS_B2;
         acConnected = batFlags & SONYPI_BFLAGS_AC;
 
-//         kdDebug() << "KVaioDriverInterface::getBatteryStatus: battery 1:  "
+//         kdDebug() << "KVaioDriverInterface::getBatterytqStatus: battery 1:  "
 //                   << (bat1Avail ? "available" : "not available") << endl
 //                   << "                                        battery 2:  "
 //                   << (bat2Avail ? "available" : "not available") << endl
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
index 190caa1..6087b93 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
@@ -9,7 +9,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
    $Id$
@@ -31,18 +31,19 @@ extern "C"
 
 class TQSocketNotifier;
 
-class KVaioDriverInterface : public QObject
+class KVaioDriverInterface : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KVaioDriverInterface(TQObject *parent=0);
+    KVaioDriverInterface(TQObject *tqparent=0);
     bool connectToDriver(bool listen = true);
     void disconnectFromDriver();
     /** Return the current display brightness, a value between 0 and
         255. Returns -1 if the setting cannot be retrieved. */
     int brightness();
     /** Get the battery status. */
-    bool getBatteryStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max,
+    bool getBatterytqStatus(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 6667a88..f8275a8 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -41,8 +41,8 @@
 DefaultSkin::DefaultSkin() {
 	connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
 
-	_widget = new DefaultWidget(0, "Screen Indicator", Qt::WX11BypassWM);
-	_widget->setFocusPolicy(TQWidget::NoFocus);
+	_widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM);
+	_widget->setFocusPolicy(TQ_NoFocus);
 
 	KWin::setOnAllDesktops(_widget->winId(), true);
 	KWin::setState( _widget->winId(), NET::StaysOnTop | NET::Sticky
@@ -100,10 +100,10 @@ void DefaultSkin::show() {
 #if KDE_IS_VERSION(3,1,90)
 	TQRect r =  KGlobalSettings::splashScreenDesktopGeometry();
 #else
-	TQRect r = TQApplication::desktop()->geometry();
+	TQRect r = TQApplication::desktop()->tqgeometry();
 #endif
-	//	_label->resize(_label->minimumSizeHint());
-	//	_widget->resize(_label->minimumSizeHint());
+	//	_label->resize(_label->tqminimumSizeHint());
+	//	_widget->resize(_label->tqminimumSizeHint());
 	_widget->move(r.center() -
 			TQPoint(_widget->width()/2, _widget->height()/2));
 	_widget->show();
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 62bea16..82a3184 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -32,6 +32,7 @@ class DefaultWidget;
 
 class DefaultSkin : public TQObject, public KMilo::DisplaySkin {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		DefaultSkin();
 		virtual ~DefaultSkin();
diff --git a/kmilo/kmilod/defaultwidget.ui b/kmilo/kmilod/defaultwidget.ui
index 65c19d8..41ad25f 100644
--- a/kmilo/kmilod/defaultwidget.ui
+++ b/kmilo/kmilod/defaultwidget.ui
@@ -3,7 +3,7 @@
 <comment>Default widget for the default display for kmilod
 Released under the terms of the GNU GPL.</comment>
 <author>George Staikos &lt;staikos@kde.org</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DefaultWidget</cstring>
     </property>
@@ -11,11 +11,11 @@ Released under the terms of the GNU GPL.</comment>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QWidgetStack" row="0" column="0">
+        <widget class="TQWidgetStack" row="0" column="0">
             <property name="name">
                 <cstring>_widgetStack</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>page</cstring>
                 </property>
@@ -26,20 +26,20 @@ Released under the terms of the GNU GPL.</comment>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>_textOnly</cstring>
                         </property>
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>page</cstring>
                 </property>
@@ -50,18 +50,18 @@ Released under the terms of the GNU GPL.</comment>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>_progressText</cstring>
                         </property>
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
-                    <widget class="QProgressBar" row="0" column="1" colspan="2">
+                    <widget class="TQProgressBar" row="0" column="1" colspan="2">
                         <property name="name">
                             <cstring>_progress</cstring>
                         </property>
@@ -82,5 +82,5 @@ Released under the terms of the GNU GPL.</comment>
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="2" margin="2"/>
+<tqlayoutdefaults spacing="2" margin="2"/>
 </UI>
diff --git a/kmilo/kmilod/kmilod.h b/kmilo/kmilod/kmilod.h
index 6fdfb52..24f7fd8 100644
--- a/kmilo/kmilod/kmilod.h
+++ b/kmilo/kmilod/kmilod.h
@@ -36,6 +36,7 @@ class KMiloInterface;
 
 class KMiloD : public KDEDModule {
 	Q_OBJECT
+//	TQ_OBJECT
 	K_DCOP
 	public:
 		KMiloD(const TQCString &name);
diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h
index 16e1567..1b22ff0 100644
--- a/kmilo/kmilod/kmilointerface.h
+++ b/kmilo/kmilod/kmilointerface.h
@@ -32,6 +32,7 @@ namespace KMilo {
 // FIXME: make put the methods into .cpp file when the header is installed.
 class KMiloInterface : public TQObject {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		KMiloInterface(KMiloD *p) : TQObject() { _p = p; }
 		virtual ~KMiloInterface() {}
diff --git a/kmilo/kmilod/monitor.cpp b/kmilo/kmilod/monitor.cpp
index 84f0e03..955fccd 100644
--- a/kmilo/kmilod/monitor.cpp
+++ b/kmilo/kmilod/monitor.cpp
@@ -22,8 +22,8 @@
 
 #include "monitor.h"
 
-KMilo::Monitor::Monitor(TQObject *parent, const char *name, const TQStringList&)
-: TQObject(parent, name) {
+KMilo::Monitor::Monitor(TQObject *tqparent, const char *name, const TQStringList&)
+: TQObject(tqparent, name) {
 	_poll = true;
 }
 
@@ -38,7 +38,7 @@ KMilo::Monitor::DisplayType KMilo::Monitor::poll() { return None; }
 
 int KMilo::Monitor::progress() const { return 42; }
 
-TQString KMilo::Monitor::message() const { return TQString::null; }
+TQString KMilo::Monitor::message() const { return TQString(); }
 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 d50045b..7053752 100644
--- a/kmilo/kmilod/monitor.h
+++ b/kmilo/kmilod/monitor.h
@@ -37,7 +37,7 @@ class KMiloInterface;
 
 class KDE_EXPORT Monitor : public TQObject {
 	public:
-		Monitor(TQObject *parent, const char *name, const TQStringList&);
+		Monitor(TQObject *tqparent, const char *name, const TQStringList&);
 		virtual ~Monitor();
 
 		/**
diff --git a/kmilo/powerbook/pb_monitor.cpp b/kmilo/powerbook/pb_monitor.cpp
index 5b1fae2..516992e 100644
--- a/kmilo/powerbook/pb_monitor.cpp
+++ b/kmilo/powerbook/pb_monitor.cpp
@@ -33,8 +33,8 @@ extern "C" {
 
 namespace KMilo {
 
-PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name, const TQStringList& args)
-: Monitor(parent, name, args) {
+PowerBookMonitor::PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList& args)
+: Monitor(tqparent, name, args) {
 	_serverPort = -1;
 	_clientPort = -1;
 	_progress = 0;
diff --git a/kmilo/powerbook/pb_monitor.h b/kmilo/powerbook/pb_monitor.h
index 13b9885..b4e4c85 100644
--- a/kmilo/powerbook/pb_monitor.h
+++ b/kmilo/powerbook/pb_monitor.h
@@ -26,7 +26,7 @@
 
 class PowerBookMonitor : public KMilo::Monitor {
 	public:
-		PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&);
+		PowerBookMonitor(TQObject *tqparent, 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 340d38b..20ba17b 100644
--- a/kmilo/powerbook2/pb_monitor.cpp
+++ b/kmilo/powerbook2/pb_monitor.cpp
@@ -49,9 +49,9 @@ const TQString tpmodes[] = { I18N_NOOP("No Tap"), I18N_NOOP("Tap"), I18N_NOOP("D
 
 namespace KMilo {
 
-PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name,
+PowerBookMonitor::PowerBookMonitor(TQObject *tqparent, const char *name,
                                    const TQStringList& args)
-	: Monitor(parent, name, args),
+	: Monitor(tqparent, name, args),
 		m_progress( 0 )
 {
   	init_libpbb();
@@ -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 = TQString::null;
+	m_message = TQString();
 	while ( tag && tag->tag != TAG_END ) {
 		switch ( tag->tag ) {
 		case TAG_VOLUME:
@@ -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." ).arg( marg );
+				m_message = i18n( "Operating mode set to: %1." ).tqarg( marg );
 			}
 			break;
 		default:
diff --git a/kmilo/powerbook2/pb_monitor.h b/kmilo/powerbook2/pb_monitor.h
index e9dfb71..2adb4d8 100644
--- a/kmilo/powerbook2/pb_monitor.h
+++ b/kmilo/powerbook2/pb_monitor.h
@@ -34,7 +34,7 @@ namespace KMilo {
 class PowerBookMonitor : public KMilo::Monitor
 {
 public:
-	PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&);
+	PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList&);
 	virtual ~PowerBookMonitor();
 
 	virtual bool init();
diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
index 771b7bf..3a25893 100644
--- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
+++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KCMThinkpadGeneral</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KCMThinkpadGeneral</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>tlOff</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <string>Could not read /dev/nvram. If you have an IBM Thinkpad load the nvram Linux module &lt;em&gt;insmod nvram&lt;/em&gt; and create the node &lt;em&gt;mknod /dev/nvram c 10 144&lt;/em&gt; then make the device readable &lt;em&gt;chmod 664 /dev/nvram&lt;/em&gt; or writable &lt;em&gt;chmod 666 /dev/nvram&lt;/em&gt;.&lt;p&gt;  nvram must be writable for software volume control required for R30/R31 models and for using a custom volume change step.</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>bgGeneral</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>mCbRun</cstring>
                     </property>
@@ -52,7 +52,7 @@
                         <string>Run Thinkpad Buttons KMilo plugin</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>mCbSoftwareVolume</cstring>
                     </property>
@@ -60,15 +60,15 @@
                         <string>Change volume in software (required by R30/R31)</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="2" column="0">
+                <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>layout27</cstring>
+                        <cstring>tqlayout27</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="4" column="0">
+                        <widget class="TQLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>textLabel2_5</cstring>
                             </property>
@@ -76,7 +76,7 @@
                                 <string>Command for Mail button:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="5" column="0">
+                        <widget class="TQLabel" row="5" column="0">
                             <property name="name">
                                 <cstring>textLabel2_6</cstring>
                             </property>
@@ -97,7 +97,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>textLabel2_4</cstring>
                             </property>
@@ -118,7 +118,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>volumeStepLabel</cstring>
                             </property>
@@ -153,7 +153,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>textLabel2_3</cstring>
                             </property>
@@ -161,7 +161,7 @@
                                 <string>Command for Home button:</string>
                             </property>
                         </widget>
-                        <widget class="QSpinBox" row="0" column="1">
+                        <widget class="TQSpinBox" row="0" column="1">
                             <property name="name">
                                 <cstring>mSpinboxVolumeStep</cstring>
                             </property>
@@ -193,7 +193,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -284,14 +284,14 @@
 <includes>
     <include location="local" impldecl="in implementation">kcmthinkpad_general.ui.h</include>
 </includes>
-<signals>
+<Q_SIGNALS>
     <signal>changed();</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
     <slot>slotChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h
index 6ccc675..de8615e 100644
--- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h
+++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h
@@ -22,7 +22,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index b98dc28..ffb9e8b 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad"
 
 #define CONFIG_FILE "kmilodrc"
 
-KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&)
-	: KCModule(KCMThinkpadModuleFactory::instance(), parent, name) {
+KCMThinkpadModule::KCMThinkpadModule(TQWidget* tqparent, const char* name, const TQStringList&)
+	: KCModule(KCMThinkpadModuleFactory::instance(), tqparent, name) {
 	KAboutData* about =
 		new KAboutData(I18N_NOOP("kcmthinkpad"),
 			       I18N_NOOP("KDE Control Module for IBM Thinkpad "
@@ -68,10 +68,10 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T
 			 "jr@jriddell.org");
 	setAboutData( about );
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
 	m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this);
-	layout->addWidget( m_KCMThinkpadGeneral );
-	layout->addStretch();
+	tqlayout->addWidget( m_KCMThinkpadGeneral );
+	tqlayout->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>").arg(m_nvramFile));
+							  "/dev/nvram</em>").tqarg(m_nvramFile));
 #endif
 	} else {
 		m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration"));
@@ -175,7 +175,7 @@ void KCMThinkpadModule::load(bool useDefaults) {
 	m_KCMThinkpadGeneral->mSpinboxVolumeStep->setValue(config.readNumEntry("volumeStep", 14));
 	m_KCMThinkpadGeneral->commandExec->setURL(config.readEntry("buttonThinkpad", KDE_BINDIR "/konsole"));
 	m_KCMThinkpadGeneral->commandExecHome->setURL(config.readEntry("buttonHome", KDE_BINDIR "/konqueror"));
-	m_KCMThinkpadGeneral->commandExecSearch->setURL(config.readEntry("buttonSearch", KDE_BINDIR "/kfind"));
+	m_KCMThinkpadGeneral->commandExecSearch->setURL(config.readEntry("buttonSearch", KDE_BINDIR "/ktqfind"));
 	m_KCMThinkpadGeneral->commandExecMail->setURL(config.readEntry("buttonMail", KDE_BINDIR "/kmail"));
 	m_KCMThinkpadGeneral->commandExecZoom->setURL(config.readEntry("buttonZoom", KDE_BINDIR "/ksnapshot"));
 	m_nvramFile = config.readEntry("nvram", "/dev/nvram");
diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h
index 1fdedb5..5719185 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.h
+++ b/kmilo/thinkpad/kcmthinkpad/main.h
@@ -31,9 +31,10 @@ class KCMThinkPadGeneral;
 
 class KCMThinkpadModule : public KCModule {
 	Q_OBJECT
+  TQ_OBJECT
 
  public:
-	KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&);
+	KCMThinkpadModule(TQWidget* tqparent, const char* name, const TQStringList&);
 
 	void save();
 	void load();
diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp
index 034c6bd..593612d 100644
--- a/kmilo/thinkpad/thinkpad.cpp
+++ b/kmilo/thinkpad/thinkpad.cpp
@@ -43,7 +43,7 @@
 
 namespace KMilo {
 
-ThinkPadMonitor::ThinkPadMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args) {
+ThinkPadMonitor::ThinkPadMonitor(TQObject* tqparent, const char* name, const TQStringList& args): Monitor(tqparent, name, args) {
 	m_progress = 0;
 	m_volume = 50;  //set in retrieveVolume()
 }
@@ -445,7 +445,7 @@ void ThinkPadMonitor::reconfigure(KConfig* config) {
 	m_volumeStep = config->readNumEntry("volumeStep", defaultVolumeStep);
 	m_buttonThinkpad = config->readEntry("buttonThinkpad", "/usr/bin/konsole");
 	m_buttonHome = config->readEntry("buttonHome", "/usr/bin/konqueror");
-	m_buttonSearch = config->readEntry("buttonSearch", "/usr/bin/kfind");
+	m_buttonSearch = config->readEntry("buttonSearch", "/usr/bin/ktqfind");
 	m_buttonMail = config->readEntry("buttonMail", "/usr/bin/kmail");
 	m_buttonZoom = config->readEntry("buttonZoom", "/usr/bin/ksnapshot");
 }
diff --git a/kmilo/thinkpad/thinkpad.h b/kmilo/thinkpad/thinkpad.h
index dc843ca..e4cd952 100644
--- a/kmilo/thinkpad/thinkpad.h
+++ b/kmilo/thinkpad/thinkpad.h
@@ -83,7 +83,7 @@ typedef struct {
  */
 class ThinkPadMonitor : public Monitor {
 	public:
-		ThinkPadMonitor(TQObject *parent, const char *name, const TQStringList&);
+		ThinkPadMonitor(TQObject *tqparent, const char *name, const TQStringList&);
 		virtual ~ThinkPadMonitor();
 
 		/**