1 files changed, 18 insertions, 18 deletions

diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index 5c06049a..2f005009 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -90,7 +90,7 @@ PlaylistItem *CollectionList::createItem(const FileHandle &file, TQListViewItem
     // It's probably possible to optimize the line below away, but, well, right
     // now it's more important to not load duplicate items.
 
-    if(m_itemsDict.find(file.absFilePath()))
+    if(m_itemsDict.tqfind(file.absFilePath()))
 	return 0;
 
     PlaylistItem *item = new CollectionListItem(file);
@@ -162,7 +162,7 @@ void CollectionList::slotRefreshItems(const KFileItemList &items)
 	    // If the item is no longer on disk, remove it from the collection.
 
 	    if(item->file().fileInfo().exists())
-		item->repaint();
+		item->tqrepaint();
 	    else
 		clearItem(item);
 	}
@@ -228,7 +228,7 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
     m_itemsDict(5003),
     m_columnTags(15, 0)
 {
-    new KAction(i18n("Show Playing"), KShortcut(), actions(), "showPlaying");
+    new KAction(i18n("Show Playing"), KShortcut(), ActionCollection::actions(), "showPlaying");
 
     connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying()));
 
@@ -284,9 +284,9 @@ void CollectionList::contentsDragMoveEvent(TQDragMoveEvent *e)
 TQString CollectionList::addStringToDict(const TQString &value, unsigned column)
 {
     if(column > m_columnTags.count() || value.stripWhiteSpace().isEmpty())
-	return TQString::null;
+	return TQString();
 
-    int *refCountPtr = m_columnTags[column]->find(value);
+    int *refCountPtr = m_columnTags[column]->tqfind(value);
     if(refCountPtr)
 	++(*refCountPtr);
     else {
@@ -336,7 +336,7 @@ void CollectionList::removeStringFromDict(const TQString &value, unsigned column
     if(column > m_columnTags.count() || value.isEmpty())
 	return;
 
-    int *refCountPtr = m_columnTags[column]->find(value);
+    int *refCountPtr = m_columnTags[column]->tqfind(value);
     if(refCountPtr) {
 	--(*refCountPtr);
 	if(*refCountPtr == 0) {
@@ -392,13 +392,13 @@ void CollectionListItem::refresh()
     file().coverInfo()->setCover();
 
     if(listView()->isVisible())
-	repaint();
+	tqrepaint();
 
-    for(PlaylistItemList::Iterator it = m_children.begin(); it != m_children.end(); ++it) {
+    for(PlaylistItemList::Iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) {
 	(*it)->playlist()->update();
 	(*it)->playlist()->dataChanged();
 	if((*it)->listView()->isVisible())
-	    (*it)->repaint();
+	    (*it)->tqrepaint();
     }
 
     CollectionList::instance()->dataChanged();
@@ -411,7 +411,7 @@ PlaylistItem *CollectionListItem::itemForPlaylist(const Playlist *playlist)
 	return this;
 
     PlaylistItemList::ConstIterator it;
-    for(it = m_children.begin(); it != m_children.end(); ++it)
+    for(it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
 	if((*it)->playlist() == playlist)
 	    return *it;
     return 0;
@@ -428,11 +428,11 @@ void CollectionListItem::updateCollectionDict(const TQString &oldPath, const TQS
     collection->addToDict(newPath, this);
 }
 
-void CollectionListItem::repaint() const
+void CollectionListItem::tqrepaint() const
 {
-    TQListViewItem::repaint();
-    for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
-	(*it)->repaint();
+    TQListViewItem::tqrepaint();
+    for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+	(*it)->tqrepaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -468,8 +468,8 @@ CollectionListItem::~CollectionListItem()
 {
     m_shuttingDown = true;
 
-    for(PlaylistItemList::ConstIterator it = m_children.begin();
-	it != m_children.end();
+    for(PlaylistItemList::ConstIterator it = m_tqchildren.begin();
+	it != m_tqchildren.end();
 	++it)
     {
         (*it)->playlist()->clearItem(*it);
@@ -486,13 +486,13 @@ CollectionListItem::~CollectionListItem()
 
 void CollectionListItem::addChildItem(PlaylistItem *child)
 {
-    m_children.append(child);
+    m_tqchildren.append(child);
 }
 
 void CollectionListItem::removeChildItem(PlaylistItem *child)
 {
     if(!m_shuttingDown)
-	m_children.remove(child);
+	m_tqchildren.remove(child);
 }
 
 bool CollectionListItem::checkCurrent()