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

5 files changed, 60 insertions, 58 deletions

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: