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

3 files changed, 78 insertions, 77 deletions

diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
index a742a4cc..271c6261 100644
--- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
+++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AudiocdConfig</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,9 +12,9 @@
             <height>563</height>
         </rect>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -26,7 +26,7 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
@@ -38,11 +38,11 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="layoutMargin" stdset="0">
+            <property name="tqlayoutMargin" stdset="0">
             </property>
-            <property name="layoutSpacing" stdset="0">
+            <property name="tqlayoutSpacing" stdset="0">
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -63,14 +63,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>210</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="3">
+                    <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>encoderPriority</cstring>
                         </property>
@@ -81,7 +81,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3">
+                            <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>niceLevel</cstring>
                                 </property>
@@ -101,7 +101,7 @@
                                     <enum>NoMarks</enum>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -109,31 +109,31 @@
                                     <string>Highest</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="2">
+                            <widget class="TQLabel" row="1" column="2">
                                 <property name="name">
                                     <cstring>textLabel3</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Lowest</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="1">
+                            <widget class="TQLabel" row="1" column="1">
                                 <property name="name">
                                     <cstring>textLabel4</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Normal</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLineEdit" row="0" column="2">
+                    <widget class="TQLineEdit" row="0" column="2">
                         <property name="name">
                             <cstring>cd_device_string</cstring>
                         </property>
@@ -147,7 +147,7 @@
                             <string>Specify a location for the drive you want to use. Normally, this is a file inside the /dev folder representing your CD or DVD drive.</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>cd_specify_device</cstring>
                         </property>
@@ -158,7 +158,7 @@
                             <string>Check this to specify a CD device different from the one which is detected automatically</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
+                    <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>ec_enable_check</cstring>
                         </property>
@@ -172,7 +172,7 @@
                             <string>If you uncheck this option, the slave will not try to use error correction which can be useful for reading damaged CDs. However, this feature can be problematic in some cases, so you can switch it off here.</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2">
+                    <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>ec_skip_check</cstring>
                         </property>
@@ -193,7 +193,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -202,7 +202,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -213,7 +213,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>fileNameGroupBox</cstring>
                         </property>
@@ -224,7 +224,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1_2</cstring>
                                 </property>
@@ -232,15 +232,15 @@
                                     <string>The following macros will be expanded:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout7</cstring>
+                                    <cstring>tqlayout7</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel" row="5" column="1">
+                                    <widget class="TQLabel" row="5" column="1">
                                         <property name="name">
                                             <cstring>textLabel13</cstring>
                                         </property>
@@ -248,7 +248,7 @@
                                             <string>Genre</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="1">
+                                    <widget class="TQLabel" row="1" column="1">
                                         <property name="name">
                                             <cstring>textLabel7</cstring>
                                         </property>
@@ -256,7 +256,7 @@
                                             <string>Track Number</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>textLabel2_3</cstring>
                                         </property>
@@ -264,7 +264,7 @@
                                             <string>%{title}</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="4" column="1">
+                                    <widget class="TQLabel" row="4" column="1">
                                         <property name="name">
                                             <cstring>textLabel11</cstring>
                                         </property>
@@ -272,7 +272,7 @@
                                             <string>Year</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="1">
+                                    <widget class="TQLabel" row="0" column="1">
                                         <property name="name">
                                             <cstring>textLabel3_3</cstring>
                                         </property>
@@ -280,7 +280,7 @@
                                             <string>Track Title</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="3" column="1">
+                                    <widget class="TQLabel" row="3" column="1">
                                         <property name="name">
                                             <cstring>textLabel9</cstring>
                                         </property>
@@ -288,7 +288,7 @@
                                             <string>Album Artist</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="4" column="0">
+                                    <widget class="TQLabel" row="4" column="0">
                                         <property name="name">
                                             <cstring>textLabel10</cstring>
                                         </property>
@@ -296,7 +296,7 @@
                                             <string>%{year}</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="2" column="0">
+                                    <widget class="TQLabel" row="2" column="0">
                                         <property name="name">
                                             <cstring>textLabel6</cstring>
                                         </property>
