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

diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h
index 3c7eecbd..92b5ea0d 100644
--- a/juk/playlistcollection.h
+++ b/juk/playlistcollection.h
@@ -66,7 +66,7 @@ public:
     virtual TQStringList playlists() const;
     virtual void createPlaylist(const TQString &name);
     virtual void createDynamicPlaylist(const PlaylistList &playlists);
-    virtual void showMore(const TQString &artist, const TQString &album = TQString::null);
+    virtual void showMore(const TQString &artist, const TQString &album = TQString());
     virtual void removeTrack(const TQString &playlist, const TQStringList &files);
 
     virtual TQString playlist() const;
@@ -166,7 +166,7 @@ protected:
     bool containsPlaylistFile(const TQString &file) const;
 
     TQString playlistNameDialog(const TQString &caption = i18n("Create New Playlist"),
-                               const TQString &suggest = TQString::null,
+                               const TQString &suggest = TQString(),
                                bool forceUnique = true) const;
     TQString uniquePlaylistName(const TQString &suggest = i18n("Playlist")) const;
 
@@ -207,9 +207,10 @@ private:
  * activations without requiring PlaylistCollection to be a TQObject.
  */
 
-class PlaylistCollection::ActionHandler : public QObject
+class PlaylistCollection::ActionHandler : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     ActionHandler(PlaylistCollection *collection);
 
@@ -217,7 +218,7 @@ private:
     KAction *createAction(const TQString &text,
                           const char *slot,
                           const char *name,
-                          const TQString &icon = TQString::null,
+                          const TQString &icon = TQString(),
                           const KShortcut &shortcut = KShortcut());
 private slots:
     void slotPlayFirst()     { m_collection->playFirst(); }