Rename old tq methods that no longer need a unique name

7 files changed, 25 insertions, 25 deletions

diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index c11e086c..7cdfee6e 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -100,14 +100,14 @@ namespace KCDDB
     bool
   CDDB::parseGreeting( const TQString & line )
   {
-    uint servertqStatus = statusCode( line );
+    uint serverStatus = statusCode( line );
 
-    if ( 200 == servertqStatus )
+    if ( 200 == serverStatus )
     {
       kdDebug(60010) << "Server response: read-only" << endl;
       readOnly_ = true;
     }
-    else if ( 201 == servertqStatus )
+    else if ( 201 == serverStatus )
     {
       kdDebug(60010) << "Server response: read-write" << endl;
     }
@@ -123,9 +123,9 @@ namespace KCDDB
     bool
   CDDB::parseHandshake( const TQString & line )
   {
-    uint servertqStatus = statusCode( line );
+    uint serverStatus = statusCode( line );
 
-    if ( ( 200 != servertqStatus ) && ( 402 != servertqStatus ) )
+    if ( ( 200 != serverStatus ) && ( 402 != serverStatus ) )
     {
       kdDebug(60010) << "Handshake was too tight. Letting go." << endl;
       return false;
@@ -141,9 +141,9 @@ namespace KCDDB
   {
     TQStringList tokenList = TQStringList::split( ' ', line );
 
-    uint servertqStatus = tokenList[ 0 ].toUInt();
+    uint serverStatus = tokenList[ 0 ].toUInt();
 
-    return servertqStatus;
+    return serverStatus;
   }
 
 /*    CDDB::Transport
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index a848ffb8..38daf164 100644
--- a/libkcddb/cddb.h
+++ b/libkcddb/cddb.h
@@ -66,8 +66,8 @@ namespace KCDDB
       static TQString resultToString(Result);
       static TQString trackOffsetListToId( const TrackOffsetList & );
 
-      static TQString clientName() { return TQString::tqfromLatin1("libkcddb"); }
-      static TQString clientVersion() { return TQString::tqfromLatin1("0.31"); }
+      static TQString clientName() { return TQString::fromLatin1("libkcddb"); }
+      static TQString clientVersion() { return TQString::fromLatin1("0.31"); }
 
     protected:
       bool parseGreeting( const TQString & );
diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui
index 17a97eb0..0e2e2f35 100644
--- a/libkcddb/cdinfodialogbase.ui
+++ b/libkcddb/cdinfodialogbase.ui
@@ -292,7 +292,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>231</width>
                             <height>41</height>
diff --git a/libkcddb/cdinfoencodingwidgetbase.ui b/libkcddb/cdinfoencodingwidgetbase.ui
index e60d91b3..5605785c 100644
--- a/libkcddb/cdinfoencodingwidgetbase.ui
+++ b/libkcddb/cdinfoencodingwidgetbase.ui
@@ -55,7 +55,7 @@
                     <property name="name">
                         <cstring>songsBox</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>250</height>
diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
index ecd8a587..d70a63db 100644
--- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
+++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
@@ -243,7 +243,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>41</width>
                                 <height>260</height>
@@ -286,7 +286,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>240</height>
@@ -314,7 +314,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>21</height>
@@ -331,7 +331,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>21</height>
@@ -367,7 +367,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>140</height>
@@ -517,7 +517,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>260</width>
                                         <height>20</height>
diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp
index 25c7599e..e353ece9 100644
--- a/libkcddb/lookup.cpp
+++ b/libkcddb/lookup.cpp
@@ -38,19 +38,19 @@ namespace KCDDB
     CDDB::Result
   Lookup::parseQuery(  const TQString & line )
   {
-    uint servertqStatus = statusCode(  line );
+    uint serverStatus = statusCode(  line );
 
-    if (  200 == servertqStatus )
+    if (  200 == serverStatus )
     {
       TQStringList tokenList = TQStringList::split(  ' ', line );
       matchList_.append(  tqMakePair(  tokenList[  1 ], tokenList[  2 ] ) );
       return Success;
     }
-    else if (  (  211 == servertqStatus ) || (  210 == servertqStatus ) )
+    else if (  (  211 == serverStatus ) || (  210 == serverStatus ) )
     {
       return MultipleRecordFound;
     }
-    else if (  202 == servertqStatus )
+    else if (  202 == serverStatus )
     {
       return NoRecordFound;
     }
@@ -68,9 +68,9 @@ namespace KCDDB
     CDDB::Result
   Lookup::parseRead(  const TQString & line )
   {
-    uint servertqStatus = statusCode(  line );
+    uint serverStatus = statusCode(  line );
 
-    if (   210 != servertqStatus )
+    if (   210 != serverStatus )
       return ServerError;
 
     return Success;
diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp
index 3f099c23..23f24f49 100644
--- a/libkcddb/submit.cpp
+++ b/libkcddb/submit.cpp
@@ -57,9 +57,9 @@ namespace KCDDB
     CDDB::Result
   Submit::parseWrite(  const TQString & line )
   {
-    uint servertqStatus = statusCode(  line );
+    uint serverStatus = statusCode(  line );
 
-    if (   320 != servertqStatus )
+    if (   320 != serverStatus )
       return ServerError;
 
     return Success;