Rename old tq methods that no longer need a unique name

13 files changed, 28 insertions, 28 deletions

diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui
index cc317a9e..c0756c83 100644
--- a/kaudiocreator/cdconfig.ui
+++ b/kaudiocreator/cdconfig.ui
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kaudiocreator/encodefile.ui b/kaudiocreator/encodefile.ui
index ccbb6313..14836475 100644
--- a/kaudiocreator/encodefile.ui
+++ b/kaudiocreator/encodefile.ui
@@ -244,7 +244,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -283,7 +283,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui
index 67f256c0..6700df46 100644
--- a/kaudiocreator/encoderconfig.ui
+++ b/kaudiocreator/encoderconfig.ui
@@ -131,7 +131,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -188,7 +188,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/kaudiocreator/encoderedit.ui b/kaudiocreator/encoderedit.ui
index f5c3c072..1023611b 100644
--- a/kaudiocreator/encoderedit.ui
+++ b/kaudiocreator/encoderedit.ui
@@ -28,7 +28,7 @@
             <property name="name">
                 <cstring>kcfg_encoderName</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>320</width>
                     <height>0</height>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kaudiocreator/encoderoutput.ui b/kaudiocreator/encoderoutput.ui
index 94779b68..8851d0f4 100644
--- a/kaudiocreator/encoderoutput.ui
+++ b/kaudiocreator/encoderoutput.ui
@@ -63,7 +63,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui
index 765cbb1c..609d81bb 100644
--- a/kaudiocreator/general.ui
+++ b/kaudiocreator/general.ui
@@ -240,7 +240,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kaudiocreator/infodialog.ui b/kaudiocreator/infodialog.ui
index 1add6372..e68e3ffe 100644
--- a/kaudiocreator/infodialog.ui
+++ b/kaudiocreator/infodialog.ui
@@ -205,7 +205,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>100</height>
diff --git a/kaudiocreator/jobque.ui b/kaudiocreator/jobque.ui
index 3c76a257..b2014c29 100644
--- a/kaudiocreator/jobque.ui
+++ b/kaudiocreator/jobque.ui
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index 91c0de17..b0a6d87f 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -92,7 +92,7 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
                                 TQT_SLOT( startSession() ), actionCollection(), "rip_selected" );
     rip->setEnabled( false );
 
-    connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this),    TQT_SLOT( updatetqStatus() ) );
+    connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this),    TQT_SLOT( updateStatus() ) );
     connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(ripper), TQT_SLOT( removeJob(int) ) );
     connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(encoder), TQT_SLOT( removeJob(int)) );
 
@@ -100,11 +100,11 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
     connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), TQT_TQOBJECT(jobQue),  TQT_SLOT( addJob(Job*, const TQString &)) );
     connect( ripper, TQT_SIGNAL( eject(const TQString &) )       , TQT_TQOBJECT(tracks),  TQT_SLOT( ejectDevice(const TQString &)) );
     connect( ripper, TQT_SIGNAL( encodeWav(Job *) )             , TQT_TQOBJECT(encoder), TQT_SLOT( encodeWav(Job *)) );
-    connect( ripper, TQT_SIGNAL( jobsChanged() )                , TQT_TQOBJECT(this),    TQT_SLOT( updatetqStatus() ) );   
+    connect( ripper, TQT_SIGNAL( jobsChanged() )                , TQT_TQOBJECT(this),    TQT_SLOT( updateStatus() ) );   
 
     connect( encoder, TQT_SIGNAL( updateProgress(int, int) )   , TQT_TQOBJECT(jobQue),  TQT_SLOT( updateProgress(int,int)) );
     connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), TQT_TQOBJECT(jobQue),  TQT_SLOT( addJob(Job*, const TQString &)) );
-    connect( encoder, TQT_SIGNAL( jobsChanged() )              , TQT_TQOBJECT(this),    TQT_SLOT( updatetqStatus() ) );
+    connect( encoder, TQT_SIGNAL( jobsChanged() )              , TQT_TQOBJECT(this),    TQT_SLOT( updateStatus() ) );
 
     connect( tracks, TQT_SIGNAL( hasCD(bool) )    , TQT_TQOBJECT(this),          TQT_SLOT( hasCD(bool) ) );
     connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), TQT_TQOBJECT(ripper),       TQT_SLOT( ripTrack(Job *)) );
@@ -170,28 +170,28 @@ void KAudioCreator::hasCD(bool cd){
         statusBar()->changeItem(i18n("No Audio CD detected"), 0 );
 }
 
-void KAudioCreator::updatetqStatus() {
+void KAudioCreator::updateStatus() {
     TQString status = i18n("Idle.");
-    TQString rippingtqStatus;
-    TQString encodingtqStatus;
+    TQString rippingStatus;
+    TQString encodingStatus;
     int activeRippingJobs = ripper->activeJobCount();
     int pendingRippingJobs = ripper->pendingJobCount();
     int activeEncodingJobs = encoder->activeJobCount();
     int pendingEncodingJobs = encoder->pendingJobCount();
 
     if ( activeRippingJobs ) {
-        rippingtqStatus = i18n("Ripping (%1 active, %2 queued)").tqarg( activeRippingJobs ).tqarg( pendingRippingJobs );
-        status = rippingtqStatus;
+        rippingStatus = i18n("Ripping (%1 active, %2 queued)").tqarg( activeRippingJobs ).tqarg( pendingRippingJobs );
+        status = rippingStatus;
     }
     if ( activeEncodingJobs ) {
-        encodingtqStatus = i18n("Encoding (%1 active, %2 queued)").tqarg( activeEncodingJobs ).tqarg( pendingEncodingJobs );
+        encodingStatus = i18n("Encoding (%1 active, %2 queued)").tqarg( activeEncodingJobs ).tqarg( pendingEncodingJobs );
 
         if ( activeRippingJobs ) {
             status.append(" : ");
-            status.append( encodingtqStatus );
+            status.append( encodingStatus );
         }
         else {
-            status = encodingtqStatus;
+            status = encodingStatus;
         }
     }
 
diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h
index 5e901d77..64bca008 100644
--- a/kaudiocreator/kaudiocreator.h
+++ b/kaudiocreator/kaudiocreator.h
@@ -47,7 +47,7 @@ protected:
 
 private slots:
   void showSettings();
-  void updatetqStatus();
+  void updateStatus();
 
   void hasCD(bool);
   void configureNotifications();
diff --git a/kaudiocreator/ripconfig.ui b/kaudiocreator/ripconfig.ui
index 8c47615b..7d655de1 100644
--- a/kaudiocreator/ripconfig.ui
+++ b/kaudiocreator/ripconfig.ui
@@ -151,7 +151,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>280</height>
diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui
index 8b7e5a5e..fc15059e 100644
--- a/kaudiocreator/tracks.ui
+++ b/kaudiocreator/tracks.ui
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -200,7 +200,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>246</width>
                             <height>20</height>
diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui
index f289cb2d..0f6c65be 100644
--- a/kaudiocreator/wizard.ui
+++ b/kaudiocreator/wizard.ui
@@ -65,7 +65,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -251,7 +251,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>