@@ -304,7 +304,7 @@
                                             <string>%{albumtitle}</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="2" column="1">
+                                    <widget class="TQLabel" row="2" column="1">
                                         <property name="name">
                                             <cstring>textLabel5</cstring>
                                         </property>
@@ -312,7 +312,7 @@
                                             <string>Album Title</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="5" column="0">
+                                    <widget class="TQLabel" row="5" column="0">
                                         <property name="name">
                                             <cstring>textLabel12</cstring>
                                         </property>
@@ -320,7 +320,7 @@
                                             <string>%{genre}</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="3" column="0">
+                                    <widget class="TQLabel" row="3" column="0">
                                         <property name="name">
                                             <cstring>textLabel8</cstring>
                                         </property>
@@ -328,7 +328,7 @@
                                             <string>%{albumartist}</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>textLabel4_2</cstring>
                                         </property>
@@ -345,7 +345,7 @@
                             </widget>
                         </vbox>
                     </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>groupBox2</cstring>
                         </property>
@@ -356,7 +356,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel2_2</cstring>
                                 </property>
@@ -364,7 +364,7 @@
                                     <string>Selection:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -372,11 +372,11 @@
                                     <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines.
 </string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="5" column="0">
+                            <widget class="TQLabel" row="5" column="0">
                                 <property name="name">
                                     <cstring>inputlabel</cstring>
                                 </property>
@@ -384,7 +384,7 @@
                                     <string>Input:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="6" column="0">
+                            <widget class="TQLabel" row="6" column="0">
                                 <property name="name">
                                     <cstring>outputLabel</cstring>
                                 </property>
@@ -392,7 +392,7 @@
                                     <string>Output:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>exampleLabel</cstring>
                                 </property>
@@ -400,7 +400,7 @@
                                     <string>Example</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="6" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="6" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>exampleOutput</cstring>
                                 </property>
@@ -408,7 +408,7 @@
                                     <string>Cool artist - example audio file.wav</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>example</cstring>
                                 </property>
@@ -416,17 +416,17 @@
                                     <string>Cool artist - example audio file.wav</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLineEdit" row="2" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>kcfg_replaceInput</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="2" column="2">
+                            <widget class="TQLineEdit" row="2" column="2">
                                 <property name="name">
                                     <cstring>kcfg_replaceOutput</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="2">
+                            <widget class="TQLabel" row="1" column="2">
                                 <property name="name">
                                     <cstring>textLabel3_2</cstring>
                                 </property>
@@ -460,14 +460,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>16</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="0" column="1">
+                    <widget class="TQGroupBox" row="0" column="1">
                         <property name="name">
                             <cstring>fileNameGroupBox_2</cstring>
                         </property>
@@ -478,7 +478,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>fileNameLabel_2</cstring>
                                 </property>
@@ -486,15 +486,15 @@
                                     <string>The following macros will be expanded:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel" row="2" column="1" rowspan="2" colspan="1">
+                                    <widget class="TQLabel" row="2" column="1" rowspan="2" colspan="1">
                                         <property name="name">
                                             <cstring>textLabel20</cstring>
                                         </property>
@@ -502,7 +502,7 @@
                                             <string>Year</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1">
+                                    <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1">
                                         <property name="name">
                                             <cstring>textLabel15</cstring>
                                         </property>
@@ -510,7 +510,7 @@
                                             <string>%{albumartist}</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="3" column="0">
+                                    <widget class="TQLabel" row="3" column="0">
                                         <property name="name">
                                             <cstring>textLabel16</cstring>
                                         </property>
@@ -518,7 +518,7 @@
                                             <string>%{year}</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="4" column="1">
+                                    <widget class="TQLabel" row="4" column="1">
                                         <property name="name">
                                             <cstring>textLabel21</cstring>
                                         </property>
@@ -526,7 +526,7 @@
                                             <string>Genre</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="1">
+                                    <widget class="TQLabel" row="1" column="1">
                                         <property name="name">
                                             <cstring>textLabel19</cstring>
                                         </property>
