From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: 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 --- juk/collectionlist.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'juk/collectionlist.h') diff --git a/juk/collectionlist.h b/juk/collectionlist.h index 4143889c..82fa9c12 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -64,6 +64,7 @@ class CollectionList : public Playlist friend class CollectionListItem; Q_OBJECT + TQ_OBJECT public: /** @@ -80,7 +81,7 @@ public: */ TQStringList uniqueSet(UniqueSetType t) const; - CollectionListItem *lookup(const TQString &file) { return m_itemsDict.find(file); } + CollectionListItem *lookup(const TQString &file) { return m_itemsDict.tqfind(file); } virtual PlaylistItem *createItem(const FileHandle &file, TQListViewItem * = 0, @@ -95,7 +96,7 @@ public: virtual bool canReload() const { return true; } public slots: - virtual void paste() { decode(kapp->clipboard()->data()); } + virtual void paste() { decode(kapp->tqclipboard()->data()); } virtual void clear(); void slotCheckCache(); @@ -115,7 +116,7 @@ protected: // These methods are used by CollectionListItem, which is a friend class. - void addToDict(const TQString &file, CollectionListItem *item) { m_itemsDict.replace(file, item); } + void addToDict(const TQString &file, CollectionListItem *item) { m_itemsDict.tqreplace(file, item); } void removeFromDict(const TQString &file) { m_itemsDict.remove(file); } // These methods are also used by CollectionListItem, to manage the @@ -127,7 +128,7 @@ protected: void addWatched(const TQString &file) { m_dirWatch->addFile(file); } void removeWatched(const TQString &file) { m_dirWatch->removeFile(file); } - virtual bool hasItem(const TQString &file) const { return m_itemsDict.find(file); } + virtual bool hasItem(const TQString &file) const { return m_itemsDict.tqfind(file); } signals: void signalCollectionChanged(); @@ -171,8 +172,8 @@ public: virtual void refresh(); PlaylistItem *itemForPlaylist(const Playlist *playlist); void updateCollectionDict(const TQString &oldPath, const TQString &newPath); - void repaint() const; - PlaylistItemList children() const { return m_children; } + void tqrepaint() const; + PlaylistItemList tqchildren() const { return m_tqchildren; } protected: CollectionListItem(const FileHandle &file); @@ -191,7 +192,7 @@ protected: private: bool m_shuttingDown; - PlaylistItemList m_children; + PlaylistItemList m_tqchildren; }; #endif -- cgit v1.2.3