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, 13 insertions, 10 deletions

diff --git a/juk/nowplaying.h b/juk/nowplaying.h
index 0a60c278..bacc6582 100644
--- a/juk/nowplaying.h
+++ b/juk/nowplaying.h
@@ -37,12 +37,13 @@ class Playlist;
  * when the playing item changes.
  */
 
-class NowPlaying : public QHBox
+class NowPlaying : public TQHBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    NowPlaying(TQWidget *parent, PlaylistCollection *collection,
+    NowPlaying(TQWidget *tqparent, PlaylistCollection *collection,
                const char *name = 0);
     void addItem(NowPlayingItem *item);
     PlaylistCollection *collection() const;
@@ -53,9 +54,9 @@ private slots:
 private:
     struct Observer : public PlaylistObserver
     {
-        Observer(NowPlaying *parent, PlaylistInterface *playlist) :
+        Observer(NowPlaying *tqparent, PlaylistInterface *playlist) :
             PlaylistObserver(playlist),
-            m_parent(parent) {}
+            m_parent(tqparent) {}
         virtual void updateCurrent() {}
         virtual void updateData() { m_parent->slotUpdate(); }
         NowPlaying *m_parent;
@@ -75,9 +76,9 @@ class NowPlayingItem
 {
 public:
     virtual void update(const FileHandle &file) = 0;
-    NowPlaying *parent() const { return m_parent; }
+    NowPlaying *tqparent() const { return m_parent; }
 protected:
-    NowPlayingItem(NowPlaying *parent) : m_parent(parent) { parent->addItem(this); }
+    NowPlayingItem(NowPlaying *tqparent) : m_parent(tqparent) { tqparent->addItem(this); }
 private:
     NowPlaying *m_parent;
 };
@@ -90,7 +91,7 @@ private:
 class CoverItem : public TQLabel, public NowPlayingItem
 {
 public:
-    CoverItem(NowPlaying *parent);
+    CoverItem(NowPlaying *tqparent);
     virtual void update(const FileHandle &file);
     virtual void mouseReleaseEvent(TQMouseEvent *event);
 
@@ -114,7 +115,7 @@ private:
 class LinkLabel : public KActiveLabel
 {
 public:
-    LinkLabel(TQWidget *parent, const char *name = 0) : KActiveLabel(parent, name) {}
+    LinkLabel(TQWidget *tqparent, const char *name = 0) : KActiveLabel(tqparent, name) {}
     virtual void openLink(const TQString &) {}
 };
 
@@ -126,9 +127,10 @@ public:
 class TrackItem : public TQWidget, public NowPlayingItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TrackItem(NowPlaying *parent);
+    TrackItem(NowPlaying *tqparent);
     virtual void update(const FileHandle &file);
 
 private slots:
@@ -147,9 +149,10 @@ private:
 class HistoryItem : public LinkLabel, public NowPlayingItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    HistoryItem(NowPlaying *parent);
+    HistoryItem(NowPlaying *tqparent);
     virtual void update(const FileHandle &file);
     virtual void openLink(const TQString &link);