TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

5 files changed, 18 insertions, 17 deletions

diff --git a/noatun-plugins/pitchablespeed/Makefile.am b/noatun-plugins/pitchablespeed/Makefile.am
index b994d98..3879a35 100644
--- a/noatun-plugins/pitchablespeed/Makefile.am
+++ b/noatun-plugins/pitchablespeed/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(kde_includes)/arts $(all_includes)
+INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = noatunpitchablespeed.la
 noatunpitchablespeed_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
index b59d6e5..17d8e51 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
@@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow)
 void PitchableSpeed::init()
 {
 	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"),
-										 this, TQT_SLOT(toggle(void)));
+										 TQT_TQOBJECT(this), TQT_SLOT(toggle(void)));
 }
 
 void PitchableSpeed::toggle(void)
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.h b/noatun-plugins/pitchablespeed/pitchablespeed.h
index c5bfadf..7947bb1 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.h
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.h
@@ -21,6 +21,7 @@ class TQSlider;
 class PitchableSpeed : public SpeedTuner, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	PitchableSpeed();
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.plugin b/noatun-plugins/pitchablespeed/pitchablespeed.plugin
index 8b1dded..f29c92a 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.plugin
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.plugin
@@ -61,7 +61,7 @@ Comment[az]=Çalma sür'ətini bir qulp ilə dəyişdirmə imkanı verir
 Comment[bg]=Регулиране скоростта на изпълнение чрез плъзгач
 Comment[bs]=Omogućuje prilagođavanje brzine sviranja pomoću klizača
 Comment[ca]=Fa que es puga variar la velocitat de reproducció amb un cursor
-Comment[cs]=Umožní měnit rychlost přehrávání pomocí posuvníku
+Comment[cs]=Umožní měnit rychlost přehrávání potqmocí posuvníku
 Comment[cy]=Newid cyflymder chwarae efo llithrydd
 Comment[da]=Gør afspilningshastigheden indstillelig med en skyder
 Comment[de]=Macht die Abspielgeschwindigkeit mit einem Schieberegler einstellbar
@@ -98,7 +98,7 @@ Comment[pt]=Torna a velocidade de reprodução ajustável com uma barra
 Comment[pt_BR]=Torna a velocidade reprodução ajustável com uma barra deslizante
 Comment[ro]=Permite ajustarea vitezei de redare cu un potenţiometru
 Comment[ru]=Регулирование скорости проигрывания через бегунок
-Comment[sk]=Umožňuje zmeniť rýchlosť prehrávania pomocou posúvadla
+Comment[sk]=Umožňuje zmeniť rýchlosť prehrávania potqmocou posúvadla
 Comment[sl]=Naredi hitrost predvajanja prilagodljivo z drsnikom
 Comment[sr]=Чини брзину пуштања подесивом помоћу клизача
 Comment[sr@Latn]=Čini brzinu puštanja podesivom pomoću klizača
diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui
index 79844c4..e533bd2 100644
--- a/noatun-plugins/pitchablespeed/speedtuner.ui
+++ b/noatun-plugins/pitchablespeed/speedtuner.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>SpeedTuner</class>
 <author>Hans Meine &lt;hans@meine.de&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SpeedTuner</cstring>
     </property>
@@ -26,7 +26,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QSlider">
+        <widget class="TQSlider">
             <property name="name">
                 <cstring>slider</cstring>
             </property>
@@ -37,7 +37,7 @@
                 <enum>Both</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -51,7 +51,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>currentValEdit</cstring>
                     </property>
@@ -68,7 +68,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignHCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -84,14 +84,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -105,7 +105,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>rangeLabel</cstring>
                             </property>
@@ -130,7 +130,7 @@
                                 <string>+/- </string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>offsetLabel</cstring>
                             </property>
@@ -154,7 +154,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>preserveFrequencies</cstring>
                     </property>
@@ -186,10 +186,10 @@
         <slot>offsetChanged(int)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">speedChanged(int)</slot>
     <slot access="protected">offsetChanged(int)</slot>
     <slot access="protected">rangeChanged(int)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>