@@ -534,7 +534,7 @@
                                             <string>Album Artist</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="1">
+                                    <widget class="TQLabel" row="0" column="1">
                                         <property name="name">
                                             <cstring>textLabel18</cstring>
                                         </property>
@@ -542,7 +542,7 @@
                                             <string>Album Title</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="4" column="0">
+                                    <widget class="TQLabel" row="4" column="0">
                                         <property name="name">
                                             <cstring>textLabel17</cstring>
                                         </property>
@@ -550,7 +550,7 @@
                                             <string>%{genre}</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>textLabel14</cstring>
                                         </property>
@@ -570,7 +570,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>31</height>
@@ -618,10 +618,10 @@
 <includes>
     <include location="global" impldecl="in declaration">kcmodule.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>toggleLowpass()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index 87614806..166aa126 100644
--- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -34,8 +34,8 @@
 #include "kcmaudiocd.moc"
 #include <kconfigdialogmanager.h>
 
-KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
-  : AudiocdConfig(parent, name), configChanged(false)
+KAudiocdModule::KAudiocdModule(TQWidget *tqparent, const char *name)
+  : AudiocdConfig(tqparent, name), configChanged(false)
 {
     TQString foo = i18n("Report errors found on the cd.");
 				
@@ -51,7 +51,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
         KConfigSkeleton *config = NULL;
         TQWidget *widget = encoder->getConfigureWidget(&config);
         if(widget && config){
-	   tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type()));
+	   tabWidget->addTab(widget, i18n("%1 Encoder").tqarg(encoder->type()));
              KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1());
            encoderSettings.append(configManager);
         }
@@ -123,7 +123,7 @@ void KAudiocdModule::updateExample()
   TQString deqoutedReplaceInput=removeQoutes(kcfg_replaceInput->text());
   TQString deqoutedReplaceOutput=removeQoutes(kcfg_replaceOutput->text());
 
-  text.replace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput );
+  text.tqreplace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput );
   exampleOutput->setText(text);
 }
 
@@ -165,7 +165,7 @@ void KAudiocdModule::save() {
        replaceOutput=TQString("\"")+replaceOutput+TQString("\"");
     }
     config->writeEntry("regexp_search", replaceInput);
-    config->writeEntry("regexp_replace", replaceOutput);
+    config->writeEntry("regexp_tqreplace", replaceOutput);
   }
 
   KConfigDialogManager *widget;
@@ -204,7 +204,7 @@ void KAudiocdModule::load(bool useDefaults) {
     fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}"));
     albumNameLineEdit->setText(config->readEntry("album_name_template", "%{albumartist} - %{albumtitle}"));
     kcfg_replaceInput->setText(config->readEntry("regexp_search"));
-    kcfg_replaceOutput->setText(config->readEntry("regexp_replace"));
+    kcfg_replaceOutput->setText(config->readEntry("regexp_tqreplace"));
     example->setText(config->readEntry("example", i18n("Cool artist - example audio file.wav")));
   }
   
@@ -259,9 +259,9 @@ TQString KAudiocdModule::quickHelp() const
 
 extern "C"
 {
-    KCModule *create_audiocd(TQWidget *parent, const char */*name*/)
+    KCModule *create_audiocd(TQWidget *tqparent, const char */*name*/)
     {
-        return new KAudiocdModule(parent, "kcmaudiocd");
+        return new KAudiocdModule(tqparent, "kcmaudiocd");
     }
 
 }
diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
index 4d51134d..b69a6784 100644
--- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
+++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the Qt
-    library, treating Qt like a library that normally accompanies the
+    Permission is also granted to link this program with the TQt
+    library, treating TQt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
 */
@@ -32,10 +32,11 @@ class KConfigDialogManager;
 class KAudiocdModule : public AudiocdConfig
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  KAudiocdModule(TQWidget *parent=0, const char *name=0);
+  KAudiocdModule(TQWidget *tqparent=0, const char *name=0);
   ~KAudiocdModule();
 
   TQString quickHelp() const;