Finish TQt4 porting of Amarok

This enables compilation under both Qt3 and Qt4


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

amarok/src/Options1.ui

@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Options1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>General</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -30,7 +30,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>generalBox</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_ShowSplashscreen</cstring>
                     </property>
@@ -58,7 +58,7 @@
                         <string>Check to enable the splashscreen during Amarok startup.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_ShowTrayIcon</cstring>
                     </property>
@@ -72,9 +72,9 @@
                         <string>Check to enable the Amarok system tray icon.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -90,14 +90,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>21</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>kcfg_AnimateTrayIcon</cstring>
                             </property>
@@ -116,7 +116,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_ShowPlayerWindow</cstring>
                     </property>
@@ -130,15 +130,15 @@
                         <string>Check to enable an extra player window.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -155,7 +155,7 @@
                                 <string>Size of the cover image in the context viewer in pixels.</string>
                             </property>
                         </widget>
-                        <widget class="QSpinBox">
+                        <widget class="TQSpinBox">
                             <property name="name">
                                 <cstring>kcfg_CoverPreviewSize</cstring>
                             </property>
@@ -188,7 +188,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -197,19 +197,19 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
@@ -234,7 +234,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
@@ -254,7 +254,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>21</height>
@@ -263,22 +263,22 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>checkBox_customBrowser</cstring>
                             </property>
                             <property name="enabled">
                                 <bool>true</bool>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
@@ -303,7 +303,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
@@ -323,7 +323,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>21</height>
@@ -334,7 +334,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>componentsBox</cstring>
             </property>
@@ -348,7 +348,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_UseScores</cstring>
                     </property>
@@ -362,7 +362,7 @@
                         <string>Scores for tracks are calculated automatically, based on your listening habits.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_UseRatings</cstring>
                     </property>
@@ -395,7 +395,7 @@
                         <string>You need the &lt;a href='http://amarok.kde.org/wiki/Moodbar'&gt;moodbar package&lt;/a&gt; installed to enable the moodbar feature.</string>
                     </property>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>moodFrame</cstring>
                     </property>
@@ -421,7 +421,7 @@
                         <property name="spacing">
                             <number>0</number>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>kcfg_ShowMoodbar</cstring>
                             </property>
@@ -441,9 +441,9 @@
                                 <string>Displays a visual representation of the current track in the slider bar of the player window and a column in the playlist window.</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout8_2_2</cstring>
+                                <cstring>tqlayout8_2_2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -459,14 +459,14 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>21</height>
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>kcfg_MakeMoodier</cstring>
                                     </property>
@@ -483,7 +483,7 @@
                                         <string>When enabled, the hue distribution is quantised and respread evenly, giving a prettier but less meaningful output.</string>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>Happy Like a Rainbow</string>
@@ -516,7 +516,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>130</width>
                                             <height>20</height>
@@ -525,9 +525,9 @@
                                 </spacer>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7_2_2</cstring>
+                                <cstring>tqlayout7_2_2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -543,14 +543,14 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>21</height>
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>kcfg_MoodsWithMusic</cstring>
                                     </property>
@@ -573,7 +573,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -587,7 +587,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_SavePlaylist</cstring>
                     </property>
@@ -601,7 +601,7 @@
                         <string>If checked, Amarok saves the current playlist on quit and restores it when restarted.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_RelativePlaylist</cstring>
                     </property>
@@ -615,7 +615,7 @@
                         <string>If checked, Amarok uses a relative path for the tracks of manually saved playlists</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_AutoShowContextBrowser</cstring>
                     </property>
@@ -641,7 +641,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -685,13 +685,13 @@
 <includes>
     <include location="local" impldecl="in implementation">Options1.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>slotUpdateMoodFrame()</slot>
-</slots>
+</Q_SLOTS>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>

amarok/src/Options1.ui.h

@@ -3,7 +3,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you want to add, delete, or rename functions or slots, use
-** Qt Designer to update this file, preserving your code.
+** TQt Designer to update this file, preserving your code.
 **
 ** You should not define a constructor or destructor in this file.
 ** Instead, write your code in functions called init() and destroy().
@@ -37,11 +37,11 @@ void Options1::init()
         else
             ++it;
     }
-#ifdef Q_WS_MAC
-    if ( KStandardDirs::findExe( "open" ) != TQString::null )
+#ifdef TQ_WS_MAC
+    if ( KStandardDirs::findExe( "open" ) != TQString() )
         browsers.prepend( i18n( "Default Browser" ) );
 #else
-    if ( KStandardDirs::findExe( "kfmclient" ) != TQString::null )
+    if ( KStandardDirs::findExe( "kfmclient" ) != TQString() )
         browsers.prepend( i18n( "Default KDE Browser" ) );
 #endif
 
