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

diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 2c30c692..6a248b39 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -158,7 +158,7 @@ TQStringList PlaylistCollection::playlists() const
     TQObjectList *childList = m_playlistStack->queryList("Playlist");
     TQObject *obj;
     for(obj = childList->first(); obj; obj = childList->next()) {
-        Playlist *p = static_cast<Playlist *>(obj);
+        Playlist *p = static_cast<Playlist *>(TQT_TQWIDGET(obj));
         l.append(p->name());
     }
 
@@ -223,7 +223,7 @@ void PlaylistCollection::showMore(const TQString &artist, const TQString &album)
     // so cache the value we want it to have now.
     Playlist *belowShowMore = visiblePlaylist();
 
-    PlaylistCollection::setupPlaylist(m_showMorePlaylist, TQString::null);
+    PlaylistCollection::setupPlaylist(m_showMorePlaylist, TQString());
     PlaylistCollection::raise(m_showMorePlaylist);
 
     m_belowShowMorePlaylist = belowShowMore;
@@ -252,12 +252,12 @@ void PlaylistCollection::removeTrack(const TQString &playlist, const TQStringLis
 
 TQString PlaylistCollection::playlist() const
 {
-    return visiblePlaylist() ? visiblePlaylist()->name() : TQString::null;
+    return visiblePlaylist() ? visiblePlaylist()->name() : TQString();
 }
 
 TQString PlaylistCollection::playingPlaylist() const
 {
-    return currentPlaylist() && m_playing ? currentPlaylist()->name() : TQString::null;
+    return currentPlaylist() && m_playing ? currentPlaylist()->name() : TQString();
 }
 
 void PlaylistCollection::setPlaylist(const TQString &playlist)
@@ -281,7 +281,7 @@ TQString PlaylistCollection::trackProperty(const TQString &file, const TQString
     CollectionList *l = CollectionList::instance();
     CollectionListItem *item = l->lookup(file);
 
-    return item ? item->file().property(property) : TQString::null;
+    return item ? item->file().property(property) : TQString();
 }
 
 TQPixmap PlaylistCollection::trackCover(const TQString &file, const TQString &size) const
@@ -320,7 +320,7 @@ void PlaylistCollection::open(const TQStringList &l)
        KMessageBox::questionYesNo(
            widget,
            i18n("Do you want to add these items to the current list or to the collection list?"),
-           TQString::null,
+           TQString(),
            KGuiItem(i18n("Current")),
            KGuiItem(i18n("Collection"))) == KMessageBox::No)
     {
@@ -509,7 +509,7 @@ void PlaylistCollection::createFolderPlaylist()
     if(folder.isEmpty())
         return;
 
-    TQString name = uniquePlaylistName(folder.mid(folder.findRev('/') + 1));
+    TQString name = uniquePlaylistName(folder.mid(folder.tqfindRev('/') + 1));
     name = playlistNameDialog(i18n("Create Folder Playlist"), name);
 
     if(!name.isNull())
@@ -681,7 +681,7 @@ bool PlaylistCollection::importPlaylists() const
 
 bool PlaylistCollection::containsPlaylistFile(const TQString &file) const
 {
-    return m_playlistFiles.contains(file);
+    return m_playlistFiles.tqcontains(file);
 }
 
 bool PlaylistCollection::showMoreActive() const
@@ -706,7 +706,7 @@ void PlaylistCollection::clearShowMore(bool raisePlaylist)
 
 void PlaylistCollection::enableDirWatch(bool enable)
 {
-    TQObject *collection = CollectionList::instance();
+    TQObject *collection = TQT_TQOBJECT(CollectionList::instance());
 
     m_dirLister.disconnect(object());
     if(enable) {
@@ -731,7 +731,7 @@ TQString PlaylistCollection::playlistNameDialog(const TQString &caption,
         forceUnique ? uniquePlaylistName(suggest) : suggest,
         &ok);
 
-    return ok ? uniquePlaylistName(name) : TQString::null;
+    return ok ? uniquePlaylistName(name) : TQString();
 }
 
 
@@ -740,18 +740,18 @@ TQString PlaylistCollection::uniquePlaylistName(const TQString &suggest) const
     if(suggest.isEmpty())
         return uniquePlaylistName();
 
-    if(!m_playlistNames.contains(suggest))
+    if(!m_playlistNames.tqcontains(suggest))
         return suggest;
 
     TQString base = suggest;
     base.remove(TQRegExp("\\s\\([0-9]+\\)$"));
 
     int count = 1;
-    TQString s = TQString("%1 (%2)").arg(base).arg(count);
+    TQString s = TQString("%1 (%2)").tqarg(base).tqarg(count);
 
-    while(m_playlistNames.contains(s)) {
+    while(m_playlistNames.tqcontains(s)) {
         count++;
-        s = TQString("%1 (%2)").arg(base).arg(count);
+        s = TQString("%1 (%2)").tqarg(base).tqarg(count);
     }
 
     return s;
@@ -789,7 +789,7 @@ Playlist *PlaylistCollection::playlistByName(const TQString &name) const
     TQObject *obj;
 
     for(obj = l->first(); obj; obj = l->next()) {
-        Playlist *p = static_cast<Playlist*>(obj);
+        Playlist *p = static_cast<Playlist*>(TQT_TQWIDGET(obj));
         if(p->name() == name) {
             list = p;
             break;
@@ -845,14 +845,14 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()),
                               "newPlaylist", "window_new", "CTRL+n"));
     menu->insert(createAction(i18n("&Search Playlist..."), TQT_SLOT(slotCreateSearchPlaylist()),
-                              "newSearchPlaylist", "find", "CTRL+f"));
+                              "newSearchPlaylist", "tqfind", "CTRL+f"));
     menu->insert(createAction(i18n("Playlist From &Folder..."), TQT_SLOT(slotCreateFolderPlaylist()),
                               "newDirectoryPlaylist", "fileopen", "CTRL+d"));
 
     // Guess tag info menu
 
 #if HAVE_MUSICBRAINZ
-    menu = new KActionMenu(i18n("&Guess Tag Information"), TQString::null, actions(), "guessTag");
+    menu = new KActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag");
     menu->setIconSet(SmallIconSet("wizard"));
 
     menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()),
@@ -882,7 +882,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     createAction(i18n("Refresh"),         TQT_SLOT(slotRefreshItems()), "refresh", "reload");
     createAction(i18n("&Rename File"),    TQT_SLOT(slotRenameItems()),  "renameFile", "filesaveas", "CTRL+r");
 
-    menu = new KActionMenu(i18n("Cover Manager"), TQString::null, actions(), "coverManager");
+    menu = new KActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager");
     menu->setIconSet(SmallIconSet("image"));
     menu->insert(createAction(i18n("&View Cover"),
         TQT_SLOT(slotViewCovers()), "viewCover", "viewmag"));