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

1 files changed, 8 insertions, 6 deletions

diff --git a/juk/slideraction.h b/juk/slideraction.h
index 2b88c8e3..5577a481 100644
--- a/juk/slideraction.h
+++ b/juk/slideraction.h
@@ -22,17 +22,18 @@
 class TQBoxLayout;
 class TQDockWindow;
 
-class VolumeSlider : public QSlider
+class VolumeSlider : public TQSlider
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    VolumeSlider(Orientation o, TQWidget *parent, const char *name);
+    VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name);
 
     int volume() const;
     void setVolume(int value);
 
-    void setOrientation(Orientation o);
+    void setOrientation(Qt::Orientation o);
 
 signals:
     void signalVolumeChanged(int value);
@@ -48,9 +49,10 @@ private slots:
 class SliderAction : public KAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SliderAction(const TQString &text, TQObject *parent, const char *name);
+    SliderAction(const TQString &text, TQObject *tqparent, const char *name);
     virtual ~SliderAction();
 
     VolumeSlider *volumeSlider() const { return m_volumeSlider; }
@@ -59,7 +61,7 @@ public:
     bool dragging() const { return m_dragging; }
     bool volumeDragging() const { return m_volumeDragging; }
 
-    virtual int plug(TQWidget *parent, int index = -1);
+    virtual int plug(TQWidget *tqparent, int index = -1);
     virtual void unplug(TQWidget *widget);
 
     static const int minPosition;
@@ -73,7 +75,7 @@ signals:
     void signalVolumeChanged(int volume);
 
 private:
-    TQWidget *createWidget(TQWidget *parent);
+    TQWidget *createWidget(TQWidget *tqparent);
 
 private slots:
     void slotUpdateSize();