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

4 files changed, 34 insertions, 33 deletions

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();