Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

23 files changed, 68 insertions, 68 deletions

diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index 4e58f425..13b6d6b4 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -67,7 +67,7 @@ void CollectionList::initialize(PlaylistCollection *collection)
 
     // The CollectionList is created with sorting disabled for speed.  Re-enable
     // it here, and perform the sort.
-    KConfigGroup config(TDEGlobal::config(), "Playlists");
+    TDEConfigGroup config(TDEGlobal::config(), "Playlists");
     
     SortOrder order = Descending;
     if(config.readBoolEntry("CollectionListSortAscending", true))
@@ -252,7 +252,7 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
 
 CollectionList::~CollectionList()
 {
-    KConfigGroup config(TDEGlobal::config(), "Playlists");
+    TDEConfigGroup config(TDEGlobal::config(), "Playlists");
     config.writeEntry("CollectionListSortColumn", sortColumn());
     config.writeEntry("CollectionListSortAscending", sortOrder() == Ascending);
 
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index 8912b2fd..67958116 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -36,7 +36,7 @@
 DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
     : DeleteDialogBase(parent, name)
 {
-    KConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
+    TDEConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
 
     bool deleteInstead = messageGroup.readBoolEntry("deleteInsteadOfTrash", false);
     slotShouldDelete(deleteInstead);
@@ -101,7 +101,7 @@ void DeleteDialog::setFiles(const TQStringList &files)
 
 void DeleteDialog::accept()
 {
-    KConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
+    TDEConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
 
     // Save user's preference
 
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index b6777840..e21a484d 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -101,7 +101,7 @@ public:
 ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(),
     m_currentItem(0)
 {
-    KConfigGroup config(TDEGlobal::config(), "FileRenamer");
+    TDEConfigGroup config(TDEGlobal::config(), "FileRenamer");
 
     TQValueList<int> categoryOrder = config.readIntListEntry("CategoryOrder");
     unsigned categoryCount[NumTypes] = { 0 }; // Keep track of each category encountered.
@@ -260,7 +260,7 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) :
 void FileRenamerWidget::loadConfig()
 {
     TQValueList<int> checkedSeparators;
-    KConfigGroup config(TDEGlobal::config(), "FileRenamer");
+    TDEConfigGroup config(TDEGlobal::config(), "FileRenamer");
 
     for(unsigned i = 0; i < m_rows.count(); ++i)
         m_rows[i].options = TagRenamerOptions(m_rows[i].category);
@@ -282,7 +282,7 @@ void FileRenamerWidget::loadConfig()
 
 void FileRenamerWidget::saveConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "FileRenamer");
+    TDEConfigGroup config(TDEGlobal::config(), "FileRenamer");
     TQValueList<int> checkedSeparators;
     TQValueList<int> categoryOrder;
 
@@ -470,7 +470,7 @@ void FileRenamerWidget::addFolderSeparatorCheckbox()
 
 void FileRenamerWidget::createTagRows()
 {
-    KConfigGroup config(TDEGlobal::config(), "FileRenamer");
+    TDEConfigGroup config(TDEGlobal::config(), "FileRenamer");
     TQValueList<int> categoryOrder = config.readIntListEntry("CategoryOrder");
 
     if(categoryOrder.isEmpty())
@@ -916,7 +916,7 @@ bool FileRenamer::moveFile(const TQString &src, const TQString &dest)
         }
 
     // Move the file.
-    return KIO::NetAccess::file_move(srcURL, dstURL);
+    return TDEIO::NetAccess::file_move(srcURL, dstURL);
 }
 
 void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item)
diff --git a/juk/filerenamer.h b/juk/filerenamer.h
index 9c1910fa..c3858d76 100644
--- a/juk/filerenamer.h
+++ b/juk/filerenamer.h
@@ -84,7 +84,7 @@ typedef TQMap<CategoryID, TagRenamerOptions> CategoryOptionsMap;
 
 /**
  * An implementation of CategoryReaderInterface that reads the user's settings
- * from the global KConfig configuration object, and reads track information
+ * from the global TDEConfig configuration object, and reads track information
  * from whatever the given PlaylistItem is.  You can assign different
  * PlaylistItems in order to change the returned tag category information.
  *
@@ -150,7 +150,7 @@ public:
     static unsigned const MAX_CATEGORIES = 16;
 
     /**
-     * This function saves all of the category options to the global KConfig
+     * This function saves all of the category options to the global TDEConfig
      * object.  You must call this manually, FileRenamerWidget doesn't call it
      * automatically so that situations where the user hits "Cancel" work
      * correctly.
@@ -180,7 +180,7 @@ protected slots:
 private:
     /**
      * This function initializes the category options by loading the data from
-     * the global KConfig object.  This is called automatically in the constructor.
+     * the global TDEConfig object.  This is called automatically in the constructor.
      */
     void loadConfig();
 
@@ -500,7 +500,7 @@ public:
 
     /**
      * Renames the filename on disk of the file represented by item according
-     * to the user configuration stored in KConfig.
+     * to the user configuration stored in TDEConfig.
      *
      * @param item The item to rename.
      */
@@ -508,7 +508,7 @@ public:
 
     /**
      * Renames the filenames on disk of the files given in items according to
-     * the user configuration stored in KConfig.
+     * the user configuration stored in TDEConfig.
      *
      * @param items The items to rename.
      */
@@ -518,7 +518,7 @@ public:
      * Returns the file name that would be generated based on the options read from
      * interface, which must implement CategoryReaderInterface.  (A whole interface is used
      * so that we can re-use the code to generate filenames from a in-memory GUI and from
-     * KConfig).
+     * TDEConfig).
      *
      * @param interface object to read options/data from.
      */
diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp
index d40fd81c..0e13fe4f 100644
--- a/juk/filerenameroptions.cpp
+++ b/juk/filerenameroptions.cpp
@@ -140,7 +140,7 @@ void TagOptionsDialog::accept()
 
 void TagOptionsDialog::loadConfig()
 {
-    // Our m_options may not have been loaded from KConfig, force that to
+    // Our m_options may not have been loaded from TDEConfig, force that to
     // happen.
 
     CategoryID category(m_options.category(), m_categoryNumber);
diff --git a/juk/filerenameroptions.h b/juk/filerenameroptions.h
index 6cc91ed8..6d0d6cee 100644
--- a/juk/filerenameroptions.h
+++ b/juk/filerenameroptions.h
@@ -66,8 +66,8 @@ class TagOptionsDialog : public KDialogBase
 
     // Private methods
 
-    void loadConfig(); // Loads m_options from KConfig
-    void saveConfig(); // Saves m_options to KConfig
+    void loadConfig(); // Loads m_options from TDEConfig
+    void saveConfig(); // Saves m_options to TDEConfig
 
     // Private members
 
diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp
index 2b431cc8..a45678a3 100644
--- a/juk/gstreamerplayer.cpp
+++ b/juk/gstreamerplayer.cpp
@@ -141,7 +141,7 @@ void GStreamerPlayer::seekPosition(int position)
 
 void GStreamerPlayer::readConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "GStreamerPlayer");
+    TDEConfigGroup config(TDEGlobal::config(), "GStreamerPlayer");
     m_sinkName = config.readEntry("SinkName", TQString());
 }
 
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 60d69eae..69b65c0b 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -278,7 +278,7 @@ void JuK::keyPressEvent(TQKeyEvent *e)
 
 void JuK::readSettings()
 {
-    KConfigGroup config(TDEGlobal::config(), "Settings");
+    TDEConfigGroup config(TDEGlobal::config(), "Settings");
     m_showSplash = config.readBoolEntry("ShowSplashScreen", true);
     m_startDocked = config.readBoolEntry("StartDocked", false);
 }
