TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

38 files changed, 212 insertions, 199 deletions

diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp
index d2584adf..d51ef386 100644
--- a/libkcddb/asynccddbplookup.cpp
+++ b/libkcddb/asynccddbplookup.cpp
@@ -224,7 +224,7 @@ namespace KCDDB
     }
   }
     
-    QString
+    TQString
   AsyncCDDBPLookup::readLine()
   {
     return TQString::fromUtf8(socket_->readLine());
@@ -294,7 +294,7 @@ namespace KCDDB
     sendQuit();
   }
 
-    QString
+    TQString
   AsyncCDDBPLookup::stateToString() const
   {
     switch (state_)
diff --git a/libkcddb/asynccddbplookup.h b/libkcddb/asynccddbplookup.h
index 17b72f48..dc578e64 100644
--- a/libkcddb/asynccddbplookup.h
+++ b/libkcddb/asynccddbplookup.h
@@ -30,6 +30,7 @@ namespace KCDDB
   class AsyncCDDBPLookup : public CDDBPLookup 
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
diff --git a/libkcddb/asynchttplookup.h b/libkcddb/asynchttplookup.h
index 80926211..897b4791 100644
--- a/libkcddb/asynchttplookup.h
+++ b/libkcddb/asynchttplookup.h
@@ -29,6 +29,7 @@ namespace KCDDB
   {
 
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
diff --git a/libkcddb/asynchttpsubmit.h b/libkcddb/asynchttpsubmit.h
index 89ab8313..fcb8ec35 100644
--- a/libkcddb/asynchttpsubmit.h
+++ b/libkcddb/asynchttpsubmit.h
@@ -26,6 +26,7 @@ namespace KCDDB
   class AsyncHTTPSubmit : public HTTPSubmit
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
       AsyncHTTPSubmit(const TQString& from, const TQString& hostname, uint port);
       virtual ~AsyncHTTPSubmit();
diff --git a/libkcddb/asyncsmtpsubmit.h b/libkcddb/asyncsmtpsubmit.h
index 9bcf84eb..24d10439 100644
--- a/libkcddb/asyncsmtpsubmit.h
+++ b/libkcddb/asyncsmtpsubmit.h
@@ -27,6 +27,7 @@ namespace KCDDB
   class AsyncSMTPSubmit : public SMTPSubmit
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       AsyncSMTPSubmit(const TQString& hostname, uint port, const TQString& username,
diff --git a/libkcddb/cache.cpp b/libkcddb/cache.cpp
index 01c5dec0..127fc6ba 100644
--- a/libkcddb/cache.cpp
+++ b/libkcddb/cache.cpp
@@ -30,7 +30,7 @@
 
 namespace KCDDB
 {
-    QString
+    TQString
   Cache::fileName( const TQString &category, const TQString &discid, const TQString &cacheDir )
   {
     TQDir dir( cacheDir );
diff --git a/libkcddb/categories.cpp b/libkcddb/categories.cpp
index 5b86a5f5..97ec6acf 100644
--- a/libkcddb/categories.cpp
+++ b/libkcddb/categories.cpp
@@ -25,7 +25,7 @@ KCDDB::Categories::Categories()
 
 const TQString KCDDB::Categories::cddb2i18n(const TQString &category) const
 {
-    int index = m_cddb.findIndex(category.stripWhiteSpace());
+    int index = m_cddb.tqfindIndex(category.stripWhiteSpace());
     if (index != -1)
     {
         return m_i18n[index];
@@ -38,7 +38,7 @@ const TQString KCDDB::Categories::cddb2i18n(const TQString &category) const
 
 const TQString KCDDB::Categories::i18n2cddb(const TQString &category) const
 {
-    int index = m_i18n.findIndex(category.stripWhiteSpace());
+    int index = m_i18n.tqfindIndex(category.stripWhiteSpace());
     if (index != -1)
     {
         return m_cddb[index];
diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index f0ee84e0..c11e086c 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -43,12 +43,12 @@ namespace KCDDB
     // Empty.
   }
 
-    QString
+    TQString
   CDDB::trackOffsetListToId()
   {
     return trackOffsetListToId( trackOffsetList_ );
   }
-    QString
+    TQString
   CDDB::trackOffsetListToId( const TrackOffsetList & list )
   {
     // Taken from version by Michael Matz in kio_audiocd.
@@ -74,7 +74,7 @@ namespace KCDDB
     return TQString::number( id, 16 ).rightJustify( 8, '0' );
   }
 
-    QString
+    TQString
   CDDB::trackOffsetListToString()
   {
     TQString ret;
@@ -100,14 +100,14 @@ namespace KCDDB
     bool
   CDDB::parseGreeting( const TQString & line )
   {
-    uint serverStatus = statusCode( line );
+    uint servertqStatus = statusCode( line );
 
-    if ( 200 == serverStatus )
+    if ( 200 == servertqStatus )
     {
       kdDebug(60010) << "Server response: read-only" << endl;
       readOnly_ = true;
     }
-    else if ( 201 == serverStatus )
+    else if ( 201 == servertqStatus )
     {
       kdDebug(60010) << "Server response: read-write" << endl;
     }
@@ -123,9 +123,9 @@ namespace KCDDB
     bool
   CDDB::parseHandshake( const TQString & line )
   {
-    uint serverStatus = statusCode( line );
+    uint servertqStatus = statusCode( line );
 
-    if ( ( 200 != serverStatus ) && ( 402 != serverStatus ) )
+    if ( ( 200 != servertqStatus ) && ( 402 != servertqStatus ) )
     {
       kdDebug(60010) << "Handshake was too tight. Letting go." << endl;
       return false;
@@ -141,9 +141,9 @@ namespace KCDDB
   {
     TQStringList tokenList = TQStringList::split( ' ', line );
 
-    uint serverStatus = tokenList[ 0 ].toUInt();
+    uint servertqStatus = tokenList[ 0 ].toUInt();
 
-    return serverStatus;
+    return servertqStatus;
   }
 
 /*    CDDB::Transport
@@ -157,7 +157,7 @@ namespace KCDDB
       return SMTP;
   }*/
 
-    QString
+    TQString
   CDDB::resultToString(Result r)
   {
     switch (r)
@@ -200,7 +200,7 @@ namespace KCDDB
     }
   }
 
-/*    QString
+/*    TQString
   CDDB::transportToString(uint t)
   {
     switch (Transport(t))
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index 04d754c0..d82ea599 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::fromLatin1("libkcddb"); }
-      static TQString clientVersion() { return TQString::fromLatin1("0.31"); }
+      static TQString clientName() { return TQString::tqfromLatin1("libkcddb"); }
+      static TQString clientVersion() { return TQString::tqfromLatin1("0.31"); }
 
     protected:
       bool parseGreeting( const TQString & );
diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp
index cd287b99..db62cbae 100644
--- a/libkcddb/cddbplookup.cpp
+++ b/libkcddb/cddbplookup.cpp
@@ -40,10 +40,10 @@ namespace KCDDB
   CDDBPLookup::sendHandshake()
   {
     TQString handshake = TQString( "cddb hello %1 %2 %3 %4" )
-        .arg( user_ )
-        .arg( localHostName_ )
-        .arg( clientName() )
-        .arg( clientVersion() );
+        .tqarg( user_ )
+        .tqarg( localHostName_ )
+        .tqarg( clientName() )
+        .tqarg( clientVersion() );
 
     writeLine( handshake );
   }
@@ -58,8 +58,8 @@ namespace KCDDB
   CDDBPLookup::sendQuery()
   {
     TQString query = TQString( "cddb query %1 %2" )
-        .arg( trackOffsetListToId() )
-        .arg( trackOffsetListToString() );
+        .tqarg( trackOffsetListToId() )
+        .tqarg( trackOffsetListToString() );
 
     writeLine( query );
   }
@@ -71,8 +71,8 @@ namespace KCDDB
     TQString discid    = match.second;
 
     TQString readRequest = TQString( "cddb read %1 %2" )
-        .arg( category_ )
-        .arg( discid );
+        .tqarg( category_ )
+        .tqarg( discid );
 
     writeLine( readRequest );
   }
@@ -93,7 +93,7 @@ namespace KCDDB
     }
   }
 
-    Q_LONG
+    TQ_LONG
   CDDBPLookup::writeLine( const TQString & line )
   {
     if ( !isConnected() )
diff --git a/libkcddb/cddbplookup.h b/libkcddb/cddbplookup.h
index c7983cde..de20e532 100644
--- a/libkcddb/cddbplookup.h
+++ b/libkcddb/cddbplookup.h
@@ -42,7 +42,7 @@ namespace KCDDB
 
       void close();
     protected:
-      Q_LONG writeLine( const TQString & );
+      TQ_LONG writeLine( const TQString & );
 
       bool isConnected()
         { return KNetwork::KClientSocketBase::Connected == socket_->state(); }
diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp
index bf69f853..eee89d87 100644
--- a/libkcddb/cdinfo.cpp
+++ b/libkcddb/cdinfo.cpp
@@ -177,7 +177,7 @@ namespace KCDDB
       }
     }
 
-    int slashPos = dtitle.find('/');
+    int slashPos = dtitle.tqfind('/');
 
     if (-1 == slashPos)
     {
@@ -198,7 +198,7 @@ namespace KCDDB
     return true;
   }
 
-    QString
+    TQString
   CDInfo::toString(bool submit) const
   {
     TQString s;
@@ -209,18 +209,18 @@ namespace KCDDB
     if (submit)
     {
       s += "#\n";
-      s += TQString("# Submitted via: %1 %2\n").arg(CDDB::clientName(),
+      s += TQString("# Submitted via: %1 %2\n").tqarg(CDDB::clientName(),
         CDDB::clientVersion());
     }
 
     s += "DISCID=" + escape( id ) + "\n";
     s += createLine("DTITLE",escape( artist ) + " / " + escape( title ));
-    s += "DYEAR=" + (0 == year ? TQString::null : TQString::number(year)) + "\n";
+    s += "DYEAR=" + (0 == year ? TQString() : TQString::number(year)) + "\n";
     s += createLine("DGENRE",escape( genre ));
 
     for (uint i = 0; i < trackInfoList.count(); ++i)
     {
-      s += createLine(TQString("TTITLE%1").arg(i), 
+      s += createLine(TQString("TTITLE%1").tqarg(i), 
                 escape( trackInfoList[ i ].title));
     }
 
@@ -228,7 +228,7 @@ namespace KCDDB
 
     for (uint i = 0; i < trackInfoList.count(); ++i)
     {
-      s += createLine(TQString("EXTT%1").arg(i), escape(trackInfoList[i].extt));
+      s += createLine(TQString("EXTT%1").tqarg(i), escape(trackInfoList[i].extt));
     }
 
     s +="PLAYORDER=\n";
@@ -238,7 +238,7 @@ namespace KCDDB
 
   // Creates a line in the form NAME=VALUE, and splits it into several
   // lines if the line gets longer than 256 chars
-    QString
+    TQString
   CDInfo::createLine(const TQString& name, const TQString& value) const
   {
     Q_ASSERT(name.length() < 254);
@@ -251,11 +251,11 @@ namespace KCDDB
 
     while (tmpValue.length() > maxLength)
     {
-      lines += TQString("%1=%2\n").arg(name,tmpValue.left(maxLength));
+      lines += TQString("%1=%2\n").tqarg(name,tmpValue.left(maxLength));
       tmpValue = tmpValue.mid(maxLength);
     }
 
-    lines += TQString("%1=%2\n").arg(name,tmpValue);
+    lines += TQString("%1=%2\n").tqarg(name,tmpValue);
 
     return lines;
   }
@@ -270,25 +270,25 @@ namespace KCDDB
     }
   }
 
-    QString
+    TQString
   CDInfo::escape( const TQString& value )
   {
     TQString s = value;
-    s.replace( "\\", "\\\\" );
-    s.replace( "\n", "\\n" );
-    s.replace( "\t", "\\t" );
+    s.tqreplace( "\\", "\\\\" );
+    s.tqreplace( "\n", "\\n" );
+    s.tqreplace( "\t", "\\t" );
 
     return s;
   }
 
-    QString
+    TQString
   CDInfo::unescape( const TQString& value )
   {
     TQString s = value;
 
-    s.replace( "\\n", "\n" );
-    s.replace( "\\t", "\t" );
-    s.replace( "\\\\", "\\" );
+    s.tqreplace( "\\n", "\n" );
+    s.tqreplace( "\\t", "\t" );
+    s.tqreplace( "\\\\", "\\" );
 
     return s;
   }
@@ -296,7 +296,7 @@ namespace KCDDB
     void
   CDInfo::clear()
   {
-    id = artist = title = genre = extd = TQString::null;
+    id = artist = title = genre = extd = TQString();
     length = year = revision = 0;
     trackInfoList.clear();
   }
diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui
index 76ee8141..dcebf8fb 100644
--- a/libkcddb/cdinfodialogbase.ui
+++ b/libkcddb/cdinfodialogbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CDInfoDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CDInfoDialogBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,15 +16,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="5" column="2">
+                <widget class="TQLabel" row="5" column="2">
                     <property name="name">
                         <cstring>lb_revision</cstring>
                     </property>
@@ -40,7 +40,7 @@
                         <string>Use the name of the artist if there is no title.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>lb_category</cstring>
                     </property>
@@ -51,7 +51,7 @@
                         <cstring>m_category</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="1">
+                <widget class="TQLabel" row="5" column="1">
                     <property name="name">
                         <cstring>m_id</cstring>
                     </property>
@@ -67,7 +67,7 @@
                         <string>Write names as "first last", not "last, first". Omit any leading "The".  Use "Various" for compilations.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>lb_artist</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <cstring>m_artist</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>lb_year</cstring>
                     </property>
@@ -89,7 +89,7 @@
                         <cstring>m_year</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="2">
+                <widget class="TQLabel" row="4" column="2">
                     <property name="name">
                         <cstring>lb_genre</cstring>
                     </property>
@@ -122,7 +122,7 @@
                         <number>0</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>m_multiple</cstring>
                     </property>
@@ -138,7 +138,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>lb_comment</cstring>
                     </property>
@@ -149,7 +149,7 @@
                         <cstring>le_discInfo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>lb_title</cstring>
                     </property>
@@ -174,7 +174,7 @@
                         <string>Avoid custom values, as they will be written to CDDB as-is.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="0">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
                         <cstring>lb_id</cstring>
                     </property>
@@ -182,7 +182,7 @@
                         <string>Disc Id:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="2">
+                <widget class="TQLabel" row="3" column="2">
                     <property name="name">
                         <cstring>lb_length</cstring>
                     </property>
@@ -190,12 +190,12 @@
                         <string>Length:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="3">
+                <widget class="TQLabel" row="5" column="3">
                     <property name="name">
                         <cstring>m_revision</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="3">
+                <widget class="TQLabel" row="3" column="3">
                     <property name="name">
                         <cstring>m_length</cstring>
                     </property>
@@ -274,9 +274,9 @@
                 <string>For a CD-Extra, set title to "Data".</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -292,14 +292,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>231</width>
                             <height>41</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>m_changeEncoding</cstring>
                     </property>
@@ -309,7 +309,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>lb_playingOrder</cstring>
             </property>
@@ -329,27 +329,27 @@
 <connections>
     <connection>
         <sender>m_trackList</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>CDInfoDialogBase</receiver>
-        <slot>slotTrackSelected(QListViewItem*)</slot>
+        <slot>slotTrackSelected(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>m_trackList</sender>
-        <signal>doubleClicked(QListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>doubleClicked(TQListViewItem*,const TQPoint&amp;,int)</signal>
         <receiver>CDInfoDialogBase</receiver>
-        <slot>slotTrackDoubleClicked(QListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>slotTrackDoubleClicked(TQListViewItem*,const TQPoint&amp;,int)</slot>
     </connection>
     <connection>
         <sender>m_artist</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>CDInfoDialogBase</receiver>
-        <slot>artistChanged(const QString&amp;)</slot>
+        <slot>artistChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>m_genre</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>CDInfoDialogBase</receiver>
-        <slot>genreChanged(const QString&amp;)</slot>
+        <slot>genreChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>m_multiple</sender>
@@ -376,7 +376,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">qdatetime.h</include>
+    <include location="local" impldecl="in implementation">tqdatetime.h</include>
     <include location="local" impldecl="in declaration">libkcddb/cdinfo.h</include>
     <include location="local" impldecl="in declaration">libkcddb/cddb.h</include>
     <include location="local" impldecl="in declaration">libkcddb/categories.h</include>
@@ -397,29 +397,29 @@
     <variable access="public">static const unsigned TRACK_TITLE = 2;</variable>
     <variable access="public">static const unsigned TRACK_COMMENT = 3;</variable>
 </variables>
-<signals>
+<Q_SIGNALS>
     <signal>play(int i)</signal>
     <signal>discInfoClicked()</signal>
     <signal>trackInfoClicked(unsigned)</signal>
-</signals>
-<slots>
-    <slot access="protected">slotTrackSelected( QListViewItem * item )</slot>
+</Q_SIGNALS>
+<Q_SLOTS>
+    <slot access="protected">slotTrackSelected( TQListViewItem * item )</slot>
     <slot access="protected">slotNextTrack()</slot>
-    <slot access="protected">slotTrackDoubleClicked( QListViewItem * item, const QPoint &amp;, int column )</slot>
+    <slot access="protected">slotTrackDoubleClicked( TQListViewItem * item, const TQPoint &amp;, int column )</slot>
     <slot>setInfo( const KCDDB::CDInfo &amp; info, KCDDB::TrackOffsetList &amp; trackStartFrames )</slot>
-    <slot>artistChanged( const QString &amp; newArtist )</slot>
-    <slot>genreChanged( const QString &amp; newGenre )</slot>
+    <slot>artistChanged( const TQString &amp; newArtist )</slot>
+    <slot>genreChanged( const TQString &amp; newGenre )</slot>
     <slot>slotMultipleArtists( bool hasMultipleArtist )</slot>
     <slot access="private">slotChangeEncoding()</slot>
-</slots>
+</Q_SLOTS>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
     <function access="private" specifier="non virtual">destroy()</function>
-    <function returnType="QString">framesTime( unsigned frames )</function>
+    <function returnType="TQString">framesTime( unsigned frames )</function>
     <function returnType="KCDDB::CDInfo">info() const</function>
 </functions>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h
index e33ad487..35447aaa 100644
--- a/libkcddb/cdinfodialogbase.ui.h
+++ b/libkcddb/cdinfodialogbase.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.
 *****************************************************************************/
@@ -83,7 +83,7 @@ void CDInfoDialogBase::setInfo( const KCDDB::CDInfo &info, KCDDB::TrackOffsetLis
         item->setText(TRACK_NUMBER, TQString().sprintf("%02d", i + 1));
         item->setText(TRACK_TIME, framesTime(trackStartFrames[i + ((i + 1 < tracks) ? 1 : 2)] - trackStartFrames[i]));
         TQString title = info.trackInfoList[i].title;
-        int separator = title.find(SEPARATOR);
+        int separator = title.tqfind(SEPARATOR);
         if (info.artist != "Various" || separator == -1 || !m_multiple->isChecked() )
         {
             item->setText(TRACK_ARTIST, "");
@@ -179,7 +179,7 @@ void CDInfoDialogBase::slotMultipleArtists( bool hasMultipleArtist)
         for (TQListViewItem *item = m_trackList->firstChild(); item; item=item->nextSibling())
         {
             TQString title = item->text(TRACK_TITLE);
-            int separator = title.find(SEPARATOR);
+            int separator = title.tqfind(SEPARATOR);
             if (separator != -1)
             {
                 // Artists probably entered already
@@ -196,7 +196,7 @@ void CDInfoDialogBase::slotMultipleArtists( bool hasMultipleArtist)
             TQString artist = item->text(TRACK_ARTIST);
             if (!artist.isEmpty())
             {
-                item->setText(TRACK_ARTIST, TQString::null);
+                item->setText(TRACK_ARTIST, TQString());
                 item->setText(TRACK_TITLE, artist + SEPARATOR + item->text(TRACK_TITLE));
             }
         }
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index 42d0e506..0cf47196 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -28,9 +28,9 @@
 
 namespace KCDDB
 {
-  CDInfoEncodingWidget::CDInfoEncodingWidget(TQWidget* parent, const TQString& artist,
+  CDInfoEncodingWidget::CDInfoEncodingWidget(TQWidget* tqparent, const TQString& artist,
           const TQString& title, const TQStringList& songTitles)
-    : CDInfoEncodingWidgetBase(parent), m_artist(artist), m_title(title),
+    : CDInfoEncodingWidgetBase(tqparent), m_artist(artist), m_title(title),
         m_songTitles(songTitles)
   {
     encodingCombo->insertStringList(KGlobal::charsets()->descriptiveEncodingNames());
@@ -62,7 +62,7 @@ namespace KCDDB
     songsBox->clear();
     songsBox->insertStringList(newTitles);
       
-    titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").arg(
+    titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").tqarg(
           codec->toUnicode(m_artist.latin1()), codec->toUnicode(m_title.latin1())));
   }
 }
diff --git a/libkcddb/cdinfoencodingwidget.h b/libkcddb/cdinfoencodingwidget.h
index 7182b44f..a5fa8522 100644
--- a/libkcddb/cdinfoencodingwidget.h
+++ b/libkcddb/cdinfoencodingwidget.h
@@ -27,8 +27,9 @@ namespace KCDDB
     class CDInfoEncodingWidget : public CDInfoEncodingWidgetBase
     {
     Q_OBJECT
+  TQ_OBJECT
     public:
-        CDInfoEncodingWidget(TQWidget* parent, const TQString& artist, const TQString& title,
+        CDInfoEncodingWidget(TQWidget* tqparent, const TQString& artist, const TQString& title,
             const TQStringList& songTitles);
 
         TQString selectedEncoding();
diff --git a/libkcddb/cdinfoencodingwidgetbase.ui b/libkcddb/cdinfoencodingwidgetbase.ui
index e5156908..a3ffa82b 100644
--- a/libkcddb/cdinfoencodingwidgetbase.ui
+++ b/libkcddb/cdinfoencodingwidgetbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CDInfoEncodingWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CDInfoEncodingWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,7 +16,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>encodingLabel</cstring>
             </property>
@@ -24,12 +24,12 @@
                 <string>Encoding:</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <property name="name">
                 <cstring>encodingCombo</cstring>
             </property>
         </widget>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>titleLabel</cstring>
                     </property>
@@ -51,11 +51,11 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QListBox">
+                <widget class="TQListBox">
                     <property name="name">
                         <cstring>songsBox</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>300</width>
                             <height>250</height>
@@ -66,5 +66,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/libkcddb/client.h b/libkcddb/client.h
index 3aeb3bd6..33728783 100644
--- a/libkcddb/client.h
+++ b/libkcddb/client.h
@@ -40,9 +40,10 @@ namespace KCDDB
    * cddb->lookup(discSignature);
    * CDInfo info = cddb->bestLookupResponse();</code>
    */
-  class KDE_EXPORT Client : public QObject
+  class KDE_EXPORT Client : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
diff --git a/libkcddb/genres.cpp b/libkcddb/genres.cpp
index 423e80fc..ac1b86ad 100644
--- a/libkcddb/genres.cpp
+++ b/libkcddb/genres.cpp
@@ -97,7 +97,7 @@ KCDDB::Genres::Genres()
 const TQString KCDDB::Genres::cddb2i18n(const TQString &genre) const
 {
     TQString userDefinedGenre = genre.stripWhiteSpace();
-    int index = m_cddb.findIndex(userDefinedGenre);
+    int index = m_cddb.tqfindIndex(userDefinedGenre);
     if (index != -1)
     {
         return m_i18n[index];
@@ -111,7 +111,7 @@ const TQString KCDDB::Genres::cddb2i18n(const TQString &genre) const
 const TQString KCDDB::Genres::i18n2cddb(const TQString &genre) const
 {
     TQString userDefinedGenre = genre.stripWhiteSpace();
-    int index = m_i18n.findIndex(userDefinedGenre);
+    int index = m_i18n.tqfindIndex(userDefinedGenre);
     if (index != -1)
     {
         return m_cddb[index];
diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp
index c360c423..c3a942d3 100644
--- a/libkcddb/httplookup.cpp
+++ b/libkcddb/httplookup.cpp
@@ -40,7 +40,7 @@ namespace KCDDB
   HTTPLookup::sendQuery()
   {
     TQString cmd = TQString( "cddb query %1 %2" )
-      .arg( trackOffsetListToId(), trackOffsetListToString() ) ;
+      .tqarg( trackOffsetListToId(), trackOffsetListToString() ) ;
 
     makeURL( cmd );
     Result result = fetchURL();
@@ -55,7 +55,7 @@ namespace KCDDB
     TQString discid    = match.second;
 
     TQString cmd = TQString( "cddb read %1 %2" )
-        .arg( category_, discid );
+        .tqarg( category_, discid );
 
     makeURL( cmd );
     Result result = fetchURL();
@@ -80,10 +80,10 @@ namespace KCDDB
     // The whole query has to constructed each time as the
     // CDDB CGI script expects the parameters in strict order
 
-    cgiURL_.setQuery( TQString::null );
+    cgiURL_.setQuery( TQString() );
 
     TQString hello = TQString("%1 %2 %3 %4")
-        .arg(user_, localHostName_, clientName(), clientVersion());
+        .tqarg(user_, localHostName_, clientName(), clientVersion());
 
     cgiURL_.addQueryItem( "cmd", cmd );
     cgiURL_.addQueryItem( "hello", hello );
diff --git a/libkcddb/httplookup.h b/libkcddb/httplookup.h
index b8f9c179..ae720f5e 100644
--- a/libkcddb/httplookup.h
+++ b/libkcddb/httplookup.h
@@ -38,6 +38,7 @@ namespace KCDDB
   {
 
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp
index 442efd12..ec08253a 100644
--- a/libkcddb/kcmcddb/cddbconfigwidget.cpp
+++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp
@@ -38,8 +38,8 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 
-CDDBConfigWidget::CDDBConfigWidget(TQWidget * parent, const char * name)
-  : CDDBConfigWidgetBase(parent, name)
+CDDBConfigWidget::CDDBConfigWidget(TQWidget * tqparent, const char * name)
+  : CDDBConfigWidgetBase(tqparent, name)
 {
   // Connections from widgets are made in designer.
 
diff --git a/libkcddb/kcmcddb/cddbconfigwidget.h b/libkcddb/kcmcddb/cddbconfigwidget.h
index e927284c..647d4717 100644
--- a/libkcddb/kcmcddb/cddbconfigwidget.h
+++ b/libkcddb/kcmcddb/cddbconfigwidget.h
@@ -27,10 +27,11 @@
 class CDDBConfigWidget : public CDDBConfigWidgetBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
-    CDDBConfigWidget(TQWidget * parent = 0, const char * name = 0);
+    CDDBConfigWidget(TQWidget * tqparent = 0, const char * name = 0);
 
   protected slots:
 
diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
index 2158159a..71ed425d 100644
--- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
+++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
@@ -1,11 +1,11 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CDDBConfigWidgetBase</class>
 <comment>Used for configuring libkcddb.</comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CDDBConfigWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -23,11 +23,11 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget2</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -38,7 +38,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>kcfg_cachePolicy</cstring>
                         </property>
@@ -63,7 +63,7 @@
                             <property name="spacing">
                                 <number>0</number>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>cacheOnly</cstring>
                                 </property>
@@ -74,7 +74,7 @@
                                     <string>Only check in the local cache for CD information.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>cacheAndRemote</cstring>
                                 </property>
@@ -85,7 +85,7 @@
                                     <string>Check for locally cached CD information before trying to look up at remote CDDB server.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>remoteOnly</cstring>
                                 </property>
@@ -98,7 +98,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>serverBox</cstring>
                         </property>
@@ -115,7 +115,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel7</cstring>
                                 </property>
@@ -126,7 +126,7 @@
                                     <cstring>kcfg_hostname</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel9</cstring>
                                 </property>
@@ -137,7 +137,7 @@
                                     <cstring>kcfg_lookupTransport</cstring>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="1" column="1">
+                            <widget class="TQComboBox" row="1" column="1">
                                 <item>
                                     <property name="text">
                                         <string>CDDB</string>
@@ -163,7 +163,7 @@
                                     <string>Show &amp;Mirror List</string>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="0" column="4">
+                            <widget class="TQSpinBox" row="0" column="4">
                                 <property name="name">
                                     <cstring>kcfg_port</cstring>
                                 </property>
@@ -185,21 +185,21 @@
                                     <string>Port to connect to on CDDB server.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="3">
+                            <widget class="TQLabel" row="0" column="3">
                                 <property name="name">
                                     <cstring>TextLabel8</cstring>
                                 </property>
                                 <property name="text">
                                     <string>&amp;Port:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
                                     <cstring>kcfg_port</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>kcfg_hostname</cstring>
                                 </property>
@@ -220,11 +220,11 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidgetStack">
+                    <widget class="TQWidgetStack">
                         <property name="name">
                             <cstring>cacheLocationsParent</cstring>
                         </property>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>WStackPage</cstring>
                             </property>
@@ -243,7 +243,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>41</width>
                                 <height>260</height>
@@ -252,7 +252,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -263,12 +263,12 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLineEdit" row="0" column="1">
+                    <widget class="TQLineEdit" row="0" column="1">
                         <property name="name">
                             <cstring>kcfg_emailAddress</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>textLabel1</cstring>
                         </property>
@@ -286,14 +286,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>240</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2">
+                    <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>kcfg_submitTransport</cstring>
                         </property>
@@ -314,7 +314,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>21</height>
@@ -331,14 +331,14 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>21</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QLabel" row="1" column="1" rowspan="1" colspan="3">
+                            <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -346,7 +346,7 @@
                                     <string>Server:</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="6">
+                            <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="6">
                                 <property name="name">
                                     <cstring>radioButton8</cstring>
                                 </property>
@@ -367,14 +367,14 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>140</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="4">
+                            <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="4">
                                 <property name="name">
                                     <cstring>radioButton6</cstring>
                                 </property>
@@ -390,23 +390,23 @@
                                     <cstring>kcfg_httpSubmitServer</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="6">
+                            <widget class="TQLabel" row="1" column="6">
                                 <property name="name">
                                     <cstring>textLabel1_2</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Port:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="1" column="7">
+                            <widget class="TQSpinBox" row="1" column="7">
                                 <property name="name">
                                     <cstring>kcfg_httpSubmitPort</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="1" rowspan="1" colspan="4">
+                            <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="4">
                                 <property name="name">
                                     <cstring>textLabel9_2</cstring>
                                 </property>
@@ -414,7 +414,7 @@
                                     <string>Reply-To:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="4" column="1" rowspan="1" colspan="4">
+                            <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="4">
                                 <property name="name">
                                     <cstring>textLabel2_2</cstring>
                                 </property>
@@ -430,7 +430,7 @@
                                     <string>SMTP server:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="5" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="5" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>textLabel3</cstring>
                                 </property>
@@ -446,12 +446,12 @@
                                     <string>Port:</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="3" column="5" rowspan="1" colspan="3">
+                            <widget class="TQLineEdit" row="3" column="5" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>kcfg_replyTo</cstring>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="6" column="1" rowspan="1" colspan="7">
+                            <widget class="TQCheckBox" row="6" column="1" rowspan="1" colspan="7">
                                 <property name="name">
                                     <cstring>needsAuthenticationBox</cstring>
                                 </property>
@@ -459,12 +459,12 @@
                                     <string>Server needs authentication</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="4" column="5" rowspan="1" colspan="3">
+                            <widget class="TQLineEdit" row="4" column="5" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>kcfg_smtpHostname</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="7" column="2" rowspan="1" colspan="3">
+                            <widget class="TQLabel" row="7" column="2" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>textLabel4</cstring>
                                 </property>
@@ -472,7 +472,7 @@
                                     <string>Username:</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="7" column="5" rowspan="1" colspan="3">
+                            <widget class="TQLineEdit" row="7" column="5" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>kcfg_smtpUsername</cstring>
                                 </property>
@@ -488,7 +488,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="5" column="3" rowspan="1" colspan="2">
+                            <widget class="TQSpinBox" row="5" column="3" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>kcfg_smtpPort</cstring>
                                 </property>
@@ -517,7 +517,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>260</width>
                                         <height>20</height>
@@ -580,13 +580,13 @@
     <tabstop>kcfg_port</tabstop>
     <tabstop>kcfg_lookupTransport</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">protocolChanged()</slot>
     <slot access="protected">showMirrorList()</slot>
     <slot access="protected">needAuthenticationChanged(bool)</slot>
-</slots>
-<layoutdefaults spacing="11" margin="6"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="11" margin="6"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index 3688ba6a..fa10bc4a 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -45,8 +45,8 @@
 typedef KGenericFactory<CDDBModule, TQWidget> KCDDBFactory;
 K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) )
 
-CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(parent, name)
+CDDBModule::CDDBModule(TQWidget *tqparent, const char *name, const TQStringList &)
+  : KCModule(tqparent, name)
 {
   KGlobal::locale()->insertCatalogue("libkcddb");
   setButtons(Default | Apply);
@@ -58,10 +58,10 @@ CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
 
   addConfig(cfg, widget_);
 
-  TQVBoxLayout * layout = new TQVBoxLayout(this, 0);
+  TQVBoxLayout * tqlayout = new TQVBoxLayout(this, 0);
 
-  layout->addWidget(widget_);
-  layout->addStretch();
+  tqlayout->addWidget(widget_);
+  tqlayout->addStretch();
 
   setQuickHelp(i18n("CDDB is used to get information like artist, title and song-names in CD's"));
 
@@ -84,8 +84,8 @@ CDDBModule::checkSettings() const
   config.readConfig();
 
   if (config.smtpHostname().isEmpty() || config.emailAddress().isEmpty()
-      || !config.emailAddress().contains("@") ||
-      (!config.replyTo().isEmpty() && !config.replyTo().contains("@")))
+      || !config.emailAddress().tqcontains("@") ||
+      (!config.replyTo().isEmpty() && !config.replyTo().tqcontains("@")))
       
   {
     if (config.submitTransport() == KCDDB::Submit::SMTP)
diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h
index 36d42e6f..84978228 100644
--- a/libkcddb/kcmcddb/kcmcddb.h
+++ b/libkcddb/kcmcddb/kcmcddb.h
@@ -30,10 +30,11 @@ class KConfigDialogManager;
 class CDDBModule : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
-    CDDBModule(TQWidget * parent, const char *name, const TQStringList &);
+    CDDBModule(TQWidget * tqparent, const char *name, const TQStringList &);
 
   public slots:
 
diff --git a/libkcddb/libkcddb.kcfg b/libkcddb/libkcddb.kcfg
index cbd123c7..938ac306 100644
--- a/libkcddb/libkcddb.kcfg
+++ b/libkcddb/libkcddb.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <include>qdir.h</include>
+  <include>tqdir.h</include>
   <kcfgfile name="kcmcddbrc"/>
   <group name="Lookup">
     <entry name="hostname" type="String">
@@ -28,7 +28,7 @@
       <default>HTTP</default>
     </entry>
     <entry name="cacheLocations" type="PathList">
-      <default code="true">QDir::homeDirPath()+"/.cddb/"</default>
+      <default code="true">TQDir::homeDirPath()+"/.cddb/"</default>
     </entry>
   </group>
   <group name="Submit">
diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp
index d7c15956..25c7599e 100644
--- a/libkcddb/lookup.cpp
+++ b/libkcddb/lookup.cpp
@@ -38,19 +38,19 @@ namespace KCDDB
     CDDB::Result
   Lookup::parseQuery(  const TQString & line )
   {
-    uint serverStatus = statusCode(  line );
+    uint servertqStatus = statusCode(  line );
 
-    if (  200 == serverStatus )
+    if (  200 == servertqStatus )
     {
       TQStringList tokenList = TQStringList::split(  ' ', line );
-      matchList_.append(  qMakePair(  tokenList[  1 ], tokenList[  2 ] ) );
+      matchList_.append(  tqMakePair(  tokenList[  1 ], tokenList[  2 ] ) );
       return Success;
     }
-    else if (  (  211 == serverStatus ) || (  210 == serverStatus ) )
+    else if (  (  211 == servertqStatus ) || (  210 == servertqStatus ) )
     {
       return MultipleRecordFound;
     }
-    else if (  202 == serverStatus )
+    else if (  202 == servertqStatus )
     {
       return NoRecordFound;
     }
@@ -62,15 +62,15 @@ namespace KCDDB
   Lookup::parseExtraMatch(  const TQString & line )
   {
     TQStringList tokenList = TQStringList::split(  ' ', line );
-    matchList_.append(  qMakePair(  tokenList[  0 ], tokenList[  1 ] ) );
+    matchList_.append(  tqMakePair(  tokenList[  0 ], tokenList[  1 ] ) );
   }
 
     CDDB::Result
   Lookup::parseRead(  const TQString & line )
   {
-    uint serverStatus = statusCode(  line );
+    uint servertqStatus = statusCode(  line );
 
-    if (   210 != serverStatus )
+    if (   210 != servertqStatus )
       return ServerError;
 
     return Success;
diff --git a/libkcddb/lookup.h b/libkcddb/lookup.h
index 96538ac5..c11ad8e6 100644
--- a/libkcddb/lookup.h
+++ b/libkcddb/lookup.h
@@ -28,10 +28,10 @@
 
 namespace KCDDB
 {
-  typedef QPair<TQString, TQString> CDDBMatch;
+  typedef TQPair<TQString, TQString> CDDBMatch;
   typedef TQValueList<CDDBMatch> CDDBMatchList;
 
-  class Lookup : public CDDB, public QObject
+  class Lookup : public CDDB, public TQObject
   {
     public:
 
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index 393740fe..18082587 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -41,10 +41,10 @@ namespace KCDDB
     url.setPort( 80 );
     url.setPath( "/~cddb/cddb.cgi" );
 
-    url.setQuery( TQString::null );
+    url.setQuery( TQString() );
 
     TQString hello = TQString("%1 %2 %3 %4")
-        .arg(user_, localHostName_, clientName(), clientVersion());
+        .tqarg(user_, localHostName_, clientName(), clientVersion());
 
     url.addQueryItem( "cmd", "sites" );
     url.addQueryItem( "hello", hello );
diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp
index 07f34b61..9733ee40 100644
--- a/libkcddb/smtpsubmit.cpp
+++ b/libkcddb/smtpsubmit.cpp
@@ -43,7 +43,7 @@ namespace KCDDB
   KIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo)
   {
     url_.setQuery(TQString("to=%1&subject=cddb %2 %3&from=%4")
-      .arg(to_, cdInfo.category, cdInfo.id, from_));
+      .tqarg(to_, cdInfo.category, cdInfo.id, from_));
     kdDebug(60010) << "Url is: " << url_.prettyURL() << endl;
 
     return KIO::storedPut(diskData_.utf8(), url_, -1, false, false, false);
diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp
index 63a0951b..8742469d 100644
--- a/libkcddb/submit.cpp
+++ b/libkcddb/submit.cpp
@@ -57,9 +57,9 @@ namespace KCDDB
     CDDB::Result
   Submit::parseWrite(  const TQString & line )
   {
-    uint serverStatus = statusCode(  line );
+    uint servertqStatus = statusCode(  line );
 
-    if (   320 != serverStatus )
+    if (   320 != servertqStatus )
       return ServerError;
 
     return Success;
@@ -74,10 +74,10 @@ namespace KCDDB
     diskData_ += "# Track frame offsets:\n";
 
     for (uint i=0; i < numTracks; i++)
-      diskData_ += TQString("#\t%1\n").arg(offsetList[i]);
+      diskData_ += TQString("#\t%1\n").tqarg(offsetList[i]);
 
     int l = offsetList[numTracks+1]/75;
-    diskData_ += TQString("# Disc length: %1 seconds\n").arg(l);
+    diskData_ += TQString("# Disc length: %1 seconds\n").tqarg(l);
 
     diskData_ += cdInfo.toString(true);
 
@@ -91,7 +91,7 @@ namespace KCDDB
       << "data" << "folk" << "jazz" << "misc" << "newage" << "reggae"
       << "rock" << "soundtrack";
 
-    if (validCategories.contains(c))
+    if (validCategories.tqcontains(c))
       return true;
     else
       return false;
diff --git a/libkcddb/submit.h b/libkcddb/submit.h
index 877b499a..512e69b9 100644
--- a/libkcddb/submit.h
+++ b/libkcddb/submit.h
@@ -34,7 +34,7 @@ namespace KIO
 
 namespace KCDDB
 {
-  class Submit : public CDDB, public QObject
+  class Submit : public CDDB, public TQObject
   {
     public:
 
diff --git a/libkcddb/synccddbplookup.cpp b/libkcddb/synccddbplookup.cpp
index b2be7618..ed102b9d 100644
--- a/libkcddb/synccddbplookup.cpp
+++ b/libkcddb/synccddbplookup.cpp
@@ -196,13 +196,13 @@ namespace KCDDB
     return Success;
   }
 
-    QString
+    TQString
   SyncCDDBPLookup::readLine()
   {
     if ( !isConnected() )
     {
       kdDebug(60010) << "socket status: " << socket_->state() << endl;
-      return TQString::null;
+      return TQString();
     }
 
     if (!socket_->canReadLine())
@@ -212,7 +212,7 @@ namespace KCDDB
       socket_->waitForMore(-1,&timeout);
 
       if (timeout)
-        return TQString::null;
+        return TQString();
     }
 
     return TQString::fromUtf8(socket_->readLine());
diff --git a/libkcddb/test/asynccddblookuptest.h b/libkcddb/test/asynccddblookuptest.h
index db4436e4..fb4b940f 100644
--- a/libkcddb/test/asynccddblookuptest.h
+++ b/libkcddb/test/asynccddblookuptest.h
@@ -6,9 +6,10 @@
 
 using namespace KCDDB;
 
-class AsyncCDDBLookupTest : public QObject
+class AsyncCDDBLookupTest : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/libkcddb/test/asynchttplookuptest.h b/libkcddb/test/asynchttplookuptest.h
index 7649f204..e323b5c6 100644
--- a/libkcddb/test/asynchttplookuptest.h
+++ b/libkcddb/test/asynchttplookuptest.h
@@ -6,9 +6,10 @@
 
 using namespace KCDDB;
 
-class AsyncHTTPLookupTest : public QObject
+class AsyncHTTPLookupTest : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/libkcddb/test/asynchttpsubmittest.h b/libkcddb/test/asynchttpsubmittest.h
index 6cce8ed2..0a1c8389 100644
--- a/libkcddb/test/asynchttpsubmittest.h
+++ b/libkcddb/test/asynchttpsubmittest.h
@@ -6,9 +6,10 @@
 
 using namespace KCDDB;
 
-class AsyncHTTPSubmitTest : public QObject
+class AsyncHTTPSubmitTest : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AsyncHTTPSubmitTest();
diff --git a/libkcddb/test/asyncsmtpsubmittest.h b/libkcddb/test/asyncsmtpsubmittest.h
index 0e6f445e..01514feb 100644
--- a/libkcddb/test/asyncsmtpsubmittest.h
+++ b/libkcddb/test/asyncsmtpsubmittest.h
@@ -6,9 +6,10 @@
 
 using namespace KCDDB;
 
-class AsyncSMTPSubmitTest : public QObject
+class AsyncSMTPSubmitTest : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AsyncSMTPSubmitTest();