@@ -51,7 +51,7 @@ void Options1::init()
     if( index >= 0 )
         kComboBox_browser->setCurrentItem( index );
     else if( AmarokConfig::externalBrowser() ==
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
             "open"
 #else
             "kfmclient openURL"

amarok/src/Options2.ui

@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Options2</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Options2</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,7 +27,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox6</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_UseCustomIconTheme</cstring>
                     </property>
@@ -54,7 +54,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox4</cstring>
             </property>
@@ -65,7 +65,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_UseCustomFonts</cstring>
                     </property>
@@ -82,7 +82,7 @@
                         <string>Check to enable custom fonts.</string>
                     </property>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>fontGroupBox</cstring>
                     </property>
@@ -113,7 +113,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>textLabel3</cstring>
                             </property>
@@ -157,7 +157,7 @@
                                 <string>The font to use in the playlist window.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -172,7 +172,7 @@
                             <property name="text">
                                 <string>Player Window:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter</set>
                             </property>
                             <property name="toolTip" stdset="0">
@@ -182,7 +182,7 @@
                                 <string>The font to use in the player window.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>textLabel3_2</cstring>
                             </property>
@@ -252,7 +252,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -263,7 +263,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>radioGroup</cstring>
                     </property>
@@ -280,9 +280,9 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QLayoutWidget" row="2" column="0">
+                        <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -291,7 +291,7 @@
                                 <property name="spacing">
                                     <number>0</number>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>kcfg_SchemeCustom</cstring>
                                     </property>
@@ -308,7 +308,7 @@
                                         <string>If selected, Amarok uses the user-defined colors in the playlist.</string>
                                     </property>
                                 </widget>
-                                <widget class="QGroupBox">
+                                <widget class="TQGroupBox">
                                     <property name="name">
                                         <cstring>customSchemeBox</cstring>
                                     </property>
@@ -334,7 +334,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>fgLabel</cstring>
                                             </property>
@@ -349,7 +349,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="minimumSize">
+                                            <property name="tqminimumSize">
                                                 <size>
                                                     <width>0</width>
                                                     <height>0</height>
@@ -400,7 +400,7 @@
                                                 <string>Selects the color to use as foreground (text) color in the playlist.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="1" column="0">
+                                        <widget class="TQLabel" row="1" column="0">
                                             <property name="name">
                                                 <cstring>bgColor</cstring>
                                             </property>
@@ -443,13 +443,13 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="minimumSize">
+                                            <property name="tqminimumSize">
                                                 <size>
                                                     <width>0</width>
                                                     <height>0</height>
                                                 </size>
                                             </property>
-                                            <property name="maximumSize">
+                                            <property name="tqmaximumSize">
                                                 <size>
                                                     <width>192</width>
                                                     <height>32767</height>
@@ -476,7 +476,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="0">
+                        <widget class="TQRadioButton" row="0" column="0">
                             <property name="name">
                                 <cstring>kcfg_SchemeKDE</cstring>
                             </property>
@@ -493,7 +493,7 @@
                                 <string>If selected, Amarok uses the KDE standard colors in the playlist.</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>kcfg_SchemeAmarok</cstring>
                             </property>
@@ -526,15 +526,15 @@
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1_3</cstring>
                             </property>
@@ -563,7 +563,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>contextGroupBox</cstring>
             </property>
@@ -574,15 +574,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
@@ -614,15 +614,15 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>installPushButton</cstring>
                             </property>
@@ -636,7 +636,7 @@
                                 <string>Select and install a new Context Browser style.</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>retrievePushButton</cstring>
                             </property>
@@ -660,14 +660,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>uninstallPushButton</cstring>
                             </property>
@@ -695,7 +695,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -745,17 +745,17 @@
 <includes>
     <include location="local" impldecl="in implementation">Options2.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>installPushButton_clicked()</slot>
     <slot>retrievePushButton_clicked()</slot>
     <slot>uninstallPushButton_clicked()</slot>
     <slot>styleComboBox_activated( const QString &amp; s )</slot>
     <slot>updateStyleComboBox()</slot>
-</slots>
+</Q_SLOTS>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontrequester.h</includehint>
     <includehint>kfontrequester.h</includehint>

amarok/src/Options2.ui.h

@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you want to add, delete, or rename functions or slots, use
-** Qt Designer to update this file, preserving your code.
+** TQt Designer to update this file, preserving your code.
 **
 ** You should not define a constructor or destructor in this file.
 ** Instead, write your code in functions called init() and destroy().
@@ -41,8 +41,8 @@
 class AmarokThemeNewStuff : public KNewStuff
 {
     public:
-    AmarokThemeNewStuff(const TQString &type, TQWidget *parentWidget=0)
-             : KNewStuff( type, parentWidget )
+    AmarokThemeNewStuff(const TQString &type, TQWidget *tqparentWidget=0)
+             : KNewStuff( type, tqparentWidget )
     {}
 
     bool install( const TQString& fileName )
@@ -80,7 +80,7 @@ void Options2::init()
 // This method is basically lifted from ScriptManager::slotInstallScript()
 void Options2::installPushButton_clicked()
 {
-    KFileDialog dia( TQString::null, "*.tar *.tar.bz2 *.tar.gz|" + i18n( "Style Packages (*.tar, *.tar.bz2, *.tar.gz)" ), 0, 0, true );
+    KFileDialog dia( TQString(), "*.tar *.tar.bz2 *.tar.gz|" + i18n( "Style Packages (*.tar, *.tar.bz2, *.tar.gz)" ), 0, 0, true );
     kapp->setTopWidget( &dia );
     dia.setCaption( kapp->makeStdCaption( i18n( "Select Style Package" ) ) );
     dia.setMode( KFile::File | KFile::ExistingOnly );
@@ -108,7 +108,7 @@ void Options2::retrievePushButton_clicked()
     // Delete KNewStuff's configuration entries. These entries reflect which styles
     // are already installed. As we cannot yet keep them in sync after uninstalling
     // styles, we deactivate the check marks entirely.
-    Amarok::config()->deleteGroup( "KNewStuffStatus" );
+    Amarok::config()->deleteGroup( "KNewStufftqStatus" );
 
     // we need this because KNewStuffGeneric's install function isn't clever enough
     AmarokThemeNewStuff *kns = new AmarokThemeNewStuff( "amarok/themes", this );
@@ -137,7 +137,7 @@ void Options2::uninstallPushButton_clicked()
         return;
 
     if( KMessageBox::warningContinueCancel( 0,
-        i18n( "<p>Are you sure you want to uninstall the theme <strong>%1</strong>?</p>" ).arg( name ),
+        i18n( "<p>Are you sure you want to uninstall the theme <strong>%1</strong>?</p>" ).tqarg( name ),
         i18n("Uninstall Theme"), i18n("Uninstall") ) == KMessageBox::Cancel )
         return;
 
@@ -152,7 +152,7 @@ void Options2::uninstallPushButton_clicked()
     if( !KIO::NetAccess::del( themeDir, 0 ) ) {
         KMessageBox::sorry( 0, i18n( "<p>Could not uninstall this theme.</p>"
             "<p>You may not have sufficient permissions to delete the folder <strong>%1<strong></p>."
-            ).arg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) );
+            ).tqarg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) );
         return;
     }
 

