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, 7 insertions, 5 deletions

diff --git a/juk/playlistbox.h b/juk/playlistbox.h
index 482f4771..cc8159a2 100644
--- a/juk/playlistbox.h
+++ b/juk/playlistbox.h
@@ -41,6 +41,7 @@ typedef TQValueList<Playlist *> PlaylistList;
 class PlaylistBox : public KListView, public PlaylistCollection
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public: 
     class Item;
@@ -48,7 +49,7 @@ public:
 
     friend class Item;
 
-    PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
+    PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack,
 		const char *name = 0);
 
     virtual ~PlaylistBox();
@@ -65,7 +66,7 @@ public:
 
     Item *dropItem() const { return m_dropItem; }
 
-    void setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem = 0);
+    void setupPlaylist(Playlist *playlist, const TQString &iconName, Item *tqparentItem = 0);
 
 public slots:
     void paste();
@@ -141,8 +142,9 @@ class PlaylistBox::Item : public TQObject, public KListViewItem
     friend class TreeViewMode;
 
     Q_OBJECT
+  TQ_OBJECT
 
-    // moc won't let me create private TQObject subclasses and Qt won't let me
+    // tqmoc won't let me create private TQObject subclasses and TQt won't let me
     // make the destructor protected, so here's the closest hack that will
     // compile.
 
@@ -151,7 +153,7 @@ public:
     
 protected:
     Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l = 0);
-    Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l = 0);
+    Item(Item *tqparent, const TQString &icon, const TQString &text, Playlist *l = 0);
 
     Playlist *playlist() const { return m_playlist; }
     PlaylistBox *listView() const { return static_cast<PlaylistBox *>(KListViewItem::listView()); }
@@ -160,7 +162,7 @@ protected:
     void setSortedFirst(bool first = true) { m_sortedFirst = first; }
 
     virtual int compare(TQListViewItem *i, int col, bool) const;
-    virtual void paintCell(TQPainter *p, const TQColorGroup &colorGroup, int column, int width, int align);
+    virtual void paintCell(TQPainter *p, const TQColorGroup &tqcolorGroup, int column, int width, int align);
     virtual void paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {}
     virtual void setText(int column, const TQString &text);