deprecated--

svn path=/trunk/KDE/kdemultimedia/juk/; revision=506844

actioncollection.cpp

@@ -32,7 +32,7 @@ namespace ActionCollection
 #ifndef NO_DEBUG
         KAction *a = actions()->action(key);
         if(!a)
-            kdWarning(65432) << "KAction \"" << key << "\" is not defined yet." << endl;
+            kWarning(65432) << "KAction \"" << key << "\" is not defined yet." << endl;
         return a;
 #else
         return actions()->action(key);

akodeplayer.cpp

@@ -42,7 +42,7 @@ aKodePlayer::~aKodePlayer()
 
 void aKodePlayer::play(const FileHandle &file)
 {
-    kdDebug( 65432 ) << k_funcinfo << endl;
+    kDebug( 65432 ) << k_funcinfo << endl;
 
     if (file.isNull()) { // null FileHandle file means unpause
         if (paused())
@@ -54,7 +54,7 @@ void aKodePlayer::play(const FileHandle &file)
 
     QString filename = file.absFilePath();
 
-    kdDebug( 65432 ) << "Opening: " << filename << endl;
+    kDebug( 65432 ) << "Opening: " << filename << endl;
 
     if (m_player)
         m_player->stop();

artsplayer.cpp

@@ -64,7 +64,7 @@ ArtsPlayer::~ArtsPlayer()
 
 void ArtsPlayer::play(const FileHandle &file)
 {
-    // kdDebug(65432) << k_funcinfo << endl;
+    // kDebug(65432) << k_funcinfo << endl;
     // Make sure that the server still exists, if it doesn't a new one should
     // be started automatically and the factory and amanPlay are created again.
 
@@ -93,14 +93,14 @@ void ArtsPlayer::play(const FileHandle &file)
 
 void ArtsPlayer::pause()
 {
-    // kdDebug(65432) << k_funcinfo << endl;
+    // kDebug(65432) << k_funcinfo << endl;
     if(m_playobject)
         m_playobject->pause();
 }
 
 void ArtsPlayer::stop()
 {
-    // kdDebug(65432) << k_funcinfo << endl;
+    // kDebug(65432) << k_funcinfo << endl;
     if(m_playobject) {
         m_playobject->halt();
         delete m_playobject;
@@ -114,7 +114,7 @@ void ArtsPlayer::stop()
 
 void ArtsPlayer::setVolume(float volume)
 {
-    // kdDebug( 65432 ) << k_funcinfo << endl;
+    // kDebug( 65432 ) << k_funcinfo << endl;
 
     m_currentVolume = volume;
 
@@ -123,7 +123,7 @@ void ArtsPlayer::setVolume(float volume)
             setupVolumeControl();
         if(!m_volumeControl.isNull()) {
             m_volumeControl.scaleFactor(volume);
-            // kdDebug( 65432 ) << "set volume to " << volume << endl;
+            // kDebug( 65432 ) << "set volume to " << volume << endl;
         }
     }
 }
@@ -220,7 +220,7 @@ void ArtsPlayer::seekPosition(int position)
 
 void ArtsPlayer::setupArtsObjects()
 {
-    // kdDebug( 65432 ) << k_funcinfo << endl;
+    // kDebug( 65432 ) << k_funcinfo << endl;
     delete m_factory;
     delete m_amanPlay;
     m_volumeControl = Arts::StereoVolumeControl::null();
@@ -241,7 +241,7 @@ void ArtsPlayer::setupArtsObjects()
 
 void ArtsPlayer::playObjectCreated()
 {
-    // kdDebug(65432) << k_funcinfo << endl;
+    // kDebug(65432) << k_funcinfo << endl;
     setVolume(m_currentVolume);
 }
 
@@ -255,7 +255,7 @@ void ArtsPlayer::setupPlayer()
 
 void ArtsPlayer::setupVolumeControl()
 {
-    // kdDebug( 65432 ) << k_funcinfo << endl;
+    // kDebug( 65432 ) << k_funcinfo << endl;
     m_volumeControl = Arts::DynamicCast(m_server->server().createObject("Arts::StereoVolumeControl"));
     if(!m_volumeControl.isNull() && !m_playobject->isNull() && !m_playobject->object().isNull()) {
         Arts::Synth_AMAN_PLAY ap = m_amanPlay->amanPlay();
@@ -271,11 +271,11 @@ void ArtsPlayer::setupVolumeControl()
         Arts::connect(po, "right", m_volumeControl, "inright");
         Arts::connect(m_volumeControl, "outleft" , ap, "left" );
         Arts::connect(m_volumeControl, "outright", ap, "right");
-        // kdDebug( 65432 ) << "connected volume control" << endl;
+        // kDebug( 65432 ) << "connected volume control" << endl;
     }
     else {
         m_volumeControl = Arts::StereoVolumeControl::null();
-        kdDebug(65432) << "Could not initialize volume control!" << endl;
+        kDebug(65432) << "Could not initialize volume control!" << endl;
     }
 }
 

collectionlist.cpp

@@ -100,7 +100,7 @@ PlaylistItem *CollectionList::createItem(const FileHandle &file, Q3ListViewItem
     PlaylistItem *item = new CollectionListItem(file);
     
     if(!item->isValid()) {
-	kdError() << "CollectinList::createItem() -- A valid tag was not created for \""
+	kError() << "CollectinList::createItem() -- A valid tag was not created for \""
 		  << file.absFilePath() << "\"" << endl;
 	delete item;
 	return 0;
@@ -125,7 +125,7 @@ void CollectionList::setupTreeViewEntries(ViewMode *viewMode) const
 {
     TreeViewMode *treeViewMode = dynamic_cast<TreeViewMode *>(viewMode);
     if(!treeViewMode) {
-	kdWarning(65432) << "Can't setup entries on a non-tree-view mode!\n";
+	kWarning(65432) << "Can't setup entries on a non-tree-view mode!\n";
 	return;
     }
 
@@ -458,10 +458,10 @@ CollectionListItem::CollectionListItem(const FileHandle &file) :
 	    // l->addWatched(m_path);
 	}
 	else
-	    kdError() << "CollectionListItem::CollectionListItem() -- Tag() could not be created." << endl;
+	    kError() << "CollectionListItem::CollectionListItem() -- Tag() could not be created." << endl;
     }
     else
-	kdError(65432) << "CollectionListItems should not be created before "
+	kError(65432) << "CollectionListItems should not be created before "
 		       << "CollectionList::initialize() has been called." << endl;
 
     SplashScreen::increment();

coverdialog.cpp

@@ -140,12 +140,12 @@ void CoverDialog::removeSelectedCover()
     CoverIconViewItem *coverItem = m_covers->currentItem();
 
     if(!coverItem || !coverItem->isSelected()) {
-        kdWarning(65432) << "No item selected for removeSelectedCover.\n";
+        kWarning(65432) << "No item selected for removeSelectedCover.\n";
         return;
     }
 
     if(!CoverManager::removeCover(coverItem->id()))
-        kdError(65432) << "Unable to remove selected cover: " << coverItem->id() << endl;
+        kError(65432) << "Unable to remove selected cover: " << coverItem->id() << endl;
     else
         delete coverItem;
 }

coverinfo.cpp

@@ -231,7 +231,7 @@ QString CoverInfo::coverLocation(CoverSize size) const
 bool CoverInfo::convertOldStyleCover() const
 {
     // Ah, old-style cover.  Let's transfer it to the new system.
-    kdDebug() << "Found old style cover for " << m_file.absFilePath() << endl;
+    kDebug() << "Found old style cover for " << m_file.absFilePath() << endl;
 
     QString artist = m_file.tag()->artist();
     QString album = m_file.tag()->album();
@@ -244,7 +244,7 @@ bool CoverInfo::convertOldStyleCover() const
         return true;
     }
     else {
-        kdDebug() << "We were unable to replace the old style cover.\n";
+        kDebug() << "We were unable to replace the old style cover.\n";
         return false;
     }
 }

covermanager.cpp

@@ -139,17 +139,17 @@ void CoverManagerPrivate::createDataDir() const
 
 void CoverManagerPrivate::saveCovers() const
 {
-    kdDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo << endl;
 
     // Make sure the directory exists first.
     createDataDir();
 
     QFile file(coverLocation());
 
-    kdDebug() << "Opening covers db: " << coverLocation() << endl;
+    kDebug() << "Opening covers db: " << coverLocation() << endl;
 
     if(!file.open(QIODevice::WriteOnly)) {
-        kdError() << "Unable to save covers to disk!\n";
+        kError() << "Unable to save covers to disk!\n";
         return;
     }
 
@@ -176,7 +176,7 @@ void CoverManagerPrivate::saveCovers() const
 
 void CoverManagerPrivate::loadCovers()
 {
-    kdDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo << endl;
 
     QFile file(coverLocation());
 
@@ -192,8 +192,8 @@ void CoverManagerPrivate::loadCovers()
     // Only version 0 is defined for now.
     in >> version;
     if(version > 0) {
-        kdError() << "Cover database was created by a higher version of JuK,\n";
-        kdError() << "I don't know what to do with it.\n";
+        kError() << "Cover database was created by a higher version of JuK,\n";
+        kError() << "I don't know what to do with it.\n";
 
         return;
     }
@@ -343,7 +343,7 @@ QPixmap CoverManager::coverFromData(const CoverData &coverData, Size size)
     // Check in cache for the pixmap.
     QPixmap *pix = data()->pixmapCache[path];
     if(pix) {
-        kdDebug(65432) << "Found pixmap in cover cache.\n";
+        kDebug(65432) << "Found pixmap in cover cache.\n";
         return *pix;
     }
 
@@ -367,13 +367,13 @@ QPixmap CoverManager::coverFromData(const CoverData &coverData, Size size)
 
 coverKey CoverManager::addCover(const QPixmap &large, const QString &artist, const QString &album)
 {
-    kdDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo << endl;
 
     coverKey id = data()->nextId();
     CoverDataPtr coverData(new CoverData);
 
     if(large.isNull()) {
-        kdDebug() << "The pixmap you're trying to add is NULL!\n";
+        kDebug() << "The pixmap you're trying to add is NULL!\n";
         return NoMatch;
     }
 
@@ -382,11 +382,11 @@ coverKey CoverManager::addCover(const QPixmap &large, const QString &artist, con
     QString ext = QString("/coverdb/coverID-%1.png").arg(id);
     coverData->path = KGlobal::dirs()->saveLocation("appdata") + ext;
 
-    kdDebug() << "Saving pixmap to " << coverData->path << endl;
+    kDebug() << "Saving pixmap to " << coverData->path << endl;
     data()->createDataDir();
 
     if(!large.save(coverData->path, "PNG")) {
-        kdError() << "Unable to save pixmap to " << coverData->path << endl;
+        kError() << "Unable to save pixmap to " << coverData->path << endl;
         return NoMatch;
     }
 

filerenamer.cpp

@@ -406,7 +406,7 @@ void FileRenamerWidget::createTagRows()
 
 void FileRenamerWidget::exampleTextChanged()
 {
-    kdDebug(65432) << k_funcinfo << endl;
+    kDebug(65432) << k_funcinfo << endl;
 
     // Just use .mp3 as an example
 
@@ -500,7 +500,7 @@ void FileRenamerWidget::moveItem(QWidget *l, MovementDirection direction)
     int pos = findIndex(l);
 
     if(pos < 0) {
-        kdError() << "Unable to find index for " << l << endl;
+        kError() << "Unable to find index for " << l << endl;
         return;
     }
 
@@ -688,7 +688,7 @@ void FileRenamerWidget::toggleCategory(int category)
     }
 
     if(!b) {
-        kdError() << "Unable to match category " << category << " to a check box!\n";
+        kError() << "Unable to match category " << category << " to a check box!\n";
         return;
     }
 
@@ -753,7 +753,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
 
 bool FileRenamer::moveFile(const QString &src, const QString &dest)
 {
-    kdDebug(65432) << "Moving file " << src << " to " << dest << endl;
+    kDebug(65432) << "Moving file " << src << " to " << dest << endl;
 
     if(src == dest)
         return false;
@@ -777,7 +777,7 @@ bool FileRenamer::moveFile(const QString &src, const QString &dest)
     // Create the directory.
     if(!KStandardDirs::exists(dir.path()))
         if(!KStandardDirs::makeDir(dir.path())) {
-            kdError() << "Unable to create directory " << dir.path() << endl;
+            kError() << "Unable to create directory " << dir.path() << endl;
             return false;
         }
 
@@ -804,7 +804,7 @@ void FileRenamer::setFolderIcon(const KUrl &dst, const PlaylistItem *item)
     for(QStringList::ConstIterator it = elements.begin(); it != elements.end(); ++it) {
         path.append("/" + (*it));
 
-        kdDebug() << "Checking path: " << path << endl;
+        kDebug() << "Checking path: " << path << endl;
         if((*it).find(item->file().tag()->album()) != -1 &&
            !QFile::exists(path + "/.directory"))
         {

googlefetcher.cpp

@@ -96,7 +96,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
 
     if(!hasImageResults(search))
     {
-	kdDebug(65432) << "Search returned no results.\n";
+	kDebug(65432) << "Search returned no results.\n";
         emit signalNewSearch(m_imageList);
         return;
     }
@@ -133,7 +133,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
 	    DOM::Element tdElement = images.item(j);
 	    if(tdElement.isNull()) {
 		// Whoops....
-		kdError(65432) << "Expecting a <TD> in a <TR> parsing Google Images!\n";
+		kError(65432) << "Expecting a <TD> in a <TR> parsing Google Images!\n";
 		continue;
 	    }
 
@@ -141,7 +141,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
 	    // one anyways.
 	    DOM::Element imgElement = tdElement.getElementsByTagName("img").item(0);
 	    if(imgElement.isNull()) {
-		kdError(65432) << "Expecting a <IMG> in a <TD> parsing Google Images!\n";
+		kError(65432) << "Expecting a <IMG> in a <TD> parsing Google Images!\n";
 		continue;
 	    }
 
@@ -168,11 +168,11 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
     } // try
     catch (DOM::DOMException &e)
     {
-	kdError(65432) << "Caught DOM Exception: " << e.code << endl;
+	kError(65432) << "Caught DOM Exception: " << e.code << endl;
     }
     catch (...)
     {
-	kdError(65432) << "Caught unknown exception.\n";
+	kError(65432) << "Caught unknown exception.\n";
     }
 
     emit signalNewSearch(m_imageList);

juk.cpp

@@ -81,7 +81,7 @@ JuK::JuK(QWidget *parent, const char *name) :
 
 JuK::~JuK()
 {
-    kdDebug(65432) << k_funcinfo << endl;
+    kDebug(65432) << k_funcinfo << endl;
 }
 
 KActionCollection *JuK::actionCollection() const
@@ -371,7 +371,7 @@ bool JuK::queryExit()
 {
     m_startDocked = !isVisible();
 
-    kdDebug(65432) << k_funcinfo << endl;
+    kDebug(65432) << k_funcinfo << endl;
 
     hide();
 
@@ -389,7 +389,7 @@ bool JuK::queryExit()
 
 bool JuK::queryClose()
 {
-    kdDebug(65432) << k_funcinfo << endl;
+    kDebug(65432) << k_funcinfo << endl;
 
     if(!m_shuttingDown &&
        !kapp->sessionSaving() &&
@@ -423,7 +423,7 @@ void JuK::slotAboutToQuit()
 
 void JuK::slotQuit()
 {
-    kdDebug(65432) << k_funcinfo << endl;
+    kDebug(65432) << k_funcinfo << endl;
     m_shuttingDown = true;
 
     kapp->quit();

ktrm.cpp

@@ -418,7 +418,7 @@ int KTRMLookup::fileId() const
 
 void KTRMLookup::recognized()
 {
-    kdDebug() << k_funcinfo << d->file << endl;
+    kDebug() << k_funcinfo << d->file << endl;
 
     d->results.clear();
 
@@ -444,7 +444,7 @@ void KTRMLookup::recognized()
 
 void KTRMLookup::unrecognized()
 {
-    kdDebug() << k_funcinfo << d->file << endl;
+    kDebug() << k_funcinfo << d->file << endl;
 #if HAVE_TUNEPIMP >= 4
     char trm[255];
     bool finish = false;
@@ -469,12 +469,12 @@ void KTRMLookup::unrecognized()
 
 void KTRMLookup::collision()
 {
-    kdDebug() << k_funcinfo << d->file << endl;
+    kDebug() << k_funcinfo << d->file << endl;
 
     track_t track = tp_GetTrack(KTRMRequestHandler::instance()->tunePimp(), d->fileId);
 
     if(track <= 0) {
-        kdDebug() << "invalid track number" << endl;
+        kDebug() << "invalid track number" << endl;
         return;
     }
 
@@ -488,17 +488,17 @@ void KTRMLookup::collision()
 
         switch(type) {
         case eNone:
-            kdDebug() << k_funcinfo << "eNone" << endl;
+            kDebug() << k_funcinfo << "eNone" << endl;
             break;
         case eArtistList:
-            kdDebug() << "eArtistList" << endl;
+            kDebug() << "eArtistList" << endl;
             break;
         case eAlbumList:
-            kdDebug() << "eAlbumList" << endl;
+            kDebug() << "eAlbumList" << endl;
             break;
         case eTrackList:
         {
-            kdDebug() << "eTrackList" << endl;
+            kDebug() << "eTrackList" << endl;
             albumtrackresult_t **tracks = (albumtrackresult_t **) results;
             d->results.clear();
 
@@ -523,7 +523,7 @@ void KTRMLookup::collision()
             break;
         }
         case eMatchedTrack:
-            kdDebug() << k_funcinfo << "eMatchedTrack" << endl;
+            kDebug() << k_funcinfo << "eMatchedTrack" << endl;
             break;
         }
 
@@ -537,7 +537,7 @@ void KTRMLookup::collision()
 
 void KTRMLookup::error()
 {
-    kdDebug() << k_funcinfo << d->file << endl;
+    kDebug() << k_funcinfo << d->file << endl;
 
     d->results.clear();
     finished();

nowplaying.cpp

@@ -206,12 +206,12 @@ void CoverItem::dropEvent(QDropEvent *e)
                 update(m_file);
             }
             else
-                kdError(65432) << "Unable to load image from " << urls.front() << endl;
+                kError(65432) << "Unable to load image from " << urls.front() << endl;
 
             KIO::NetAccess::removeTempFile(fileName);
         }
         else
-            kdError(65432) << "Unable to download " << urls.front() << endl;
+            kError(65432) << "Unable to download " << urls.front() << endl;
     }
 }
 

playermanager.cpp

@@ -600,7 +600,7 @@ void PlayerManager::setup()
        !action("forward") ||
        !action("trackPositionAction"))
     {
-        kdWarning(65432) << k_funcinfo << "Could not find all of the required actions." << endl;
+        kWarning(65432) << k_funcinfo << "Could not find all of the required actions." << endl;
         return;
     }
 

playlist.cpp

@@ -758,7 +758,7 @@ void Playlist::slotRefresh()
 	(*it)->refreshFromDisk();
 
 	if(!(*it)->file().tag() || !(*it)->file().fileInfo().exists()) {
-	    kdDebug(65432) << "Error while trying to refresh the tag.  "
+	    kDebug(65432) << "Error while trying to refresh the tag.  "
 			   << "This file has probably been removed."
 			   << endl;
 	    delete (*it)->collectionItem();
@@ -1772,7 +1772,7 @@ void Playlist::calculateColumnWeights()
     for(columnIt = m_weightDirty.begin(); columnIt != m_weightDirty.end(); ++columnIt) {
 	m_columnWeights[*columnIt] = int(sqrt(averageWidth[*columnIt]) + 0.5);
 
-	//  kdDebug(65432) << k_funcinfo << "m_columnWeights[" << *columnIt << "] == "
+	//  kDebug(65432) << k_funcinfo << "m_columnWeights[" << *columnIt << "] == "
 	//                 << m_columnWeights[*columnIt] << endl;
     }
 
@@ -1844,7 +1844,7 @@ void Playlist::addFile(const QString &file, FileHandleList &files, bool importPl
 	    ::closedir(dir);
 	}
 	else {
-	    kdWarning(65432) << "Unable to open directory "
+	    kWarning(65432) << "Unable to open directory "
 	                     << fileInfo.filePath()
 			     << ", make sure it is readable.\n";
 	}
@@ -2130,7 +2130,7 @@ void Playlist::slotShowRMBMenu(Q3ListViewItem *item, const QPoint &point, int co
 
 void Playlist::slotRenameTag()
 {
-    // kdDebug(65432) << "Playlist::slotRenameTag()" << endl;
+    // kDebug(65432) << "Playlist::slotRenameTag()" << endl;
 
     // setup completions and validators
 

playlist.h

@@ -725,7 +725,7 @@ ItemType *Playlist::createItem(const FileHandle &file, Q3ListViewItem *after,
 	// If a valid tag was not created, destroy the CollectionListItem.
 
 	if(!item->isValid()) {
-	    kdError(65432) << "Playlist::createItem() -- A valid tag was not created for \""
+	    kError(65432) << "Playlist::createItem() -- A valid tag was not created for \""
 			   << file.absFilePath() << "\"" << endl;
 	    delete item;
 	    return 0;

playlistbox.cpp

@@ -240,7 +240,7 @@ void PlaylistBox::setupPlaylist(Playlist *playlist, const QString &iconName)
     PlaylistCollection::setupPlaylist(playlist, iconName);
     connect(playlist, SIGNAL(signalPlaylistItemsDropped(Playlist *)), SLOT(slotPlaylistItemsDropped(Playlist *)));
     if(iconName == "today") {
-	kdDebug(65432) << "Setting up upcoming playlist after Collection List\n";
+	kDebug(65432) << "Setting up upcoming playlist after Collection List\n";
 	new Item(this, iconName, playlist->name(), playlist, m_playlistDict[CollectionList::instance()]);
     }
     else
@@ -377,7 +377,7 @@ void PlaylistBox::slotTreeViewPlaylistDestroyed(Playlist *p)
 
 void PlaylistBox::slotSavePlaylists()
 {
-    kdDebug(65432) << "Auto-saving playlists.\n";
+    kDebug(65432) << "Auto-saving playlists.\n";
 
     PlaylistList l;
     CollectionList *collection = CollectionList::instance();
@@ -394,7 +394,7 @@ void PlaylistBox::slotSavePlaylists()
 void PlaylistBox::slotShowDropTarget()
 {
     if(!m_dropItem) {
-	kdError(65432) << "Trying to show the playlist of a null item!\n";
+	kError(65432) << "Trying to show the playlist of a null item!\n";
 	return;
     }
 

playlistcollection.cpp

@@ -326,7 +326,7 @@ void PlaylistCollection::open(const QString &playlist, const QStringList &files)
 
 void PlaylistCollection::addFolder()
 {
-    kdDebug(65432) << k_funcinfo << endl;
+    kDebug(65432) << k_funcinfo << endl;
     DirectoryList l(m_folderList, m_importPlaylists, widget, "directoryList");
     DirectoryList::Result result = l.exec();
 

searchplaylist.cpp

@@ -69,7 +69,7 @@ void SearchPlaylist::updateItems()
             newItems.append((*it)->collectionItem());
     }
 
-    // kdDebug(65432) << k_funcinfo << "newItems.size() == " << newItems.size() << endl;
+    // kDebug(65432) << k_funcinfo << "newItems.size() == " << newItems.size() << endl;
 
     for(Q3PtrDictIterator<PlaylistItem> it(oldItems); it.current(); ++it)
         clearItem(it.current(), false);
@@ -80,7 +80,7 @@ void SearchPlaylist::updateItems()
     createItems(newItems);
 
     if(synchronizePlaying()) {
-        kdDebug(65432) << k_funcinfo << "synchronizing playing" << endl;
+        kDebug(65432) << k_funcinfo << "synchronizing playing" << endl;
         synchronizePlayingItems(m_search.playlists(), true);
     }
 }

tag.cpp

@@ -67,7 +67,7 @@ Tag::Tag(const QString &fileName) :
     }
 #ifdef TAGLIB_1_3
     else if(MediaFiles::isMPC(fileName)) {
-        kdDebug(65432) << "Trying to resolve Musepack file" << endl;
+        kDebug(65432) << "Trying to resolve Musepack file" << endl;
         TagLib::MPC::File file(QFile::encodeName(fileName).data());
         if(file.isOpen())
             setup(&file);
@@ -87,7 +87,7 @@ Tag::Tag(const QString &fileName) :
     }
 
     else {
-        kdError(65432) << "Couldn't resolve the mime type of \"" <<
+        kError(65432) << "Couldn't resolve the mime type of \"" <<
             fileName << "\" -- this shouldn't happen." << endl;
     }
 }
@@ -130,7 +130,7 @@ bool Tag::save()
 #endif
     }
     else {
-        kdError(65432) << "Couldn't save file." << endl;
+        kError(65432) << "Couldn't save file." << endl;
         result = false;
     }
 

tagrenameroptions.cpp

@@ -93,8 +93,8 @@ QString TagRenamerOptions::tagTypeText(TagType type, bool translate)
     };
 
     if(type < StartTag || type >= NumTypes) {
-        kdWarning() << "I don't know what category we're looking up, this is a problem." << endl;
-        kdWarning() << "The category ID is " << (unsigned) type << endl;
+        kWarning() << "I don't know what category we're looking up, this is a problem." << endl;
+        kWarning() << "The category ID is " << (unsigned) type << endl;
         return translate ? i18n("Unknown") : "Unknown";
     }
 

tagtransactionmanager.cpp

@@ -71,7 +71,7 @@ TagTransactionManager *TagTransactionManager::instance()
 void TagTransactionManager::changeTagOnItem(PlaylistItem *item, Tag *newTag)
 {
     if(!item) {
-        kdWarning(65432) << "Trying to change tag on null PlaylistItem.\n";
+        kWarning(65432) << "Trying to change tag on null PlaylistItem.\n";
         return;
     }
 
@@ -110,7 +110,7 @@ void TagTransactionManager::forget()
 
 bool TagTransactionManager::undo()
 {
-    kdDebug(65432) << "Undoing " << m_undoList.count() << " changes.\n";
+    kDebug(65432) << "Undoing " << m_undoList.count() << " changes.\n";
 
     forget();  // Scrap our old changes (although the list should be empty
                // anyways.
@@ -139,7 +139,7 @@ bool TagTransactionManager::renameFile(const QFileInfo &from, const QFileInfo &t
            i18n("This file already exists.\nDo you want to replace it?"),
            i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue)
    {
-       kdDebug(65432) << "Renaming " << from.absFilePath() << " to " << to.absFilePath() << endl;
+       kDebug(65432) << "Renaming " << from.absFilePath() << " to " << to.absFilePath() << endl;
        QDir currentDir;
        return currentDir.rename(from.absFilePath(), to.absFilePath());
    }

tracksequenceiterator.cpp

@@ -186,7 +186,7 @@ void DefaultSequenceIterator::playlistChanged()
 void DefaultSequenceIterator::itemAboutToDie(const PlaylistItem *item)
 {
     PlaylistItem *stfu_gcc = const_cast<PlaylistItem *>(item);
-    kdDebug(65432) << "Removing " << item << " from random list.\n";
+    kDebug(65432) << "Removing " << item << " from random list.\n";
     m_randomItems.remove(stfu_gcc);
 }
 
@@ -231,7 +231,7 @@ void DefaultSequenceIterator::refillRandomList()
     Playlist *p = current()->playlist();
 
     if(!p) {
-        kdError(65432) << k_funcinfo << "Item has no playlist!\n";
+        kError(65432) << k_funcinfo << "Item has no playlist!\n";
         return;
     }
 

treeviewitemplaylist.cpp

@@ -84,7 +84,7 @@ void TreeViewItemPlaylist::retag(const QStringList &files, Playlist *)
             break;
 
         default:
-            kdDebug() << "Unhandled column type editing " << *it << endl;
+            kDebug() << "Unhandled column type editing " << *it << endl;
         }
 
 	TagTransactionManager::instance()->changeTagOnItem(item, tag);

viewmode.cpp

@@ -302,7 +302,7 @@ void TreeViewMode::slotRemoveItem(const QString &item, unsigned column)
     else if(column == PlaylistItem::AlbumColumn)
         itemKey = "albums" + item;
     else {
-        kdWarning() << k_funcinfo << "Unhandled column type " << column << endl;
+        kWarning() << k_funcinfo << "Unhandled column type " << column << endl;
         return;
     }
 
@@ -331,7 +331,7 @@ void TreeViewMode::slotAddItems(const QStringList &items, unsigned column)
     else if(column == PlaylistItem::AlbumColumn)
         searchCategory = "albums";
     else {
-        kdWarning() << k_funcinfo << "Unhandled column type " << column << endl;
+        kWarning() << k_funcinfo << "Unhandled column type " << column << endl;
         return;
     }