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

3 files changed, 37 insertions, 35 deletions

diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index a5f3937..36cc998 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -39,15 +39,15 @@
 
 class KTimerJobItem : public TQListViewItem {
 public:
-    KTimerJobItem( KTimerJob *job, TQListView *parent )
-        : TQListViewItem( parent ) {
+    KTimerJobItem( KTimerJob *job, TQListView *tqparent )
+        : TQListViewItem( tqparent ) {
         m_job = job;
         m_error = false;
         update();
     };
 
-    KTimerJobItem( KTimerJob *job, TQListView *parent, TQListViewItem *after )
-        : TQListViewItem( parent, after ) {
+    KTimerJobItem( KTimerJob *job, TQListView *tqparent, TQListViewItem *after )
+        : TQListViewItem( tqparent, after ) {
         m_job = job;
         m_error = false;
         update();
@@ -59,7 +59,7 @@ public:
 
     KTimerJob *job() { return m_job; };
 
-    void setStatus( bool error ) {
+    void settqStatus( bool error ) {
         m_error = error;
         update();
     }
@@ -97,8 +97,8 @@ struct KTimerPrefPrivate
     TQPtrList<KTimerJob> jobs;
 };
 
-KTimerPref::KTimerPref( TQWidget *parent, const char *name )
-    : PrefWidget( parent, name )
+KTimerPref::KTimerPref( TQWidget *tqparent, const char *name )
+    : PrefWidget( tqparent, name )
 {
     d = new KTimerPrefPrivate;
 
@@ -150,7 +150,7 @@ void KTimerPref::add()
 
     job->setUser( item );
 
-    // Qt drops currentChanged signals on first item (bug?)
+    // TQt drops currentChanged signals on first item (bug?)
     if( m_list->childCount()==1 )
       currentChanged( item );
 
@@ -239,7 +239,7 @@ void KTimerPref::jobChanged( KTimerJob *job )
 void KTimerPref::jobFinished( KTimerJob *job, bool error )
 {
     KTimerJobItem *item = static_cast<KTimerJobItem*>(job->user());
-    item->setStatus( error );
+    item->settqStatus( error );
     m_list->triggerUpdate();
 }
 
@@ -249,7 +249,7 @@ void KTimerPref::saveJobs( KConfig *cfg )
     int num = 0;
     KTimerJobItem *item = static_cast<KTimerJobItem*>(m_list->firstChild());
     while( item ) {
-        item->job()->save( cfg, TQString("Job%1").arg( num ) );
+        item->job()->save( cfg, TQString("Job%1").tqarg( num ) );
         item = static_cast<KTimerJobItem*>(item->nextSibling());
         num++;
     }
@@ -280,7 +280,7 @@ void KTimerPref::loadJobs( KConfig *cfg )
             connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)),
                      TQT_SLOT(jobFinished(KTimerJob*,bool)) );
 
-            job->load( cfg, TQString( "Job%1" ).arg(n) );
+            job->load( cfg, TQString( "Job%1" ).tqarg(n) );
 
             job->setUser( item );
     }
@@ -306,8 +306,8 @@ struct KTimerJobPrivate {
 };
 
 
-KTimerJob::KTimerJob( TQObject *parent, const char *name )
-    : TQObject( parent, name )
+KTimerJob::KTimerJob( TQObject *tqparent, const char *name )
+    : TQObject( tqparent, name )
 {
     d = new KTimerJobPrivate;
 
diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h
index 297eec9..f1a2c69 100644
--- a/ktimer/ktimer.h
+++ b/ktimer/ktimer.h
@@ -29,9 +29,10 @@
 
 class KTimerJob : public TQObject {
  Q_OBJECT
+  TQ_OBJECT
 
  public:
-    KTimerJob( TQObject *parent=0, const char *name=0 );
+    KTimerJob( TQObject *tqparent=0, const char *name=0 );
     virtual ~KTimerJob();
 
     enum States { Stopped, Paused, Started };
@@ -90,8 +91,9 @@ class KTimerJob : public TQObject {
 class KTimerPref : public PrefWidget
 {
     Q_OBJECT
+  TQ_OBJECT
  public:
-    KTimerPref( TQWidget *parent=0, const char *name = 0 );
+    KTimerPref( TQWidget *tqparent=0, const char *name = 0 );
     virtual ~KTimerPref();
 
  protected slots:
diff --git a/ktimer/prefwidget.ui b/ktimer/prefwidget.ui
index 15cee2b..1c938e0 100644
--- a/ktimer/prefwidget.ui
+++ b/ktimer/prefwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>PrefWidget</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PrefWidget</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0" rowspan="3" colspan="1">
+        <widget class="TQListView" row="0" column="0" rowspan="3" colspan="1">
             <column>
                 <property name="text">
                     <string>Counter [s]</string>
@@ -77,7 +77,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>m_add</cstring>
             </property>
@@ -85,7 +85,7 @@
                 <string>&amp;New</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>m_remove</cstring>
             </property>
@@ -106,14 +106,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="4" column="0">
+        <widget class="TQGroupBox" row="4" column="0">
             <property name="name">
                 <cstring>m_settings</cstring>
             </property>
@@ -133,7 +133,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="4">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>m_loop</cstring>
                     </property>
@@ -141,7 +141,7 @@
                         <string>&amp;Loop</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -149,7 +149,7 @@
                         <string>Delay:</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="1" column="1" rowspan="1" colspan="2">
+                <widget class="TQSpinBox" row="1" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>m_delay</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <number>99999</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="4">
+                <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>m_one</cstring>
                     </property>
@@ -165,7 +165,7 @@
                         <string>Start only &amp;one instance</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="3">
+                <widget class="TQLabel" row="1" column="3">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -183,7 +183,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -195,7 +195,7 @@
                         <cstring>m_commandLine</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -205,7 +205,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="4" column="1">
+        <widget class="TQGroupBox" row="4" column="1">
             <property name="name">
                 <cstring>m_state</cstring>
             </property>
@@ -225,7 +225,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QSlider" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQSlider" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>m_slider</cstring>
                     </property>
@@ -233,12 +233,12 @@
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
-                <widget class="QLCDNumber" row="1" column="0" rowspan="1" colspan="3">
+                <widget class="TQLCDNumber" row="1" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>m_counter</cstring>
                     </property>
                 </widget>
-                <widget class="QToolButton" row="0" column="1">
+                <widget class="TQToolButton" row="0" column="1">
                     <property name="name">
                         <cstring>m_pause</cstring>
                     </property>
@@ -246,7 +246,7 @@
                         <string>||</string>
                     </property>
                 </widget>
-                <widget class="QToolButton" row="0" column="2">
+                <widget class="TQToolButton" row="0" column="2">
                     <property name="name">
                         <cstring>m_start</cstring>
                     </property>
@@ -254,7 +254,7 @@
                         <string>&gt;</string>
                     </property>
                 </widget>
-                <widget class="QToolButton" row="0" column="0">
+                <widget class="TQToolButton" row="0" column="0">
                     <property name="name">
                         <cstring>m_stop</cstring>
                     </property>
@@ -269,7 +269,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>