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

1 files changed, 8 insertions, 5 deletions

diff --git a/amarok/src/sliderwidget.h b/amarok/src/sliderwidget.h
index 1fa7d63a..2bf4d7aa 100644
--- a/amarok/src/sliderwidget.h
+++ b/amarok/src/sliderwidget.h
@@ -35,9 +35,10 @@ class TQTimer;
 
 namespace Amarok
 {
-    class Slider : public QSlider
+    class Slider : public TQSlider
     {
         Q_OBJECT
+  TQ_OBJECT
 
         public:
             Slider( Qt::Orientation, TQWidget*, uint max = 0 );
@@ -52,7 +53,7 @@ namespace Amarok
         signals:
             //we emit this when the user has specifically changed the slider
             //so connect to it if valueChanged() is too generic
-            //Qt also emits valueChanged( int )
+            //TQt also emits valueChanged( int )
             void sliderReleased( int );
 
         protected:
@@ -68,7 +69,7 @@ namespace Amarok
             int adjustValue( int v ) const
             {
                int mp = (minValue() + maxValue()) / 2;
-               return orientation() == Vertical ? mp - (v - mp) : v;
+               return orientation() == Qt::Vertical ? mp - (v - mp) : v;
             }
 
         private:
@@ -83,6 +84,7 @@ namespace Amarok
     class PrettySlider : public Slider
     {
         Q_OBJECT
+  TQ_OBJECT
 
         public:
             typedef enum
@@ -92,7 +94,7 @@ namespace Amarok
             } SliderMode;
 
             PrettySlider( Qt::Orientation orientation, SliderMode mode,
-                          TQWidget *parent, uint max = 0 );
+                          TQWidget *tqparent, uint max = 0 );
 
             virtual void newBundle( const MetaBundle &bundle );
 
@@ -117,9 +119,10 @@ namespace Amarok
     class VolumeSlider: public Slider
     {
         Q_OBJECT
+  TQ_OBJECT
 
         public:
-            VolumeSlider( TQWidget *parent, uint max = 0 );
+            VolumeSlider( TQWidget *tqparent, uint max = 0 );
 
         protected:
             virtual void paintEvent( TQPaintEvent* );