amarok/src/Options4.ui

@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Options4</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Options4</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -24,7 +24,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup" row="0" column="0">
+        <widget class="TQButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>opt_crossfade</cstring>
             </property>
@@ -36,7 +36,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>180</height>
@@ -59,7 +59,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>radioButtonNormalPlayback</cstring>
                     </property>
@@ -73,15 +73,15 @@
                         <string>Enable normal track transition. You may insert a gap of silence between tracks.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="1">
+                <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>trackDelayLengthLabel</cstring>
                             </property>
@@ -93,7 +93,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
@@ -106,7 +106,7 @@
                                 <cstring>kcfg_TrackDelayLength</cstring>
                             </property>
                         </widget>
-                        <widget class="QSpinBox">
+                        <widget class="TQSpinBox">
                             <property name="name">
                                 <cstring>kcfg_TrackDelayLength</cstring>
                             </property>
@@ -118,7 +118,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>160</width>
                                     <height>0</height>
@@ -142,7 +142,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_Crossfade</cstring>
                     </property>
@@ -156,23 +156,23 @@
                         <string>Enable crossfading between tracks.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="3" column="1">
+                <widget class="TQLayoutWidget" row="3" column="1">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>crossfadeLengthLabel</cstring>
                                     </property>
@@ -187,7 +187,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>150</width>
                                             <height>0</height>
@@ -200,7 +200,7 @@
                                         <cstring>kcfg_CrossfadeLength</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>crossfadeDropdownText</cstring>
                                     </property>
@@ -215,7 +215,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>150</width>
                                             <height>0</height>
@@ -230,15 +230,15 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout8</cstring>
+                                <cstring>tqlayout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QSpinBox">
+                                <widget class="TQSpinBox">
                                     <property name="name">
                                         <cstring>kcfg_CrossfadeLength</cstring>
                                     </property>
@@ -253,7 +253,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>50</width>
                                             <height>0</height>
@@ -278,7 +278,7 @@
                                         <string>The length of the crossfade between tracks, in milliseconds.</string>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>Always</string>
@@ -308,7 +308,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>50</width>
                                             <height>0</height>
@@ -338,7 +338,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -347,7 +347,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QCheckBox" row="2" column="0">
+        <widget class="TQCheckBox" row="2" column="0">
             <property name="name">
                 <cstring>kcfg_FadeoutOnExit</cstring>
             </property>
@@ -358,7 +358,7 @@
                 <string>If checked, Amarok will fade out the music on program exit.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0">
+        <widget class="TQCheckBox" row="3" column="0">
             <property name="name">
                 <cstring>kcfg_ResumePlayback</cstring>
             </property>
@@ -379,14 +379,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>