@@ -287,7 +287,7 @@ void JuK::readConfig()
 {
     // player settings
 
-    KConfigGroup playerConfig(TDEGlobal::config(), "Player");
+    TDEConfigGroup playerConfig(TDEGlobal::config(), "Player");
 
     if(m_sliderAction->volumeSlider()) {
 	int maxVolume = m_sliderAction->volumeSlider()->maxValue();
@@ -310,7 +310,7 @@ void JuK::readConfig()
 
     // general settings
     
-    KConfigGroup settingsConfig(TDEGlobal::config(), "Settings");
+    TDEConfigGroup settingsConfig(TDEGlobal::config(), "Settings");
 
     bool dockInSystemTray = settingsConfig.readBoolEntry("DockInSystemTray", true);
     m_toggleSystemTrayAction->setChecked(dockInSystemTray);
@@ -331,7 +331,7 @@ void JuK::saveConfig()
 {
     // player settings
     
-    KConfigGroup playerConfig(TDEGlobal::config(), "Player");
+    TDEConfigGroup playerConfig(TDEGlobal::config(), "Player");
 
     if (m_sliderAction->volumeSlider())
     {
@@ -353,7 +353,7 @@ void JuK::saveConfig()
 
     // general settings
 
-    KConfigGroup settingsConfig(TDEGlobal::config(), "Settings");
+    TDEConfigGroup settingsConfig(TDEGlobal::config(), "Settings");
     settingsConfig.writeEntry("ShowSplashScreen", m_toggleSplashAction->isChecked());
     settingsConfig.writeEntry("StartDocked", m_startDocked);
     settingsConfig.writeEntry("DockInSystemTray", m_toggleSystemTrayAction->isChecked());
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index be469a6c..6b3d278a 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -82,7 +82,7 @@ KeyDialog::KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection,
 
     int selectedButton;
 
-    KConfigGroup config(TDEGlobal::config(), "Shortcuts");
+    TDEConfigGroup config(TDEGlobal::config(), "Shortcuts");
     selectedButton = config.readNumEntry("GlobalKeys", StandardKeys);
 
     // Create widgets for key chooser - widget stack used to replace key chooser
@@ -137,7 +137,7 @@ int KeyDialog::configure()
     int retcode = exec();
     if(retcode == Accepted) {
 
-	KConfigGroup config(TDEGlobal::config(), "Shortcuts");
+	TDEConfigGroup config(TDEGlobal::config(), "Shortcuts");
 	config.writeEntry("GlobalKeys", m_group->id(m_group->selected()));
 	TDEGlobal::config()->sync();
 
diff --git a/juk/main.cpp b/juk/main.cpp
index 24982a70..6fbb0930 100644
--- a/juk/main.cpp
+++ b/juk/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 
     bool startDocked;
 
-    KConfigGroup config(TDEGlobal::config(), "Settings");
+    TDEConfigGroup config(TDEGlobal::config(), "Settings");
     startDocked = config.readBoolEntry("StartDocked", false);
 
     if(!startDocked)
diff --git a/juk/mediafiles.cpp b/juk/mediafiles.cpp
index 8ed0d859..d105d1cd 100644
--- a/juk/mediafiles.cpp
+++ b/juk/mediafiles.cpp
@@ -146,7 +146,7 @@ TQStringList MediaFiles::convertURLsToLocal(const TQStringList &urlList, TQWidge
     KURL localUrl;
 
     for(TQStringList::ConstIterator it = urlList.constBegin(); it != urlList.constEnd(); ++it) {
-	localUrl = KIO::NetAccess::mostLocalURL(KURL::fromPathOrURL(*it), w);
+	localUrl = TDEIO::NetAccess::mostLocalURL(KURL::fromPathOrURL(*it), w);
 
 	if(!localUrl.isLocalFile())
 	    kdDebug(65432) << localUrl << " is not a local file, skipping.\n";
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 78b09d42..1125cdd6 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -195,7 +195,7 @@ void CoverItem::dropEvent(TQDropEvent *e)
     else if(KURLDrag::decode(e, urls)) {
         TQString fileName;
 
-        if(KIO::NetAccess::download(urls.front(), fileName, this)) {
+        if(TDEIO::NetAccess::download(urls.front(), fileName, this)) {
             if(image.load(fileName)) {
                 m_file.coverInfo()->setCover(image);
                 update(m_file);
@@ -203,7 +203,7 @@ void CoverItem::dropEvent(TQDropEvent *e)
             else
                 kdError(65432) << "Unable to load image from " << urls.front() << endl;
 
-            KIO::NetAccess::removeTempFile(fileName);
+            TDEIO::NetAccess::removeTempFile(fileName);
         }
         else
             kdError(65432) << "Unable to download " << urls.front() << endl;
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 1edf7330..a60d0c05 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -235,7 +235,7 @@ void Playlist::SharedSettings::apply(Playlist *l) const
 
 Playlist::SharedSettings::SharedSettings()
 {
-    KConfigGroup config(TDEGlobal::config(), "PlaylistShared");
+    TDEConfigGroup config(TDEGlobal::config(), "PlaylistShared");
 
     bool resizeColumnsManually = config.readBoolEntry("ResizeColumnsManually", false);
     action<KToggleAction>("resizeColumnsManually")->setChecked(resizeColumnsManually);
@@ -285,7 +285,7 @@ Playlist::SharedSettings::SharedSettings()
 
 void Playlist::SharedSettings::writeConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "PlaylistShared");
+    TDEConfigGroup config(TDEGlobal::config(), "PlaylistShared");
     config.writeEntry("ColumnOrder", m_columnOrder);
 
     TQValueList<int> l;
@@ -992,7 +992,7 @@ void Playlist::removeFromDisk(const PlaylistItemList &items)
 		    action("forward")->activate();
 
 		TQString removePath = (*it)->file().absFilePath();
-		if((!shouldDelete && KIO::NetAccess::synchronousRun(KIO::trash(removePath), this)) ||
+		if((!shouldDelete && TDEIO::NetAccess::synchronousRun(TDEIO::trash(removePath), this)) ||
 		   (shouldDelete && TQFile::remove(removePath)))
 		{
 		    CollectionList::instance()->clearItem((*it)->collectionItem());
@@ -1087,7 +1087,7 @@ void Playlist::decode(TQMimeSource *s, PlaylistItem *item)
 	if(urls.front().isLocalFile())
 	    file = urls.front().path();
 	else
-	    KIO::NetAccess::download(urls.front(), file, 0);
+	    TDEIO::NetAccess::download(urls.front(), file, 0);
 
 	KMimeType::Ptr mimeType = KMimeType::findByPath(file);
 
@@ -1097,7 +1097,7 @@ void Playlist::decode(TQMimeSource *s, PlaylistItem *item)
 			 item->file().tag()->album());
 	}
 
-        KIO::NetAccess::removeTempFile(file);
+        TDEIO::NetAccess::removeTempFile(file);
     }
 
     TQStringList fileList;
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index 17528917..94e1cd91 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -256,13 +256,13 @@ void PlaylistBox::removePlaylist(Playlist *playlist)
 
 void PlaylistBox::readConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "PlaylistBox");
+    TDEConfigGroup config(TDEGlobal::config(), "PlaylistBox");
     m_viewModeIndex = config.readNumEntry("ViewMode", 0);
 }
 
 void PlaylistBox::saveConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "PlaylistBox");
+    TDEConfigGroup config(TDEGlobal::config(), "PlaylistBox");
     config.writeEntry("ViewMode", action<KSelectAction>("viewModeMenu")->currentItem());
     TDEGlobal::config()->sync();
 }
@@ -672,7 +672,7 @@ void PlaylistBox::setupItem(Item *item)
 
 void PlaylistBox::setupUpcomingPlaylist()
 {
-    KConfigGroup config(TDEGlobal::config(), "Playlists");
+    TDEConfigGroup config(TDEGlobal::config(), "Playlists");
     bool enable = config.readBoolEntry("showUpcoming", false);
 
     setUpcomingPlaylistEnabled(enable);
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index b070b8a6..11c8a27a 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -811,7 +811,7 @@ void PlaylistCollection::newItems(const KFileItemList &list) const
 
 void PlaylistCollection::readConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "Playlists");
+    TDEConfigGroup config(TDEGlobal::config(), "Playlists");
 
     m_importPlaylists  = config.readBoolEntry("ImportPlaylists", true);
     m_folderList       = config.readPathListEntry("DirectoryList");
@@ -822,7 +822,7 @@ void PlaylistCollection::readConfig()
 
 void PlaylistCollection::saveConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "Playlists");
+    TDEConfigGroup config(TDEGlobal::config(), "Playlists");
     config.writeEntry("ImportPlaylists", m_importPlaylists);
     config.writeEntry("showUpcoming", action<KToggleAction>("showUpcoming")->isChecked());
     config.writePathEntry("DirectoryList", m_folderList);
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index feac5c24..613ee2cc 100644
--- a/juk/playlistsplitter.cpp
+++ b/juk/playlistsplitter.cpp
@@ -188,7 +188,7 @@ void PlaylistSplitter::setupLayout()
 
 void PlaylistSplitter::readConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "Splitter");
+    TDEConfigGroup config(TDEGlobal::config(), "Splitter");
 
     TQValueList<int> splitterSizes = config.readIntListEntry("PlaylistSplitterSizes");
     if(splitterSizes.isEmpty()) {
@@ -204,7 +204,7 @@ void PlaylistSplitter::readConfig()
 
 void PlaylistSplitter::saveConfig()
 {
-    KConfigGroup config(TDEGlobal::config(), "Splitter");
+    TDEConfigGroup config(TDEGlobal::config(), "Splitter");
     config.writeEntry("PlaylistSplitterSizes", sizes());
     config.writeEntry("ShowSearch", action<KToggleAction>("showSearch")->isChecked());
 }
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index 323274d8..0b4d041b 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -422,7 +422,7 @@ void TagEditor::readConfig()
 {
     // combo box completion modes
 	
-    KConfigGroup config(TDEGlobal::config(), "TagEditor");
+    TDEConfigGroup config(TDEGlobal::config(), "TagEditor");
     if(m_artistNameBox && m_albumNameBox) {
 	readCompletionMode(&config, m_artistNameBox, "ArtistNameBoxMode");
 	readCompletionMode(&config, m_albumNameBox, "AlbumNameBoxMode");
@@ -445,7 +445,7 @@ void TagEditor::readConfig()
     m_genreBox->completionObject()->setItems(m_genreList);
 }
 
-void TagEditor::readCompletionMode(KConfigBase *config, KComboBox *box, const TQString &key)
+void TagEditor::readCompletionMode(TDEConfigBase *config, KComboBox *box, const TQString &key)
 {
     TDEGlobalSettings::Completion mode =
 	TDEGlobalSettings::Completion(config->readNumEntry(key, TDEGlobalSettings::CompletionAuto));
@@ -457,7 +457,7 @@ void TagEditor::saveConfig()
 {
     // combo box completion modes
 
-    KConfigGroup config(TDEGlobal::config(), "TagEditor");
+    TDEConfigGroup config(TDEGlobal::config(), "TagEditor");
 
     if(m_artistNameBox && m_albumNameBox) {
 	config.writeEntry("ArtistNameBoxMode", m_artistNameBox->completionMode());
diff --git a/juk/tageditor.h b/juk/tageditor.h
index 5ea7a588..ee62c7b2 100644
--- a/juk/tageditor.h
+++ b/juk/tageditor.h
@@ -23,7 +23,7 @@ class KLineEdit;
 class KIntSpinBox;
 class KEdit;
 class KPushButton;
-class KConfigBase;
+class TDEConfigBase;
 
 class TQCheckBox;
 class TQBoxLayout;
@@ -62,7 +62,7 @@ private:
     void setupActions();
     void setupLayout();
     void readConfig();
-    void readCompletionMode(KConfigBase *config, KComboBox *box, const TQString &key);
+    void readCompletionMode(TDEConfigBase *config, KComboBox *box, const TQString &key);
     void saveConfig();
     void save(const PlaylistItemList &list);
     void saveChangesPrompt();
diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp
index 3881d124..57714842 100644
--- a/juk/tagguesser.cpp
+++ b/juk/tagguesser.cpp
@@ -93,7 +93,7 @@ TQString FileNameScheme::composeRegExp(const TQString &s) const
 {
     TQMap<TQChar, TQString> substitutions;
 
-    KConfigGroup config(TDEGlobal::config(), "TagGuesser");
+    TDEConfigGroup config(TDEGlobal::config(), "TagGuesser");
 
     substitutions[ 't' ] = config.readEntry("Title regexp", "([\\w\\s'&_,\\.]+)");
     substitutions[ 'a' ] = config.readEntry("Artist regexp", "([\\w\\s'&_,\\.]+)");
@@ -113,7 +113,7 @@ TQStringList TagGuesser::schemeStrings()
 {
     TQStringList schemes;
 
-    KConfigGroup config(TDEGlobal::config(), "TagGuesser");
+    TDEConfigGroup config(TDEGlobal::config(), "TagGuesser");
     schemes = config.readListEntry("Filename schemes");
 
     if ( schemes.isEmpty() ) {
@@ -150,9 +150,9 @@ TQStringList TagGuesser::schemeStrings()
 
 void TagGuesser::setSchemeStrings(const TQStringList &schemes)
 {
-    KConfig *cfg = kapp->config();
+    TDEConfig *cfg = kapp->config();
     {
-        KConfigGroupSaver saver(cfg, "TagGuesser");
+        TDEConfigGroupSaver saver(cfg, "TagGuesser");
         cfg->writeEntry("Filename schemes", schemes);
     }
     cfg->sync();
diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp
index 5003d616..b9b40fbb 100644
--- a/juk/tagrenameroptions.cpp
+++ b/juk/tagrenameroptions.cpp
@@ -64,7 +64,7 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
     // Make sure we don't use translated strings for the config file keys.
 
     TQString typeKey = tagTypeText(category.category, false);
-    KConfigGroup config(TDEGlobal::config(), "FileRenamer");
+    TDEConfigGroup config(TDEGlobal::config(), "FileRenamer");
 
     if(categoryNum > 0)
         typeKey.append(TQString::number(categoryNum));
@@ -115,7 +115,7 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
     if(categoryNum > 0)
         typeKey.append(TQString::number(categoryNum));
 
-    KConfigGroup config(TDEGlobal::config(), "FileRenamer");
+    TDEConfigGroup config(TDEGlobal::config(), "FileRenamer");
 
     config.writeEntry(TQString("%1Suffix").arg(typeKey), suffix());
     config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix());
diff --git a/juk/tagrenameroptions.h b/juk/tagrenameroptions.h
index 4c979fa0..56ff036e 100644
--- a/juk/tagrenameroptions.h
+++ b/juk/tagrenameroptions.h
@@ -89,7 +89,7 @@ public:
     TagRenamerOptions();
 
     /**
-     * Construct the options by loading from KConfig.
+     * Construct the options by loading from TDEConfig.
      *
      * @param category The category to load the options for.
      */
@@ -137,7 +137,7 @@ public:
     static TagType tagFromCategoryText(const TQString &text, bool translate = true);
 
     /**
-     * This saves the options to the global KConfig object.
+     * This saves the options to the global TDEConfig object.
      *
      * @param categoryNum The zero-based count of the number of this type of
      *           category.  For example, this would be 1 for the
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index f667d78b..303d53ab 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -171,12 +171,12 @@ TQPixmap WebImageFetcherDialog::pixmapFromURL(const KURL &url) const
 {
     TQString file;
 
-    if(KIO::NetAccess::download(url, file, 0)) {
+    if(TDEIO::NetAccess::download(url, file, 0)) {
         TQPixmap pixmap = TQPixmap(file);
-        KIO::NetAccess::removeTempFile(file);
+        TDEIO::NetAccess::removeTempFile(file);
         return pixmap;
     }
-    KIO::NetAccess::removeTempFile(file);
+    TDEIO::NetAccess::removeTempFile(file);
     return TQPixmap();
 }
 
@@ -196,10 +196,10 @@ CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image)
 
     // Start downloading the image.
 
-    m_job = KIO::get(image.thumbURL(), false, false);
-    connect(m_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(imageResult(KIO::Job *)));
-    connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-            this, TQT_SLOT(imageData(KIO::Job *, const TQByteArray &)));
+    m_job = TDEIO::get(image.thumbURL(), false, false);
+    connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(imageResult(TDEIO::Job *)));
+    connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+            this, TQT_SLOT(imageData(TDEIO::Job *, const TQByteArray &)));
 }
 
 CoverIconViewItem::~CoverIconViewItem()
@@ -215,14 +215,14 @@ CoverIconViewItem::~CoverIconViewItem()
     }
 }
 
-void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
+void CoverIconViewItem::imageData(TDEIO::Job *, const TQByteArray &data)
 {
     int currentSize = m_buffer.size();
     m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
     memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
 }
 
-void CoverIconViewItem::imageResult(KIO::Job *job)
+void CoverIconViewItem::imageResult(TDEIO::Job *job)
 {
     if(job->error())
         return;
diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h
index 40ff1b44..a3b60378 100644
--- a/juk/webimagefetcherdialog.h
+++ b/juk/webimagefetcherdialog.h
@@ -66,7 +66,7 @@ private:
     FileHandle m_file;
 };
 
-namespace KIO
+namespace TDEIO
 {
     class TransferJob;
 }
@@ -81,12 +81,12 @@ public:
     ~CoverIconViewItem();
 
 private slots:
-    void imageData(KIO::Job *job, const TQByteArray &data);
-    void imageResult(KIO::Job* job);
+    void imageData(TDEIO::Job *job, const TQByteArray &data);
+    void imageResult(TDEIO::Job* job);
 
 private:
     TQByteArray m_buffer;
-    TQGuardedPtr<KIO::TransferJob> m_job;
+    TQGuardedPtr<TDEIO::TransferJob> m_job;
 };
 
 #endif