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

141 files changed, 450 insertions, 450 deletions

diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index a865119c..06090c80 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -126,7 +126,7 @@ protected slots:
 	void resetLayout();
 
 private:
-	KConfig *ksConfig;
+	TDEConfig *ksConfig;
 	ArtsControlAppletPrivate *p;
 };
 
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
diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp
index cd524c2b..3bab0768 100644
--- a/kaboodle/conf.cpp
+++ b/kaboodle/conf.cpp
@@ -39,7 +39,7 @@ Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name)
 	autoPlay = new TQCheckBox(i18n("Start playing automatically"), box);
 	quitAfterPlaying = new TQCheckBox(i18n("Quit when finished playing"), box);
 
-	KConfig &config = *TDEGlobal::config();
+	TDEConfig &config = *TDEGlobal::config();
 	config.setGroup("core");
 	autoPlay->setChecked(config.readBoolEntry("autoPlay", true));
 	quitAfterPlaying->setChecked(config.readBoolEntry("quitAfterPlaying", true));
@@ -47,7 +47,7 @@ Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name)
 
 void Kaboodle::Conf::accept(void)
 {
-	KConfig &config = *TDEGlobal::config();
+	TDEConfig &config = *TDEGlobal::config();
 	config.setGroup("core");
 	config.writeEntry("autoPlay", autoPlay->isChecked());
 	config.writeEntry("quitAfterPlaying", quitAfterPlaying->isChecked());
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index aa82479b..5deaad05 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -143,7 +143,7 @@ void Kaboodle::UserInterface::playerPreferences(void)
 void Kaboodle::UserInterface::applySettings(void)
 {
 	View *view = static_cast<View *>(part->view());
-	KConfig &config = *TDEGlobal::config();
+	TDEConfig &config = *TDEGlobal::config();
 	config.setGroup("core");
 	view->setAutoPlay(config.readBoolEntry("autoPlay", true));
 	view->setQuitAfterPlaying(config.readBoolEntry("quitAfterPlaying", true));
diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp
index 96c7810f..cc4d1ad5 100644
--- a/kaudiocreator/encoderconfigimp.cpp
+++ b/kaudiocreator/encoderconfigimp.cpp
@@ -130,10 +130,10 @@ void EncoderConfigImp::addEncoderSlot(){
       number++;
   }
 
-  if(KConfigDialog::showDialog(groupName.latin1()))
+  if(TDEConfigDialog::showDialog(groupName.latin1()))
     return;
 
-  KConfigDialog *dialog = new KConfigDialog(this, groupName.latin1(), EncoderPrefs::prefs(groupName), 
+  TDEConfigDialog *dialog = new TDEConfigDialog(this, groupName.latin1(), EncoderPrefs::prefs(groupName), 
                                             KDialogBase::Swallow,
                                             KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help);
   dialog->setCaption(i18n("Configure Encoder"));
@@ -168,7 +168,7 @@ void EncoderConfigImp::removeEncoderSlot(){
   TQString groupName = encoderNames[kcfg_currentEncoder->currentText()];
   kcfg_currentEncoder->removeItem(kcfg_currentEncoder->currentItem());
 
-  delete KConfigDialog::exists(groupName.latin1());
+  delete TDEConfigDialog::exists(groupName.latin1());
 
   EncoderPrefs::deletePrefs(groupName);
 }
@@ -186,14 +186,14 @@ void EncoderConfigImp::configureEncoderSlot() {
     return;
   }
   TQString groupName = encoderNames[kcfg_currentEncoder->currentText()];
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   if(!config.hasGroup(groupName))
     return;
 
-  if(KConfigDialog::showDialog(groupName.latin1()))
+  if(TDEConfigDialog::showDialog(groupName.latin1()))
     return;
 
-  KConfigDialog *dialog = new KConfigDialog(this, groupName.latin1(), EncoderPrefs::prefs(groupName),
+  TDEConfigDialog *dialog = new TDEConfigDialog(this, groupName.latin1(), EncoderPrefs::prefs(groupName),
                                             KDialogBase::Swallow,
                                             KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help);
   dialog->setCaption(i18n("Configure Encoder"));
@@ -272,13 +272,13 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName)
 
 bool EncoderPrefs::hasPrefs(const TQString &groupName)
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   return config.hasGroup(groupName);
 }
 
 void EncoderPrefs::deletePrefs(const TQString &groupName)
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   config.deleteGroup(groupName);
   if (!m_prefs)
     return;
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index c5db6337..df7a9fc6 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -224,7 +224,7 @@ void KAudioCreator::encodeFile(){
  * Show Settings dialog.
  */
 void KAudioCreator::showSettings(){
-    if(KConfigDialog::showDialog("settings"))
+    if(TDEConfigDialog::showDialog("settings"))
         return;
 
     SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self());
@@ -235,8 +235,8 @@ void KAudioCreator::showSettings(){
     dialog->show();
 }
 
-SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config)
- : KConfigDialog(parent, name, config),
+SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkeleton *config)
+ : TDEConfigDialog(parent, name, config),
  cddb(0), cddbChanged(false)
 {
     addPage(new General(0, "General"), i18n("General"), "package_settings",
@@ -248,7 +248,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleto
     KService::Ptr libkcddb = KService::serviceByDesktopName("libkcddb");
     if (libkcddb && libkcddb->isValid())
     {
-        cddb = KCModuleLoader::loadModule(TQString("libkcddb"), KCModuleLoader::Inline);
+        cddb = TDECModuleLoader::loadModule(TQString("libkcddb"), TDECModuleLoader::Inline);
         if (cddb)
         {
             cddb->load();
diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h
index 72d8f2bc..0ba8f6aa 100644
--- a/kaudiocreator/kaudiocreator.h
+++ b/kaudiocreator/kaudiocreator.h
@@ -29,7 +29,7 @@ class TracksImp;
 class JobQueImp;
 class Ripper;
 class Encoder;
-class KCModule;
+class TDECModule;
 class EncoderConfigImp;
 class KPopupMenu;
 
@@ -66,12 +66,12 @@ private:
 
 };
 
-class SettingsDialog: public KConfigDialog {
+class SettingsDialog: public TDEConfigDialog {
 Q_OBJECT
   
 
 public:
-  SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config);
+  SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkeleton *config);
 
 protected slots:
   void updateSettings();
@@ -87,7 +87,7 @@ public:
    EncoderConfigImp *encoderConfigImp;
 
 private:
-  KCModule *cddb;
+  TDECModule *cddb;
   bool      cddbChanged;
 };
 
diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp
index f68c1001..e2366fd7 100644
--- a/kaudiocreator/ripper.cpp
+++ b/kaudiocreator/ripper.cpp
@@ -49,16 +49,16 @@ void Ripper::loadSettings(){
  */
 Ripper::~Ripper(){
 	pendingJobs.clear();
-	TQMap<KIO::Job*, Job*>::Iterator it;
+	TQMap<TDEIO::Job*, Job*>::Iterator it;
 	for( it = jobs.begin(); it != jobs.end(); ++it ){
-		 KIO::Job* ioJob = it.key();
+		 TDEIO::Job* ioJob = it.key();
 		Job *job = it.data();
 		delete job;
 	
 		if(ioJob){
-			KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob*> (ioJob);
-			disconnect(copyJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(copyJobResult(KIO::Job*)));
-			disconnect(copyJob, TQT_SIGNAL(percent ( KIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( KIO::Job *, unsigned long)));
+			TDEIO::FileCopyJob *copyJob = static_cast<TDEIO::FileCopyJob*> (ioJob);
+			disconnect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*)));
+			disconnect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long)));
 			TQString fileDestination = (copyJob->destURL()).path();
 			copyJob->kill();
 			TQFile file( fileDestination );
@@ -89,10 +89,10 @@ int Ripper::pendingJobCount() {
  * @param id the id number of the job to remove.
  */
 void Ripper::removeJob(int id){
-	TQMap<KIO::Job*, Job*>::Iterator it;
+	TQMap<TDEIO::Job*, Job*>::Iterator it;
 	for( it = jobs.begin(); it != jobs.end(); ++it ){
 		if(it.data()->id == id){
-			KIO::FileCopyJob *copyJob = dynamic_cast<KIO::FileCopyJob*> (it.key());
+			TDEIO::FileCopyJob *copyJob = dynamic_cast<TDEIO::FileCopyJob*> (it.key());
 			if(copyJob){
 				TQString fileDestination = (copyJob->destURL()).path();
 				copyJob->kill();
@@ -182,10 +182,10 @@ void Ripper::tendToNewJobs(){
 	KURL source(wavFile);
 	KURL dest(tmp.name());
 
-	KIO::FileCopyJob *copyJob = new KIO::FileCopyJob(source, dest, 0644, false, true, false, false);
+	TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(source, dest, 0644, false, true, false, false);
 	jobs.insert(copyJob, job);
-	connect(copyJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(copyJobResult(KIO::Job*)));
-	connect(copyJob, TQT_SIGNAL(percent ( KIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( KIO::Job *, unsigned long)));
+	connect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*)));
+	connect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long)));
 	
 	emit jobsChanged();
 }
@@ -195,10 +195,10 @@ void Ripper::tendToNewJobs(){
  * information dialog.
  * @param copyjob the IO job to copy from
  */
-void Ripper::copyJobResult(KIO::Job *copyjob){
+void Ripper::copyJobResult(TDEIO::Job *copyjob){
 	if(!copyjob)
 		return;
-	KIO::FileCopyJob *copyJob = dynamic_cast<KIO::FileCopyJob*> (copyjob);
+	TDEIO::FileCopyJob *copyJob = dynamic_cast<TDEIO::FileCopyJob*> (copyjob);
 	KNotifyClient::event("track ripped");
 
 	if(jobs.find(copyjob) == jobs.end())
@@ -251,7 +251,7 @@ void Ripper::ejectNow(){
  * @param job the current ioslave job in progress
  * @param percent the current percent that the ioslave has done.
  */
-void Ripper::updateProgress( KIO::Job *job, unsigned long percent){
+void Ripper::updateProgress( TDEIO::Job *job, unsigned long percent){
 	if(job){
 		Job *ripJob = (jobs[job]);
 		if(ripJob)
diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h
index cec00ea2..3804b8ad 100644
--- a/kaudiocreator/ripper.h
+++ b/kaudiocreator/ripper.h
@@ -52,15 +52,15 @@ public slots:
 	void removeJob( int id );
 
 private slots:
-	void copyJobResult( KIO::Job *job );
-	void updateProgress( KIO::Job *job, unsigned long percent );
+	void copyJobResult( TDEIO::Job *job );
+	void updateProgress( TDEIO::Job *job, unsigned long percent );
 	void tendToNewJobs();
 	void ejectNow();
 
 private:
 	TQString deviceToEject;
 	// Jobs that we are currently doing.
-	TQMap<KIO::Job*, Job*> jobs;
+	TQMap<TDEIO::Job*, Job*> jobs;
 	// Jobs that we want to do , but haven't done yet
 	TQPtrList<Job> pendingJobs;
 };
diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp
index 51e4d6c1..7898be5a 100644
--- a/kioslave/audiocd/audiocd.cpp
+++ b/kioslave/audiocd/audiocd.cpp
@@ -56,7 +56,7 @@ extern "C"
 #include <client.h>
 #include "kcompactdisc.h"
 
-using namespace KIO;
+using namespace TDEIO;
 using namespace KCDDB;
 
 #define TQFL1(x) TQString::fromLatin1(x)
@@ -197,7 +197,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url)
 {
 	if (url.hasHost())
 	{
-		error(KIO::ERR_UNSUPPORTED_ACTION,
+		error(TDEIO::ERR_UNSUPPORTED_ACTION,
 		i18n("You cannot specify a host with this protocol. "
 				 "Please use the audiocd:/ format instead."));
 		return 0;
@@ -426,7 +426,7 @@ void AudioCDProtocol::get(const KURL & url)
 			found = true;
 		}
 		if( !found )
-			error(KIO::ERR_DOES_NOT_EXIST, url.path());
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 		cdda_close(drive);
 		return;
 	}
@@ -434,7 +434,7 @@ void AudioCDProtocol::get(const KURL & url)
 	long firstSector, lastSector;
 	if (!getSectorsForRequest(drive, firstSector, lastSector))
 	{
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 		cdda_close(drive);
 		return;
 	}
@@ -495,7 +495,7 @@ void AudioCDProtocol::stat(const KURL & url)
 		// does this track exist?
 		if (isFile && (trackNumber < 1 || trackNumber > d->tracks))
 		{
-			error(KIO::ERR_DOES_NOT_EXIST, url.path());
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 			return;
 		}
 	}
@@ -503,23 +503,23 @@ void AudioCDProtocol::stat(const KURL & url)
 	UDSEntry entry;
 
 	UDSAtom atom;
-	atom.m_uds = KIO::UDS_NAME;
+	atom.m_uds = TDEIO::UDS_NAME;
 	atom.m_str = url.fileName().replace('/', TQFL1("%2F"));
 	kdDebug(7117) << k_funcinfo << atom.m_str << endl;
 	entry.append(atom);
 
-	atom.m_uds = KIO::UDS_FILE_TYPE;
+	atom.m_uds = TDEIO::UDS_FILE_TYPE;
 	atom.m_long = isFile ? S_IFREG : S_IFDIR;
 	entry.append(atom);
 
 	const mode_t _umask = ::umask(0);
 	::umask(_umask);
 
-	atom.m_uds = KIO::UDS_ACCESS;
+	atom.m_uds = TDEIO::UDS_ACCESS;
 	atom.m_long = 0666 & (~_umask);
 	entry.append(atom);
 
-	atom.m_uds = KIO::UDS_SIZE;
+	atom.m_uds = TDEIO::UDS_SIZE;
 	if (!isFile)
 	{
 		atom.m_long = cdda_tracks(drive);
@@ -560,20 +560,20 @@ static void app_entry(UDSEntry& e, unsigned int uds, long l)
 static void app_dir(UDSEntry& e, const TQString & n, size_t s)
 {
 	e.clear();
-	app_entry(e, KIO::UDS_NAME, TQFile::decodeName(n.local8Bit()));
-	app_entry(e, KIO::UDS_FILE_TYPE, S_IFDIR);
-	app_entry(e, KIO::UDS_ACCESS, 0400);
-	app_entry(e, KIO::UDS_SIZE, s);
-	app_entry(e, KIO::UDS_MIME_TYPE, "inode/directory");
+	app_entry(e, TDEIO::UDS_NAME, TQFile::decodeName(n.local8Bit()));
+	app_entry(e, TDEIO::UDS_FILE_TYPE, S_IFDIR);
+	app_entry(e, TDEIO::UDS_ACCESS, 0400);
+	app_entry(e, TDEIO::UDS_SIZE, s);
+	app_entry(e, TDEIO::UDS_MIME_TYPE, "inode/directory");
 }
 
 static void app_file(UDSEntry& e, const TQString & n, size_t s)
 {
 	e.clear();
-	app_entry(e, KIO::UDS_NAME, TQFile::decodeName(n.local8Bit()));
-	app_entry(e, KIO::UDS_FILE_TYPE, S_IFREG);
-	app_entry(e, KIO::UDS_ACCESS, 0400);
-	app_entry(e, KIO::UDS_SIZE, s);
+	app_entry(e, TDEIO::UDS_NAME, TQFile::decodeName(n.local8Bit()));
+	app_entry(e, TDEIO::UDS_FILE_TYPE, S_IFREG);
+	app_entry(e, TDEIO::UDS_ACCESS, 0400);
+	app_entry(e, TDEIO::UDS_SIZE, s);
 }
 
 void AudioCDProtocol::listDir(const KURL & url)
@@ -585,13 +585,13 @@ void AudioCDProtocol::listDir(const KURL & url)
 		return;
 
 	if (d->which_dir == Unknown){
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 		cdda_close(drive);
 		return;
 	}
 
 	if ( !d->fname.isEmpty() ){
-		error(KIO::ERR_IS_FILE, url.path());
+		error(TDEIO::ERR_IS_FILE, url.path());
 		cdda_close(drive);
 		return;
 	}
@@ -681,7 +681,7 @@ void AudioCDProtocol::listDir(const KURL & url)
 				case Info:
 				case Unknown:
 				default:
-					error(KIO::ERR_INTERNAL, url.path());
+					error(TDEIO::ERR_INTERNAL, url.path());
 					cdda_close(drive);
 					return;
 			}
@@ -752,12 +752,12 @@ struct cdrom_drive *AudioCDProtocol::getDrive()
 
 		TQFileInfo fi(d->device);
 		if(!fi.isReadable())
-			error(KIO::ERR_SLAVE_DEFINED, i18n("Device doesn't have read permissions for this account.  Check the read permissions on the device."));
+			error(TDEIO::ERR_SLAVE_DEFINED, i18n("Device doesn't have read permissions for this account.  Check the read permissions on the device."));
 		else if(!fi.isWritable())
-			error(KIO::ERR_SLAVE_DEFINED, i18n("Device doesn't have write permissions for this account.  Check the write permissions on the device."));
+			error(TDEIO::ERR_SLAVE_DEFINED, i18n("Device doesn't have write permissions for this account.  Check the write permissions on the device."));
 		else if(!fi.exists())
-			error(KIO::ERR_DOES_NOT_EXIST, d->device);
-		else error(KIO::ERR_SLAVE_DEFINED,
+			error(TDEIO::ERR_DOES_NOT_EXIST, d->device);
+		else error(TDEIO::ERR_SLAVE_DEFINED,
 i18n("Unknown error.  If you have a cd in the drive try running cdparanoia -vsQ as yourself (not root). Do you see a track list? If not, make sure you have permission to access the CD device. If you are using SCSI emulation (possible if you have an IDE CD writer) then make sure you check that you have read and write permissions on the generic SCSI device, which is probably /dev/sg0, /dev/sg1, etc.. If it still does not work, try typing audiocd:/?device=/dev/sg0 (or similar) to tell kio_audiocd which device your CD-ROM is."));
 		return 0;
 	}
@@ -765,7 +765,7 @@ i18n("Unknown error.  If you have a cd in the drive try running cdparanoia -vsQ
 	if (0 != cdda_open(drive))
 	{
 		kdDebug(7117) << "cdda_open failed" << endl;
-		error(KIO::ERR_CANNOT_OPEN_FOR_READING, d->device);
+		error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, d->device);
 		cdda_close(drive);
 		return 0;
 	}
@@ -984,7 +984,7 @@ void AudioCDProtocol::parseURLArgs(const KURL & url)
  */
 void AudioCDProtocol::loadSettings()
 {
-	KConfig *config = new KConfig(TQFL1("kcmaudiocdrc"), true /*readonly*/, false /*no kdeglobals*/);
+	TDEConfig *config = new TDEConfig(TQFL1("kcmaudiocdrc"), true /*readonly*/, false /*no kdeglobals*/);
 
 	config->setGroup(TQFL1("CDDA"));
 
@@ -1019,7 +1019,7 @@ void AudioCDProtocol::loadSettings()
 	d->rreplace = config->readEntry("regexp_replace");
 	// if the regular expressions are enclosed in qoutes. remove them
 	// otherwise it is not possible to search for a space " ", since an empty (only spaces) value is not 
-	// supported by KConfig, so the space has to be qouted, but then here the regexp searches really for " "
+	// supported by TDEConfig, so the space has to be qouted, but then here the regexp searches really for " "
 	// instead of just the space. Alex
 	TQRegExp qoutedString("^\".*\"$");
 	if (qoutedString.exactMatch(d->rsearch))
diff --git a/kioslave/audiocd/audiocd.h b/kioslave/audiocd/audiocd.h
index 45271b16..a96000fb 100644
--- a/kioslave/audiocd/audiocd.h
+++ b/kioslave/audiocd/audiocd.h
@@ -38,7 +38,7 @@ namespace AudioCD {
  * It has the iosalve login and the ripping logic. The actual encoding
  * is done by encoders that are seperate objects.
  */
-class AudioCDProtocol : public KIO::SlaveBase
+class AudioCDProtocol : public TDEIO::SlaveBase
 {
 	public:
 
diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
index df27fffb..683d46ab 100644
--- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
+++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AudiocdConfig</class>
-<widget class="KCModule">
+<widget class="TDECModule">
     <property name="name">
         <cstring>AudiocdConfig</cstring>
     </property>
diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index fbe758ba..adff68f3 100644
--- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -41,18 +41,18 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
 				
     setButtons(Default|Apply);
 
-    config = new KConfig("kcmaudiocdrc");
+    config = new TDEConfig("kcmaudiocdrc");
 
     TQPtrList<AudioCDEncoder> encoders;
     AudioCDEncoder::findAllPlugins(0, encoders);
     AudioCDEncoder *encoder;
     for ( encoder = encoders.first(); encoder; encoder = encoders.next() ){
       if (encoder->init()) {
-        KConfigSkeleton *config = NULL;
+        TDEConfigSkeleton *config = NULL;
         TQWidget *widget = encoder->getConfigureWidget(&config);
         if(widget && config){
 	   tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type()));
-             KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1());
+             TDEConfigDialogManager *configManager = new TDEConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1());
            encoderSettings.append(configManager);
         }
       }
@@ -60,7 +60,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
 
     load();
   
-    KConfigDialogManager *widget;
+    TDEConfigDialogManager *widget;
     for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
       connect(widget, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(slotModuleChanged()));
     }
@@ -135,7 +135,7 @@ void KAudiocdModule::save() {
   if (!configChanged ) return;
 
   {
-    KConfigGroupSaver saver(config, "CDDA");
+    TDEConfigGroupSaver saver(config, "CDDA");
 
     // autosearch is the name of the config option, which has the
     // reverse sense of the current text of the configuration option,
@@ -149,7 +149,7 @@ void KAudiocdModule::save() {
   }
   
   {
-    KConfigGroupSaver saver(config, "FileName");
+    TDEConfigGroupSaver saver(config, "FileName");
     config->writeEntry("file_name_template", fileNameLineEdit->text());
     config->writeEntry("album_name_template", albumNameLineEdit->text());
     config->writeEntry("regexp_example", example->text());
@@ -168,7 +168,7 @@ void KAudiocdModule::save() {
     config->writeEntry("regexp_replace", replaceOutput);
   }
 
-  KConfigDialogManager *widget;
+  TDEConfigDialogManager *widget;
   for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
     widget->updateSettings();
   }
@@ -188,7 +188,7 @@ void KAudiocdModule::load(bool useDefaults) {
 	config->setReadDefaults( useDefaults );
 
   {
-    KConfigGroupSaver saver(config, "CDDA");
+    TDEConfigGroupSaver saver(config, "CDDA");
 
 
     // Specify <=> not autosearch, as explained above in ::save()
@@ -200,7 +200,7 @@ void KAudiocdModule::load(bool useDefaults) {
   }
 
   {
-    KConfigGroupSaver saver(config, "FileName");
+    TDEConfigGroupSaver saver(config, "FileName");
     fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}"));
     albumNameLineEdit->setText(config->readEntry("album_name_template", "%{albumartist} - %{albumtitle}"));
     kcfg_replaceInput->setText(config->readEntry("regexp_search"));
@@ -208,7 +208,7 @@ void KAudiocdModule::load(bool useDefaults) {
     example->setText(config->readEntry("example", i18n("Cool artist - example audio file.wav")));
   }
   
-  KConfigDialogManager *widget;
+  TDEConfigDialogManager *widget;
   for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
     widget->updateWidgets();
   }
@@ -217,7 +217,7 @@ void KAudiocdModule::load(bool useDefaults) {
 }
 
 void KAudiocdModule::slotModuleChanged() {
-	KConfigDialogManager *widget;
+	TDEConfigDialogManager *widget;
 	for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
 		if(widget->hasChanged()){
 			slotConfigChanged();
@@ -259,7 +259,7 @@ TQString KAudiocdModule::quickHelp() const
 
 extern "C"
 {
-    KCModule *create_audiocd(TQWidget *parent, const char */*name*/)
+    TDECModule *create_audiocd(TQWidget *parent, const char */*name*/)
     {
         return new KAudiocdModule(parent, "kcmaudiocd");
     }
diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
index c12f2e3d..c9ec1bc7 100644
--- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
+++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
@@ -26,7 +26,7 @@
 #ifndef KAUDIOCDCONFIG_H
 #define KAUDIOCDCONFIG_H
 
-class KConfigDialogManager;
+class TDEConfigDialogManager;
 
 #include "audiocdconfig.h"
 class KAudiocdModule : public AudiocdConfig
@@ -54,12 +54,12 @@ private slots:
   void slotModuleChanged();
 
 private:
-  KConfig *config;
+  TDEConfig *config;
   bool configChanged;
 
   int getBitrateIndex(int value);
 
-  TQPtrList<KConfigDialogManager> encoderSettings;
+  TQPtrList<TDEConfigDialogManager> encoderSettings;
 };
 
 #endif // KAUDIOCDCONFIG_H
diff --git a/kioslave/audiocd/plugins/audiocdencoder.cpp b/kioslave/audiocd/plugins/audiocdencoder.cpp
index 6dfbec18..26c108b8 100644
--- a/kioslave/audiocd/plugins/audiocdencoder.cpp
+++ b/kioslave/audiocd/plugins/audiocdencoder.cpp
@@ -59,7 +59,7 @@ void *loadPlugin(const TQString &libFileName)
  * but I do know that this does work. :)  Feel free to improve the loading system,
  * there isn't much code anyway.
  */
-void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders){
+void AudioCDEncoder::findAllPlugins(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders){
     TQString foundEncoders;
 
     KStandardDirs standardDirs;
@@ -86,7 +86,7 @@ void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEnco
             fileName = fileName.mid(0, fileName.find('.'));
             void *function = loadPlugin(fileName);
             if(function){
-                void (*functionPointer)(KIO::SlaveBase *, TQPtrList<AudioCDEncoder> &) = (void (*)(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)) function;
+                void (*functionPointer)(TDEIO::SlaveBase *, TQPtrList<AudioCDEncoder> &) = (void (*)(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)) function;
                 functionPointer(slave, encoders);
             }
         } 
diff --git a/kioslave/audiocd/plugins/audiocdencoder.h b/kioslave/audiocd/plugins/audiocdencoder.h
index 0e8d3144..d582d548 100644
--- a/kioslave/audiocd/plugins/audiocdencoder.h
+++ b/kioslave/audiocd/plugins/audiocdencoder.h
@@ -23,7 +23,7 @@
 #include <kio/slavebase.h>
 #include <cdinfo.h>
 
-class KConfigSkeleton;
+class TDEConfigSkeleton;
 using namespace KCDDB;
 
 class AudioCDEncoder {
@@ -34,7 +34,7 @@ public:
    * @param slave parent that this classes can use to call data() with
    * when finished encoding bits.
    */ 
-  explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {};
+  explicit AudioCDEncoder(TDEIO::SlaveBase *slave) : ioslave(slave) {};
   
   /**
    * Deconstructor.
@@ -114,7 +114,7 @@ public:
   /**
    * Returns a configure widget for the encoder
    */ 
-  virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const
+  virtual TQWidget* getConfigureWidget(TDEConfigSkeleton** manager) const
                    { Q_UNUSED(manager); return NULL; }; 
  
   /**
@@ -130,14 +130,14 @@ public:
    * @param slave ioslave needed if the plugin is going to be used to encode something.
    * @param encoders container for new encoders.
    */
-  static void findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders);
+  static void findAllPlugins(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders);
 
 protected:
   /**
    * Pointer to the ioslave that is running this encoder.
    * Used (only?) for the data() function to pass back encoded data.
    */
-  KIO::SlaveBase *ioslave;
+  TDEIO::SlaveBase *ioslave;
 
 };
 
diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp
index c208e659..4c1329cd 100644
--- a/kioslave/audiocd/plugins/flac/encoderflac.cpp
+++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp
@@ -37,7 +37,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append(new EncoderFLAC(slave));
   }
@@ -48,7 +48,7 @@ class EncoderFLAC::Private {
 public:
     FLAC__StreamEncoder *encoder;
     FLAC__StreamMetadata** metadata;
-    KIO::SlaveBase* ioslave;
+    TDEIO::SlaveBase* ioslave;
     unsigned long data;
 };
 
@@ -86,7 +86,7 @@ static FLAC__SeekableStreamEncoderSeekStatus  SeekCallback(const FLAC__SeekableS
 
 
 
-EncoderFLAC::EncoderFLAC(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {
+EncoderFLAC::EncoderFLAC(TDEIO::SlaveBase *slave) : AudioCDEncoder(slave) {
     d = new Private();
     d->ioslave = slave;
     d->encoder = 0;
diff --git a/kioslave/audiocd/plugins/flac/encoderflac.h b/kioslave/audiocd/plugins/flac/encoderflac.h
index 9bec8bf4..e563e061 100644
--- a/kioslave/audiocd/plugins/flac/encoderflac.h
+++ b/kioslave/audiocd/plugins/flac/encoderflac.h
@@ -35,7 +35,7 @@
 class EncoderFLAC : public AudioCDEncoder {
 
 public:
-  EncoderFLAC(KIO::SlaveBase *slave);
+  EncoderFLAC(TDEIO::SlaveBase *slave);
   ~EncoderFLAC();
   
   virtual TQString type() const { return "FLAC"; };
diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp
index 6e3d3ff3..8984bb33 100644
--- a/kioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -37,7 +37,7 @@
 
 extern "C"
 {
-	KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) {
+	KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) {
 		encoders.append(new EncoderLame(slave));
 	}
 }
@@ -57,7 +57,7 @@ public:
 	KTempFile *tempFile;
 };
 
-EncoderLame::EncoderLame(KIO::SlaveBase *slave) : TQObject(), AudioCDEncoder(slave) {
+EncoderLame::EncoderLame(TDEIO::SlaveBase *slave) : TQObject(), AudioCDEncoder(slave) {
 	d = new Private();
 	d->waitingForWrite = false;
 	d->processHasExited = false;
@@ -69,7 +69,7 @@ EncoderLame::~EncoderLame(){
 	delete d;
 }
 
-TQWidget* EncoderLame::getConfigureWidget(KConfigSkeleton** manager) const {
+TQWidget* EncoderLame::getConfigureWidget(TDEConfigSkeleton** manager) const {
 	(*manager) = Settings::self();
 	TDEGlobal::locale()->insertCatalogue("audiocd_encoder_lame");
 	EncoderLameConfig *config = new EncoderLameConfig();
diff --git a/kioslave/audiocd/plugins/lame/encoderlame.h b/kioslave/audiocd/plugins/lame/encoderlame.h
index 5ef7d761..09c323c3 100644
--- a/kioslave/audiocd/plugins/lame/encoderlame.h
+++ b/kioslave/audiocd/plugins/lame/encoderlame.h
@@ -33,7 +33,7 @@ Q_OBJECT
   
 
 public:
-	EncoderLame(KIO::SlaveBase *slave);
+	EncoderLame(TDEIO::SlaveBase *slave);
 	~EncoderLame();
 
 	virtual TQString type() const { return "MP3"; };
@@ -48,7 +48,7 @@ public:
 	virtual long readCleanup();
 	virtual TQString lastErrorMessage() const;
 
-	virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const;
+	virtual TQWidget* getConfigureWidget(TDEConfigSkeleton** manager) const;
 
 protected slots:
 	void wroteStdin(TDEProcess *proc);
diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
index 1aacbc24..c5340434 100644
--- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
+++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
@@ -40,7 +40,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append(new EncoderVorbis(slave));
   }
@@ -71,7 +71,7 @@ public:
   int vorbis_bitrate;
 };
 
-EncoderVorbis::EncoderVorbis(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {
+EncoderVorbis::EncoderVorbis(TDEIO::SlaveBase *slave) : AudioCDEncoder(slave) {
   d = new Private();
 }
 
@@ -79,7 +79,7 @@ EncoderVorbis::~EncoderVorbis(){
   delete d;
 }
 
-TQWidget* EncoderVorbis::getConfigureWidget(KConfigSkeleton** manager) const {
+TQWidget* EncoderVorbis::getConfigureWidget(TDEConfigSkeleton** manager) const {
   (*manager) = Settings::self();
   TDEGlobal::locale()->insertCatalogue("audiocd_encoder_vorbis");
   EncoderVorbisConfig *config = new EncoderVorbisConfig();
diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.h b/kioslave/audiocd/plugins/vorbis/encodervorbis.h
index fbf649c7..ea6a0ac3 100644
--- a/kioslave/audiocd/plugins/vorbis/encodervorbis.h
+++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.h
@@ -39,7 +39,7 @@
 class EncoderVorbis : public AudioCDEncoder {
 
 public:
-  EncoderVorbis(KIO::SlaveBase *slave);
+  EncoderVorbis(TDEIO::SlaveBase *slave);
   ~EncoderVorbis();
   
   virtual TQString type() const { return "Ogg Vorbis"; };
@@ -52,7 +52,7 @@ public:
   virtual long readInit(long size);
   virtual long read(int16_t * buf, int frames);
   virtual long readCleanup();
-  virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const;
+  virtual TQWidget* getConfigureWidget(TDEConfigSkeleton** manager) const;
 
 private:
   long flush_vorbis();
diff --git a/kioslave/audiocd/plugins/wav/encodercda.h b/kioslave/audiocd/plugins/wav/encodercda.h
index 814432b3..bb1297c7 100644
--- a/kioslave/audiocd/plugins/wav/encodercda.h
+++ b/kioslave/audiocd/plugins/wav/encodercda.h
@@ -38,7 +38,7 @@
 class EncoderCda : public AudioCDEncoder {
 
 public:
-  EncoderCda(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {};
+  EncoderCda(TDEIO::SlaveBase *slave) : AudioCDEncoder(slave) {};
   ~EncoderCda(){};
   virtual bool init(){ return true; };
   virtual void loadSettings(){};
diff --git a/kioslave/audiocd/plugins/wav/encoderwav.cpp b/kioslave/audiocd/plugins/wav/encoderwav.cpp
index 57e455c1..84a8586b 100644
--- a/kioslave/audiocd/plugins/wav/encoderwav.cpp
+++ b/kioslave/audiocd/plugins/wav/encoderwav.cpp
@@ -26,7 +26,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append( new EncoderWav(slave));
     encoders.append( new EncoderCda(slave));
diff --git a/kioslave/audiocd/plugins/wav/encoderwav.h b/kioslave/audiocd/plugins/wav/encoderwav.h
index 128faa87..154236f2 100644
--- a/kioslave/audiocd/plugins/wav/encoderwav.h
+++ b/kioslave/audiocd/plugins/wav/encoderwav.h
@@ -37,7 +37,7 @@
 class EncoderWav : public EncoderCda {
 
 public:
-  EncoderWav(KIO::SlaveBase *slave) : EncoderCda(slave) {};
+  EncoderWav(TDEIO::SlaveBase *slave) : EncoderCda(slave) {};
   ~EncoderWav(){};
   virtual bool init(){ return true; };
   virtual unsigned long size(long time_secs) const;
diff --git a/kmid/channel.cpp b/kmid/channel.cpp
index c8bdb48d..214dcc18 100644
--- a/kmid/channel.cpp
+++ b/kmid/channel.cpp
@@ -50,7 +50,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
     penW = new TQPen (white);
     penT = new TQPen (colorGroup().background());
 
-    KConfig *kcfg=TDEGlobal::instance()->config();
+    TDEConfig *kcfg=TDEGlobal::instance()->config();
     kcfg->setGroup("KMid");
     TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,TRUE);
     qcvfont=new TQFont(kcfg->readFontEntry("ChannelViewFont",qtextfontdefault));
diff --git a/kmid/channelview.cpp b/kmid/channelview.cpp
index b810aa4e..fe9043f0 100644
--- a/kmid/channelview.cpp
+++ b/kmid/channelview.cpp
@@ -121,7 +121,7 @@ int ChannelView::lookmode=0;
 
 int ChannelView::lookMode(void)
 {
-    KConfig *kcfg=(TDEApplication::kApplication())->config();
+    TDEConfig *kcfg=(TDEApplication::kApplication())->config();
 
     kcfg->setGroup("KMid");
     lookmode=kcfg->readNumEntry("ChannelViewLookMode",0);
@@ -131,7 +131,7 @@ int ChannelView::lookMode(void)
 
 void ChannelView::lookMode(int i)
 {
-    KConfig *kcfg=(TDEApplication::kApplication())->config();
+    TDEConfig *kcfg=(TDEApplication::kApplication())->config();
 
     lookmode=i;
 
diff --git a/kmid/history.txt b/kmid/history.txt
index 568c4957..3723e854 100644
--- a/kmid/history.txt
+++ b/kmid/history.txt
@@ -550,7 +550,7 @@ Sunday 5-3-2000
   QScrollView)
 
 Sunday 2-4-2000
-- Now Libkmid links with tdecore and qt in order to use a KConfig object to
+- Now Libkmid links with tdecore and qt in order to use a TDEConfig object to
 read the default settings as saved by the user with the midi kcontrol module.
 - It creates a "dummy" TDEInstance in case of the application being a non-KDE
 application.
diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp
index 073c7715..edaede4a 100644
--- a/kmid/kdisptext.cpp
+++ b/kmid/kdisptext.cpp
@@ -56,7 +56,7 @@ KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(par
 
   viewport()->setBackgroundColor(TQColor (110,110,110));
 //  setBackgroundMode(NoBackground);
-  KConfig *kcfg=TDEGlobal::instance()->config();
+  TDEConfig *kcfg=TDEGlobal::instance()->config();
   kcfg->setGroup("KMid");
   typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1);
   TQFont *qtextfontdefault=new TQFont(TDEGlobalSettings::fixedFont().family(),22);
@@ -333,7 +333,7 @@ void KDisplayText::resizeEvent(TQResizeEvent *e)
 
 void KDisplayText::CursorToHome(void)
 {
-/*    KConfig *kcfg=TDEGlobal::instance()->config();
+/*    TDEConfig *kcfg=TDEGlobal::instance()->config();
     kcfg->setGroup("KMid");
     typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1);
 */
@@ -499,7 +499,7 @@ TQFont *KDisplayText::getFont(void)
 
 void KDisplayText::fontChanged(void)
 {
-    KConfig *kcfg=TDEGlobal::instance()->config();
+    TDEConfig *kcfg=TDEGlobal::instance()->config();
     kcfg->setGroup("KMid");
     TQFont *qtextfontdefault=new TQFont(*qtextfont);
     delete qtextfont;
diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp
index cc89e36b..284aa40e 100644
--- a/kmid/kmidclient.cpp
+++ b/kmid/kmidclient.cpp
@@ -69,7 +69,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
     :  DCOPObject("KMidIface"), TQWidget(parent,name)
 {
     actionCollection=ac;
-    KConfig *cfg=kapp->config();
+    TDEConfig *cfg=kapp->config();
     cfg->setGroup("KMid");
     midifile_opened=0L;
     loopsong=cfg->readNumEntry("Loop",0);
@@ -79,7 +79,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
     noteArray=0L;
     shuttingdown=false;
 
-    KConfig *kconf=TDEGlobal::instance()->config();
+    TDEConfig *kconf=TDEGlobal::instance()->config();
 
     kconf->setGroup("KMid");
     TQString tmp2 = locateLocal("appdata", "collections");
@@ -370,9 +370,9 @@ int kmidClient::openURL(const TQString _url)
     if (!u.isLocalFile())
     {
 	filename = TQString("/tmp/") + u.filename();
-	KIO::Job *iojob = KIO::copy( u, KURL::fromPathOrURL( filename ) );
+	TDEIO::Job *iojob = TDEIO::copy( u, KURL::fromPathOrURL( filename ) );
 	downloaded=false;
-	connect( iojob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT(downloadFinished( KIO::Job * ) ) );
+	connect( iojob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT(downloadFinished( TDEIO::Job * ) ) );
 
 	if (!downloaded)
             kapp->enter_loop();
@@ -390,7 +390,7 @@ int kmidClient::openURL(const TQString _url)
     {
         r=openFile(filename_8bit.data());
 
-        KConfig *cfg=TDEGlobal::instance()->config();
+        TDEConfig *cfg=TDEGlobal::instance()->config();
         if (cfg->readBoolEntry("deleteTmpNonLocalFiles",false))
         {
             unlink(filename_8bit.data());
@@ -1208,7 +1208,7 @@ void kmidClient::setSLManager(SLManager *slm)
 void kmidClient::setActiveCollection(int i)
 {
     activecollection=i;
-    KConfig *kconf=TDEGlobal::instance()->config();
+    TDEConfig *kconf=TDEGlobal::instance()->config();
 
     kconf->setGroup("KMid");
     kconf->writeEntry("ActiveCollection",activecollection);
@@ -1516,7 +1516,7 @@ void kmidClient::slotSetTempo(double value)
 
 }
 
-void kmidClient::downloadFinished(KIO::Job *)
+void kmidClient::downloadFinished(TDEIO::Job *)
 {
     downloaded=true;
     kapp->exit_loop();
diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h
index cdb5d1fa..18bef039 100644
--- a/kmid/kmidclient.h
+++ b/kmid/kmidclient.h
@@ -44,7 +44,7 @@ class DeviceManager;
 
 
 class TDEApplication;
-class KConfig;
+class TDEConfig;
 class KLCDNumber;
 class TQLabel;
 class TQComboBox;
@@ -123,7 +123,7 @@ public:
     int ChooseTypeOfTextEvents(void);
 
     TQFont *getFont(void);
-    void fontChanged(void); // The new font is already in KConfig
+    void fontChanged(void); // The new font is already in TDEConfig
 
     SLManager *getSLManager(void) {return slman;};
     void setSLManager(SLManager *slm);
@@ -172,7 +172,7 @@ public slots:
     void slotSelectSong(int i);
     void slotSelectEncoding(int i);
 
-    void downloadFinished( KIO::Job * );
+    void downloadFinished( TDEIO::Job * );
 
     void processSpecialEvent();
 
diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp
index df2e8320..44a7157d 100644
--- a/kmid/kmidframe.cpp
+++ b/kmid/kmidframe.cpp
@@ -175,7 +175,7 @@ kmidFrame::kmidFrame(const char *name)
 
     setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "kmidui.rc" );
 
-    KConfig *cfg=kapp->config();
+    TDEConfig *cfg=kapp->config();
     cfg->setGroup("KMid");
     KSelectAction *tmplistaction=
 		((KSelectAction*)actionCollection()->action("display_events"));
@@ -304,7 +304,7 @@ void kmidFrame::song_stopPause()
 
 void kmidFrame::options_FileType(int i)
 {
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("TypeOfMidiFile",i);
   kmidclient->setSongType(1-i);
@@ -312,7 +312,7 @@ void kmidFrame::options_FileType(int i)
 
 void kmidFrame::options_DisplayEvents(int i)
 {
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5);
   cfg->sync();
@@ -321,7 +321,7 @@ void kmidFrame::options_DisplayEvents(int i)
 
 void kmidFrame::options_AutomaticText()
 {
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("AutomaticTextEventChooser",1-cfg->readNumEntry("AutomaticTextEventChooser",1));
 }
@@ -333,7 +333,7 @@ void kmidFrame::options_FontChange()
   font=*kmidclient->getFont();
   kfd->getFont(font);
   delete kfd;
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("KaraokeFont",font);
   cfg->sync();
@@ -345,7 +345,7 @@ int kmidFrame::autoAddSongToCollection(const TQString& filename,int setactive)
   int r;
   SLManager *slman;
   SongList *sl;
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   if (cfg->readNumEntry("AutoAddToCollection",0)==0)
   {
@@ -429,7 +429,7 @@ void kmidFrame::shuttingDown()
    kmidclient->saveCollections();
 }
 
-void kmidFrame::saveProperties(KConfig *cfg)
+void kmidFrame::saveProperties(TDEConfig *cfg)
 {
   kmidclient->saveCollections();
   int play=kmidclient->isPlaying();
@@ -439,7 +439,7 @@ void kmidFrame::saveProperties(KConfig *cfg)
   cfg->writeEntry("Playing",play);
 }
 
-void kmidFrame::readProperties(KConfig *cfg)
+void kmidFrame::readProperties(TDEConfig *cfg)
 {
   int activecol=cfg->readNumEntry("ActiveCollection",0);
   int activesong=cfg->readNumEntry("ActiveSong",0);
@@ -474,7 +474,7 @@ void kmidFrame::options_MidiSetup()
   dlg=new MidiConfigDialog(kmidclient->devman(),NULL,"MidiDialog");
   if (dlg->exec() == TQDialog::Accepted)
   {
-    KConfig *cfg=kapp->config();
+    TDEConfig *cfg=kapp->config();
     cfg->setGroup("KMid");
     cfg->writeEntry("MidiPortNumber",MidiConfigDialog::selecteddevice);
     kmidclient->setMidiDevice(MidiConfigDialog::selecteddevice);
@@ -509,7 +509,7 @@ delete dlg;
 
 void kmidFrame::rechooseTextEvent()
 {
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
   {
@@ -524,7 +524,7 @@ void kmidFrame::rechooseTextEvent()
 
 void kmidFrame::song_Loop()
 {
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   int i=1-cfg->readNumEntry("Loop",0);
   cfg->writeEntry("Loop",i);
@@ -534,7 +534,7 @@ void kmidFrame::song_Loop()
 
 void kmidFrame::collect_PlayOrder(int i)
 {
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("CollectionPlayMode", i);
   cfg->sync();
@@ -543,7 +543,7 @@ void kmidFrame::collect_PlayOrder(int i)
 
 void kmidFrame::collect_AutoAdd()
 {
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("AutoAddToCollection",1-cfg->readNumEntry("AutoAddToCollection",0));
   cfg->sync();
@@ -584,7 +584,7 @@ void kmidFrame::spacePressed()
 }
 void kmidFrame::options_ShowVolumeBar()
 {
-  KConfig *cfg=kapp->config();
+  TDEConfig *cfg=kapp->config();
   cfg->setGroup("KMid");
   int i=1-cfg->readNumEntry("ShowVolumeBar",0);
   cfg->writeEntry("ShowVolumeBar",i);
diff --git a/kmid/kmidframe.h b/kmid/kmidframe.h
index 1e3e08c6..f028c749 100644
--- a/kmid/kmidframe.h
+++ b/kmid/kmidframe.h
@@ -33,7 +33,7 @@
 #include <tdelibs_export.h>
 
 class TDEApplication;
-class KConfig;
+class TDEConfig;
 class kmidClient;
 class KToolBar;
 class TQDragEvent;
@@ -67,8 +67,8 @@ protected:
     int autoAddSongToCollection(const TQString& filename=TQString(),int setactive=1);
 
 
-    virtual void saveProperties(KConfig *kcfg);
-    virtual void readProperties(KConfig *kcfg);
+    virtual void saveProperties(TDEConfig *kcfg);
+    virtual void readProperties(TDEConfig *kcfg);
 
 //    virtual void closeEvent(TQCloseEvent *e);
 
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index c20c9443..a9fb11d0 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -229,7 +229,7 @@ KMixWindow::saveSettings()
 void
 KMixWindow::saveConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(0);
 
    // make sure we don't start without any UI
@@ -289,7 +289,7 @@ KMixWindow::saveConfig()
 void
 KMixWindow::loadConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(0);
 
    m_showDockWidget = config->readBoolEntry("AllowDocking", true);
@@ -468,7 +468,7 @@ KMixWindow::showAbout()
 void
 KMixWindow::loadVolumes()
 {
-	KConfig *cfg = new KConfig( "kmixctrlrc", true );
+	TDEConfig *cfg = new TDEConfig( "kmixctrlrc", true );
 	for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next())
 	{
 		mixer->volumeLoad( cfg );
@@ -484,7 +484,7 @@ KMixWindow::loadVolumes()
 void
 KMixWindow::saveVolumes()
 {
-    KConfig *cfg = new KConfig( "kmixctrlrc", false );
+    TDEConfig *cfg = new TDEConfig( "kmixctrlrc", false );
     for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) {
 	//kdDebug(67100) << "KMixWindow::saveConfig()" << endl;
 	if ( mixer->isOpen() ) { // protect from unplugged devices (better do *not* save them)
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 63b376e7..0af64588 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -235,7 +235,7 @@ void KMixApplet::saveConfig()
     kdDebug(67100) << "KMixApplet::saveConfig()" << endl;
     if ( m_mixerWidget != 0) {
 	//kdDebug(67100) << "KMixApplet::saveConfig() save" << endl;
-        KConfig *cfg = this->config();
+        TDEConfig *cfg = this->config();
 	//kdDebug(67100) << "KMixApplet::saveConfig() save cfg=" << cfg << endl;
         cfg->setGroup( 0 );
         cfg->writeEntry( "Mixer", _mixer->id() );
@@ -262,7 +262,7 @@ void KMixApplet::saveConfig()
 void KMixApplet::loadConfig()
 {
     kdDebug(67100) << "KMixApplet::loadConfig()" << endl;
-    KConfig *cfg = this->config();
+    TDEConfig *cfg = this->config();
     cfg->setGroup(0);
 	
     _mixerId = cfg->readEntry( "Mixer", "undef" );
@@ -282,7 +282,7 @@ void KMixApplet::loadConfig()
 }
 
 
-void KMixApplet::loadConfig( KConfig *config, const TQString &grp )
+void KMixApplet::loadConfig( TDEConfig *config, const TQString &grp )
 {
     if ( m_mixerWidget ) {
 	//config->setGroup( grp );
@@ -291,7 +291,7 @@ void KMixApplet::loadConfig( KConfig *config, const TQString &grp )
 }
 
 
-void KMixApplet::saveConfig( KConfig *config, const TQString &grp )
+void KMixApplet::saveConfig( TDEConfig *config, const TQString &grp )
 {
     if ( m_mixerWidget ) {
 	config->setGroup( grp );
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index 5874a484..5b4a74a5 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -102,9 +102,9 @@ protected slots:
 protected:
    void resizeEvent( TQResizeEvent * );
    void saveConfig();
-   void saveConfig( KConfig *config, const TQString &grp );
+   void saveConfig( TDEConfig *config, const TQString &grp );
    void loadConfig();
-   void loadConfig( KConfig *config, const TQString &grp );
+   void loadConfig( TDEConfig *config, const TQString &grp );
 
 private:
    void positionChange(Position);
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index 8cf04523..334dea71 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -61,7 +61,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
    TDEApplication app( false, false );
 
    // get maximum values
-   KConfig *config= new KConfig("kmixrc", true, false);
+   TDEConfig *config= new TDEConfig("kmixrc", true, false);
    config->setGroup("Misc");
    delete config;
 
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index adf1b88d..4d4ae7ee 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -219,7 +219,7 @@ void KMixerWidget::setValueStyle( int vs )
 /**
  *  @todo : Is the view list already filled, when loadConfig() is called?
  */
-void KMixerWidget::loadConfig( KConfig *config, const TQString &grp )
+void KMixerWidget::loadConfig( TDEConfig *config, const TQString &grp )
 {
 
 	for ( std::vector<ViewBase*>::iterator it = _views.begin(); it != _views.end();  it++) {
@@ -233,7 +233,7 @@ void KMixerWidget::loadConfig( KConfig *config, const TQString &grp )
 
 
 
-void KMixerWidget::saveConfig( KConfig *config, const TQString &grp )
+void KMixerWidget::saveConfig( TDEConfig *config, const TQString &grp )
 {
 	config->setGroup( grp );
 	// Write mixer name. It cannot be changed in the Mixer instance,
diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h
index 43f6574b..03e3195e 100644
--- a/kmix/kmixerwidget.h
+++ b/kmix/kmixerwidget.h
@@ -42,7 +42,7 @@ class TQSlider;
 // KDE
 class KActionCollection;
 class KActionMenu;
-class KConfig;
+class TDEConfig;
 class KTabWidget;
 
 // KMix
@@ -87,8 +87,8 @@ class KMixerWidget : public TQWidget
    void setValueStyle( int vs );
    void toggleMenuBarSlot();
 
-   void saveConfig( KConfig *config, const TQString &grp );
-   void loadConfig( KConfig *config, const TQString &grp );
+   void saveConfig( TDEConfig *config, const TQString &grp );
+   void loadConfig( TDEConfig *config, const TQString &grp );
 
   private slots:
       //void updateBalance();
diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp
index 397aa320..2a472d6d 100644
--- a/kmix/kmixtoolbox.cpp
+++ b/kmix/kmixtoolbox.cpp
@@ -79,7 +79,7 @@ void KMixToolBox::setValueStyle(TQPtrList<TQWidget> &mdws, int vs ) {
     }
 }
 
-void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix) {
+void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, TDEConfig *config, const TQString &grp, const TQString &viewPrefix) {
     int n = 0;
     config->setGroup( grp );
     int num = config->readNumEntry( viewPrefix + ".Devs", 0);
@@ -161,7 +161,7 @@ void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T
 }
 
 
-void KMixToolBox::saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix) {
+void KMixToolBox::saveConfig(TQPtrList<TQWidget> &mdws, TDEConfig *config, const TQString &grp, const TQString &viewPrefix) {
     config->setGroup( grp  );
     config->writeEntry( viewPrefix + ".Devs", mdws.count() );
 
diff --git a/kmix/kmixtoolbox.h b/kmix/kmixtoolbox.h
index f39dd5a1..9b9d0c80 100644
--- a/kmix/kmixtoolbox.h
+++ b/kmix/kmixtoolbox.h
@@ -6,7 +6,7 @@
 
 class Mixer;
 
-class KConfig;
+class TDEConfig;
 
 /**
  * This toolbox contains various static methods that are shared throughout KMix.
@@ -20,8 +20,8 @@ class KMixToolBox {
     static void setLabels (TQPtrList<TQWidget> &mdws, bool on );
     static void setTicks  (TQPtrList<TQWidget> &mdws, bool on );
     static void setValueStyle  (TQPtrList<TQWidget> &mdws, int vs );
-    static void loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix  );
-    static void saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix  );
+    static void loadConfig(TQPtrList<TQWidget> &mdws, TDEConfig *config, const TQString &grp, const TQString &viewPrefix  );
+    static void saveConfig(TQPtrList<TQWidget> &mdws, TDEConfig *config, const TQString &grp, const TQString &viewPrefix  );
 };
     
 
diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp
index b29c485f..4b0649d0 100644
--- a/kmix/mixdevice.cpp
+++ b/kmix/mixdevice.cpp
@@ -133,7 +133,7 @@ void MixDevice::setPK(TQString &PK) {
  * because we need to read the minimum and maximum volume levels.
  * (Another solutien would be to "equip" volFromConfig with maxInt and minInt values).
  */
-void MixDevice::read( KConfig *config, const TQString& grp )
+void MixDevice::read( TDEConfig *config, const TQString& grp )
 {
    TQString devgrp;
    devgrp.sprintf( "%s.Dev%i", grp.ascii(), _num );
@@ -193,7 +193,7 @@ void MixDevice::read( KConfig *config, const TQString& grp )
 /**
  *  called on "kmixctrl --save" and from the GUI's (currently only on exit)
  */
-void MixDevice::write( KConfig *config, const TQString& grp )
+void MixDevice::write( TDEConfig *config, const TQString& grp )
 {
    TQString devgrp;
    devgrp.sprintf( "%s.Dev%i", grp.ascii(), _num );
diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h
index 2009811e..33ef0d1b 100644
--- a/kmix/mixdevice.h
+++ b/kmix/mixdevice.h
@@ -75,8 +75,8 @@ SLIDER );
       unsigned int enumId();
       TQPtrList<TQString>& enumValues();
 
-      void read( KConfig *config, const TQString& grp );
-      void write( KConfig *config, const TQString& grp );
+      void read( TDEConfig *config, const TQString& grp );
+      void write( TDEConfig *config, const TQString& grp );
 
       void setType( ChannelType channeltype ) { _type = channeltype; };
       ChannelType type() { return _type; };
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index 0e7c36fc..99fd84b0 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -110,7 +110,7 @@ Mixer::~Mixer() {
    delete _pollingTimer;
 }
 
-void Mixer::volumeSave( KConfig *config )
+void Mixer::volumeSave( TDEConfig *config )
 {
     //    kdDebug(67100) << "Mixer::volumeSave()" << endl;
     readSetFromHW();
@@ -119,7 +119,7 @@ void Mixer::volumeSave( KConfig *config )
     _mixerBackend->m_mixDevices.write( config, grp );
 }
 
-void Mixer::volumeLoad( KConfig *config )
+void Mixer::volumeLoad( TDEConfig *config )
 {
    TQString grp("Mixer");
    grp.append(mixerName());
diff --git a/kmix/mixer.h b/kmix/mixer.h
index 1269d609..d9566e81 100644
--- a/kmix/mixer.h
+++ b/kmix/mixer.h
@@ -39,7 +39,7 @@ class Mixer_Backend;
 #include "mixdevice.h"
 
 class Volume;
-class KConfig;
+class TDEConfig;
 
 class Mixer : public TQObject, virtual public MixerIface
 {
@@ -57,8 +57,8 @@ class Mixer : public TQObject, virtual public MixerIface
 
       MixDevice* find(TQString& devPK);
 
-      void volumeSave( KConfig *config );
-      void volumeLoad( KConfig *config );
+      void volumeSave( TDEConfig *config );
+      void volumeLoad( TDEConfig *config );
 
        /// Tells the number of the mixing devices
       unsigned int size() const;
diff --git a/kmix/mixset.cpp b/kmix/mixset.cpp
index 63f87c84..8f4ba438 100644
--- a/kmix/mixset.cpp
+++ b/kmix/mixset.cpp
@@ -38,7 +38,7 @@ void MixSet::clone( MixSet &set )
     }
 }
 
-void MixSet::read( KConfig *config, const TQString& grp )
+void MixSet::read( TDEConfig *config, const TQString& grp )
 {
     kdDebug(67100) << "MixSet::read() of group " << grp << endl;
     config->setGroup(grp);
@@ -51,7 +51,7 @@ void MixSet::read( KConfig *config, const TQString& grp )
     }
 }
 
-void MixSet::write( KConfig *config, const TQString& grp )
+void MixSet::write( TDEConfig *config, const TQString& grp )
 {
     kdDebug(67100) << "MixSet::write() of group " << grp << endl;    
     config->setGroup(grp);
diff --git a/kmix/mixset.h b/kmix/mixset.h
index f66692b2..060f6944 100644
--- a/kmix/mixset.h
+++ b/kmix/mixset.h
@@ -6,8 +6,8 @@
 class MixSet : public TQPtrList<MixDevice>
 {
    public:
-      void read( KConfig *config, const TQString& grp );
-      void write( KConfig *config, const TQString& grp );
+      void read( TDEConfig *config, const TQString& grp );
+      void write( TDEConfig *config, const TQString& grp );
 
       void clone( MixSet &orig );
 
diff --git a/krec/kcm_krec.desktop b/krec/kcm_krec.desktop
index d3fbeaeb..b3eae3db 100644
--- a/krec/kcm_krec.desktop
+++ b/krec/kcm_krec.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=krec
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=krec
diff --git a/krec/kcm_krec_files.desktop b/krec/kcm_krec_files.desktop
index e5a683db..3d2949ed 100644
--- a/krec/kcm_krec_files.desktop
+++ b/krec/kcm_krec_files.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=filenew
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=krec_files
diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp
index 4b62ed9c..469b269f 100644
--- a/krec/krecconfig_files.cpp
+++ b/krec/krecconfig_files.cpp
@@ -32,7 +32,7 @@ typedef KGenericFactory<KRecConfigFiles, TQWidget> KRecConfigFilesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_krec_files, KRecConfigFilesFactory( "krec" ) )
 
 KRecConfigFiles::KRecConfigFiles( TQWidget* p, const char*, const TQStringList& s )
- : KCModule( KRecConfigFilesFactory::instance(), p, s )
+ : TDECModule( KRecConfigFilesFactory::instance(), p, s )
  , _layout( 0 )
  , _filewidget( 0 )
 {
diff --git a/krec/krecconfig_files.h b/krec/krecconfig_files.h
index 8dcc0665..9de24310 100644
--- a/krec/krecconfig_files.h
+++ b/krec/krecconfig_files.h
@@ -27,7 +27,7 @@ class TQLabel;
 
 class KRecConfigFilesWidget;
 
-class KRecConfigFiles : public KCModule {
+class KRecConfigFiles : public TDECModule {
    Q_OBJECT
   
 public:
diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp
index c29d6b4a..633409f5 100644
--- a/krec/krecconfigure.cpp
+++ b/krec/krecconfigure.cpp
@@ -35,7 +35,7 @@ typedef KGenericFactory<KRecConfigGeneral, TQWidget> KRecConfigGeneralFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_krec, KRecConfigGeneralFactory( "krec" ) )
 
 KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringList& s )
- : KCModule( KRecConfigGeneralFactory::instance(), p, s )
+ : TDECModule( KRecConfigGeneralFactory::instance(), p, s )
  , _layout( 0 ), _layout_display( 0 )
  , _display_title( 0 )
  , _displaybox( 0 ), _framebasebox( 0 )
diff --git a/krec/krecconfigure.h b/krec/krecconfigure.h
index 736d77c4..63d9e6d9 100644
--- a/krec/krecconfigure.h
+++ b/krec/krecconfigure.h
@@ -27,7 +27,7 @@ class TQLabel;
 class TQCheckBox;
 class KPushButton;
 
-class KRecConfigGeneral : public KCModule {
+class KRecConfigGeneral : public TDECModule {
    Q_OBJECT
   
 public:
diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp
index a1e5c584..27975cdf 100644
--- a/krec/krecfile.cpp
+++ b/krec/krecfile.cpp
@@ -166,7 +166,7 @@ void KRecFile::save( const TQString &fname ) {
 	tar->addLocalDirectory( _dir->name(), basename );
 
 	delete tar;
-	KIO::file_move( tmpname, filetosave, -1, true, false, true );
+	TDEIO::file_move( tmpname, filetosave, -1, true, false, true );
 
 	KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).arg( filename() ) );
 	_saved = true;
@@ -226,7 +226,7 @@ TQIODevice::Offset KRecFile::samplesToOffset( int n ) const {
 	return out;
 }
 
-/// * * * Properties <-> KConfig * * *
+/// * * * Properties <-> TDEConfig * * *
 void KRecFile::saveProps() {
 	kdDebug( 60005 ) << k_funcinfo << endl;
 	_config->setGroup( "General" );
@@ -327,7 +327,7 @@ KRecBuffer::~KRecBuffer() {
 	//kdDebug( 60005 ) << k_funcinfo << "done." << endl;
 }
 
-void KRecBuffer::writeConfig( KConfig* config ) {
+void KRecBuffer::writeConfig( TDEConfig* config ) {
 	//kdDebug( 60005 ) << k_funcinfo << config << endl;
 	config->writeEntry( "Filename", _fileinfo->fileName() );
 	config->writeEntry( "StartPos", _start );
@@ -336,7 +336,7 @@ void KRecBuffer::writeConfig( KConfig* config ) {
 	config->writeEntry( "Comment", _comment );
 }
 
-KRecBuffer* KRecBuffer::fromConfig( KConfig* config, TQDir* dir, KRecFile* p, const char* n ) {
+KRecBuffer* KRecBuffer::fromConfig( TDEConfig* config, TQDir* dir, KRecFile* p, const char* n ) {
 	kdDebug( 60005 ) << k_funcinfo << config << endl;
 	KRecBuffer* tmp = new KRecBuffer( dir->path() + "/" + config->readEntry( "Filename" ),
 	                       config->readNumEntry( "StartPos" ),
diff --git a/krec/krecfile.h b/krec/krecfile.h
index a90786dc..cdb9af2d 100644
--- a/krec/krecfile.h
+++ b/krec/krecfile.h
@@ -121,7 +121,7 @@ private:
 class TQFile;
 class TQDir;
 class TQFileInfo;
-class KConfig;
+class TDEConfig;
 class TQDataStream;
 
 class KRecBuffer : virtual public TQObject {
@@ -140,9 +140,9 @@ public:
 	/**
 		Writes out its Config
 		It doesn't set the group.
-		@param config the KConfig where the data gets written
+		@param config the TDEConfig where the data gets written
 	*/
-	void writeConfig( KConfig* config );
+	void writeConfig( TDEConfig* config );
 
 	/**
 		restores a KRecBuffer from Config
@@ -150,7 +150,7 @@ public:
 		@param config The configuration thats read
 		@param dir The directory where the file is saved
 	*/
-	static KRecBuffer* fromConfig( KConfig* config, TQDir* dir, KRecFile* p, const char* n=0 );
+	static KRecBuffer* fromConfig( TDEConfig* config, TQDir* dir, KRecFile* p, const char* n=0 );
 
 	TQString filename() const;
 
diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp
index 68c48665..6b55a075 100644
--- a/krec/krecglobal.cpp
+++ b/krec/krecglobal.cpp
@@ -51,7 +51,7 @@ KRecGlobal* KRecGlobal::the() {
 void KRecGlobal::setMainWidget( TQWidget* n ) { _qwidget = n; }
 TQWidget* KRecGlobal::mainWidget() { return _qwidget; }
 
-KConfig* KRecGlobal::kconfig() { return kapp->config(); }
+TDEConfig* KRecGlobal::kconfig() { return kapp->config(); }
 
 void KRecGlobal::setStatusBar( KStatusBar *bar ) { _statusbar = bar; }
 void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar->message( text, 2000 ); }
diff --git a/krec/krecglobal.h b/krec/krecglobal.h
index 71050fde..06615d8d 100644
--- a/krec/krecglobal.h
+++ b/krec/krecglobal.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqdict.h>
 
-class KConfig;
+class TDEConfig;
 class TQWidget;
 class KStatusBar;
 
@@ -51,7 +51,7 @@ public:
 	TQWidget* mainWidget();
 
 	/// @return kapp->config()
-	static KConfig* kconfig();
+	static TDEConfig* kconfig();
 
 	/// Sets the Statusbar.
 	void setStatusBar( KStatusBar* );
diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp
index c8c1398f..a5cdc07b 100644
--- a/krec/krecnewproperties.cpp
+++ b/krec/krecnewproperties.cpp
@@ -39,7 +39,7 @@ KRecNewProperties::KRecNewProperties( TQWidget* p, const char* n )
   , _samplerate( 44100 ), _channels( 2 ), _bits( 16 )
 {
 kdDebug( 60005 ) << k_funcinfo << endl;
-	KConfig *config = KRecGlobal::kconfig();
+	TDEConfig *config = KRecGlobal::kconfig();
 	config->setGroup( "FileDefaults" );
 	_samplerate = config->readNumEntry( "SamplingRate", 44100 );
 	_channels = config->readNumEntry( "Channels", 2 );
diff --git a/krec/krecnewproperties.h b/krec/krecnewproperties.h
index f4739efd..e7c14404 100644
--- a/krec/krecnewproperties.h
+++ b/krec/krecnewproperties.h
@@ -16,7 +16,7 @@
 
 #include <tqdialog.h>
 
-class KConfig;
+class TDEConfig;
 class TQBoxLayout;
 class TQButtonGroup;
 class TQRadioButton;
diff --git a/krec/krecord_private.h b/krec/krecord_private.h
index 1385223c..e0d80c3e 100644
--- a/krec/krecord_private.h
+++ b/krec/krecord_private.h
@@ -34,7 +34,7 @@ class KRecExportItem;
 
 class KAudioRecordStream;
 class KAudioPlayStream;
-class KConfig;
+class TDEConfig;
 class ArtsActions;
 class KAction;
 class KActionMenu;
diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp
index 43db55a6..7ec27e52 100644
--- a/krec/mp3_export/krecexport_mp3.cpp
+++ b/krec/mp3_export/krecexport_mp3.cpp
@@ -158,8 +158,8 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 // Derived from tdemultimedia/kioslave/audiocd/audiocd.cpp.
 // We use the encoding settings from kcmaudiocd.
 void KRecExport_MP3::setLameParameters() {
-	KConfig *config;
-	config = new KConfig( "kcmaudiocdrc" );
+	TDEConfig *config;
+	config = new TDEConfig( "kcmaudiocdrc" );
 
 	config->setGroup( "MP3" );
 
diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp
index 32f274df..e7e9c4dc 100644
--- a/krec/ogg_export/krecexport_ogg.cpp
+++ b/krec/ogg_export/krecexport_ogg.cpp
@@ -195,8 +195,8 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 // We use the encoding settings from kcmaudiocd.
 void KRecExport_OGG::setOggParameters() {
 kdDebug( 60005 ) << k_funcinfo << endl;
-	KConfig *config;
-	config = new KConfig( "kcmaudiocdrc" );
+	TDEConfig *config;
+	config = new TDEConfig( "kcmaudiocdrc" );
 
 	config->setGroup( "Vorbis" );
 
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 49ab2950..45a94701 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -727,12 +727,12 @@ void KSCD::showConfig()
 {
     static configWidget* confWidget = 0;
 
-    if (KConfigDialog::showDialog("settings")) {
+    if (TDEConfigDialog::showDialog("settings")) {
         updateConfigDialog(confWidget);
         return;
     }
 
-    configDialog = new KConfigDialog(this, "settings", Prefs::self());
+    configDialog = new TDEConfigDialog(this, "settings", Prefs::self());
 
     configDialog->setHelp(TQString());
 
@@ -745,10 +745,10 @@ void KSCD::showConfig()
     KService::Ptr libkcddb = KService::serviceByDesktopName("libkcddb");
     if (libkcddb && libkcddb->isValid())
     {
-        KCModuleInfo info(libkcddb->desktopEntryPath());
+        TDECModuleInfo info(libkcddb->desktopEntryPath());
         if (info.service()->isValid())
         {
-            KCModule *m = KCModuleLoader::loadModule(info, KCModuleLoader::Inline);
+            TDECModule *m = TDECModuleLoader::loadModule(info, TDECModuleLoader::Inline);
             if (m)
             {
                 m->load();
@@ -1491,7 +1491,7 @@ void KSCD::information(int i)
 bool KSCD::saveState(TQSessionManager& /*sm*/)
 {
   writeSettings();
-  KConfig* config = TDEApplication::kApplication()->sessionConfig();
+  TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
   config->setGroup("General");
   config->writeEntry("Show", isVisible());
   return true;
@@ -1659,7 +1659,7 @@ int main( int argc, char *argv[] )
 
     if (kapp->isRestored())
     {
-        KConfig* config = TDEApplication::kApplication()->sessionConfig();
+        TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
         config->setGroup("General");
         if (config->readBoolEntry("Show"))
             k->show();
diff --git a/kscd/kscd.h b/kscd/kscd.h
index 8ed84a37..01c6e163 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -181,7 +181,7 @@ protected:
     void updateConfigDialog(configWidget* widget);
 
 private:
-    KConfigDialog   *configDialog;
+    TDEConfigDialog   *configDialog;
     CDDBDlg         *cddialog;
     TQPopupMenu      *mainPopup;
     TQPopupMenu      *infoPopup;
diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp
index d51ef386..0f29ae53 100644
--- a/libkcddb/asynccddbplookup.cpp
+++ b/libkcddb/asynccddbplookup.cpp
@@ -77,10 +77,10 @@ namespace KCDDB
   {
     state_ = Idle;
     
-    if ( error == KNetwork::KSocketBase::LookupFailure )
+    if ( error == KNetwork::TDESocketBase::LookupFailure )
       emit finished( HostNotFound );
-    else if ( error == KNetwork::KSocketBase::ConnectionTimedOut ||
-        error == KNetwork::KSocketBase::NetFailure )
+    else if ( error == KNetwork::TDESocketBase::ConnectionTimedOut ||
+        error == KNetwork::TDESocketBase::NetFailure )
       emit finished( NoResponse );
     else
       emit finished( UnknownError );
diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp
index 45eb4353..e46df657 100644
--- a/libkcddb/asynchttplookup.cpp
+++ b/libkcddb/asynchttplookup.cpp
@@ -111,7 +111,7 @@ namespace KCDDB
   }
 
     void
-  AsyncHTTPLookup::slotData( KIO::Job *, const TQByteArray &data )
+  AsyncHTTPLookup::slotData( TDEIO::Job *, const TQByteArray &data )
   {
     if (data.size() > 0)
     {
@@ -121,7 +121,7 @@ namespace KCDDB
   }
 
     void
-  AsyncHTTPLookup::slotResult( KIO::Job *job )
+  AsyncHTTPLookup::slotResult( TDEIO::Job *job )
   {
     if ( 0 != job->error() )
     {
@@ -139,15 +139,15 @@ namespace KCDDB
   {
     kdDebug(60010) << "About to fetch: " << cgiURL_.url() << endl;
 
-    KIO::TransferJob* job = KIO::get( cgiURL_, false, false );
+    TDEIO::TransferJob* job = TDEIO::get( cgiURL_, false, false );
 
     if ( 0 == job )
       return ServerError;
 
-    connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-          TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-          TQT_SLOT( slotResult( KIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+          TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+          TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 
     return Success;
   }
diff --git a/libkcddb/asynchttplookup.h b/libkcddb/asynchttplookup.h
index 37fda8b4..1baaafd5 100644
--- a/libkcddb/asynchttplookup.h
+++ b/libkcddb/asynchttplookup.h
@@ -48,8 +48,8 @@ namespace KCDDB
       void slotQueryReady();
       void requestCDInfoForMatch();
 
-      void slotData( KIO::Job *, const TQByteArray & );
-      void slotResult( KIO::Job * );
+      void slotData( TDEIO::Job *, const TQByteArray & );
+      void slotResult( TDEIO::Job * );
 
     protected:
       virtual Result fetchURL();
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 6932b49b..6caf2bf4 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -34,14 +34,14 @@ namespace KCDDB
 
   }
   
-  CDDB::Result AsyncHTTPSubmit::runJob(KIO::Job* job)
+  CDDB::Result AsyncHTTPSubmit::runJob(TDEIO::Job* job)
   {
-    connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotFinished(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotFinished(TDEIO::Job *)));
 
     return CDDB::Success;
   }
   
-  void AsyncHTTPSubmit::slotFinished(KIO::Job* job)
+  void AsyncHTTPSubmit::slotFinished(TDEIO::Job* job)
   {
     kdDebug() << "Finished" << endl;
 
diff --git a/libkcddb/asynchttpsubmit.h b/libkcddb/asynchttpsubmit.h
index 5fc1d3f7..0eb82ae7 100644
--- a/libkcddb/asynchttpsubmit.h
+++ b/libkcddb/asynchttpsubmit.h
@@ -34,9 +34,9 @@ namespace KCDDB
     signals:
       void finished( CDDB::Result );
     protected:
-      virtual Result runJob(KIO::Job* job);
+      virtual Result runJob(TDEIO::Job* job);
     private slots:
-      void slotFinished(KIO::Job*);
+      void slotFinished(TDEIO::Job*);
   } ;
 }
 
diff --git a/libkcddb/asyncsmtpsubmit.cpp b/libkcddb/asyncsmtpsubmit.cpp
index ff120fac..1214e951 100644
--- a/libkcddb/asyncsmtpsubmit.cpp
+++ b/libkcddb/asyncsmtpsubmit.cpp
@@ -36,15 +36,15 @@ namespace KCDDB
 
   }
 
-  CDDB::Result AsyncSMTPSubmit::runJob(KIO::Job* job)
+  CDDB::Result AsyncSMTPSubmit::runJob(TDEIO::Job* job)
   {
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-               this, TQT_SLOT(slotDone( KIO::Job* ) ) ); 
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+               this, TQT_SLOT(slotDone( TDEIO::Job* ) ) ); 
 
     return Success;
   }
 
-  void AsyncSMTPSubmit::slotDone( KIO::Job* job )
+  void AsyncSMTPSubmit::slotDone( TDEIO::Job* job )
   {
       kdDebug(60010) << k_funcinfo << endl;
       if ( job->error()==0 )
diff --git a/libkcddb/asyncsmtpsubmit.h b/libkcddb/asyncsmtpsubmit.h
index 303a993e..aebf53a9 100644
--- a/libkcddb/asyncsmtpsubmit.h
+++ b/libkcddb/asyncsmtpsubmit.h
@@ -37,9 +37,9 @@ namespace KCDDB
     signals:
       void finished( CDDB::Result );
     protected slots:
-      void slotDone( KIO::Job * );
+      void slotDone( TDEIO::Job * );
     protected:
-      virtual Result runJob(KIO::Job* job);
+      virtual Result runJob(TDEIO::Job* job);
   } ;
 }
 
diff --git a/libkcddb/config.cpp b/libkcddb/config.cpp
index 8772d5c9..5c4a82f2 100644
--- a/libkcddb/config.cpp
+++ b/libkcddb/config.cpp
@@ -37,11 +37,11 @@ namespace KCDDB
     KEMailSettings kes;
     kes.setProfile( kes.defaultProfileName() );
 
-    static_cast<KConfigSkeleton::ItemString *>(findItem("emailAddress"))
+    static_cast<TDEConfigSkeleton::ItemString *>(findItem("emailAddress"))
       ->setDefaultValue(kes.getSetting( KEMailSettings::EmailAddress ));
-    static_cast<KConfigSkeleton::ItemString *>(findItem("replyTo"))
+    static_cast<TDEConfigSkeleton::ItemString *>(findItem("replyTo"))
       ->setDefaultValue(kes.getSetting( KEMailSettings::ReplyToAddress ));
-    static_cast<KConfigSkeleton::ItemString *>(findItem("smtpHostname"))
+    static_cast<TDEConfigSkeleton::ItemString *>(findItem("smtpHostname"))
       ->setDefaultValue(kes.getSetting( KEMailSettings::OutServer ));
   }
 
diff --git a/libkcddb/httplookup.h b/libkcddb/httplookup.h
index 6e865303..d7499b49 100644
--- a/libkcddb/httplookup.h
+++ b/libkcddb/httplookup.h
@@ -26,7 +26,7 @@
 
 #include "lookup.h"
 
-namespace KIO
+namespace TDEIO
 {
   class TransferJob;
   class Job;
diff --git a/libkcddb/httpsubmit.cpp b/libkcddb/httpsubmit.cpp
index fa4c2d98..d42d5a3d 100644
--- a/libkcddb/httpsubmit.cpp
+++ b/libkcddb/httpsubmit.cpp
@@ -37,9 +37,9 @@ namespace KCDDB
 
   }
 
-  KIO::Job* HTTPSubmit::createJob(const CDInfo& cdInfo)
+  TDEIO::Job* HTTPSubmit::createJob(const CDInfo& cdInfo)
   {
-    KIO::TransferJob* job = KIO::http_post(url_, diskData_.utf8(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url_, diskData_.utf8(), false);
 
     job->addMetaData("content-type", "Content-Type: text/plain");
     TQString header;
diff --git a/libkcddb/httpsubmit.h b/libkcddb/httpsubmit.h
index 40131ea4..7afae949 100644
--- a/libkcddb/httpsubmit.h
+++ b/libkcddb/httpsubmit.h
@@ -31,7 +31,7 @@ namespace KCDDB
       virtual ~HTTPSubmit();
 
     protected:
-      virtual KIO::Job* createJob(const CDInfo& cdInfo);
+      virtual TDEIO::Job* createJob(const CDInfo& cdInfo);
 
       KURL url_;
       TQString from_;
diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index 5235d40a..75dd8501 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -46,7 +46,7 @@ typedef KGenericFactory<CDDBModule, TQWidget> KCDDBFactory;
 K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) )
 
 CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
   TDEGlobal::locale()->insertCatalogue("libkcddb");
   setButtons(Default | Apply);
@@ -71,7 +71,7 @@ CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
   void
 CDDBModule::defaults()
 {
-  KCModule::defaults();
+  TDECModule::defaults();
 
   updateWidgetsFromConfig(KCDDB::Config());
 }
@@ -112,7 +112,7 @@ CDDBModule::updateWidgetsFromConfig(const KCDDB::Config & config)
   void
 CDDBModule::save()
 {
-  KCModule::save();
+  TDECModule::save();
 
   checkSettings();
 }
@@ -120,7 +120,7 @@ CDDBModule::save()
   void
 CDDBModule::load()
 {
-  KCModule::load();
+  TDECModule::load();
 
   KCDDB::Config config;
   config.readConfig();
diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h
index 0e58998f..af83fe80 100644
--- a/libkcddb/kcmcddb/kcmcddb.h
+++ b/libkcddb/kcmcddb/kcmcddb.h
@@ -25,9 +25,9 @@
 #include "libkcddb/config.h"
 
 class CDDBConfigWidgetBase;
-class KConfigDialogManager;
+class TDEConfigDialogManager;
 
-class CDDBModule : public KCModule
+class CDDBModule : public TDECModule
 {
   Q_OBJECT
   
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index 16a7ac79..a031c949 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -53,10 +53,10 @@ namespace KCDDB
     TQValueList<Mirror> result;
 
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, 0 ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, 0 ) )
     {
       result = readFile( tmpFile );
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     }
 
     return result;
diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp
index 07f34b61..ed4e7357 100644
--- a/libkcddb/smtpsubmit.cpp
+++ b/libkcddb/smtpsubmit.cpp
@@ -40,13 +40,13 @@ namespace KCDDB
 
   }
 
-  KIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo)
+  TDEIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo)
   {
     url_.setQuery(TQString("to=%1&subject=cddb %2 %3&from=%4")
       .arg(to_, cdInfo.category, cdInfo.id, from_));
     kdDebug(60010) << "Url is: " << url_.prettyURL() << endl;
 
-    return KIO::storedPut(diskData_.utf8(), url_, -1, false, false, false);
+    return TDEIO::storedPut(diskData_.utf8(), url_, -1, false, false, false);
   }
 
   void SMTPSubmit::makeDiskData( const CDInfo& cdInfo, const TrackOffsetList& offsetList )
diff --git a/libkcddb/smtpsubmit.h b/libkcddb/smtpsubmit.h
index b2c4eaf1..7890d77e 100644
--- a/libkcddb/smtpsubmit.h
+++ b/libkcddb/smtpsubmit.h
@@ -33,7 +33,7 @@ namespace KCDDB
     protected:
       virtual void makeDiskData( const CDInfo&, const TrackOffsetList& );
 
-      virtual KIO::Job* createJob(const CDInfo& cdInfo);
+      virtual TDEIO::Job* createJob(const CDInfo& cdInfo);
 
       KURL url_;
       TQString from_, to_;
diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp
index 63a0951b..26a70283 100644
--- a/libkcddb/submit.cpp
+++ b/libkcddb/submit.cpp
@@ -46,7 +46,7 @@ namespace KCDDB
     if (!validCategory(cdInfo.category))
       return InvalidCategory;
 
-    KIO::Job* job = createJob(cdInfo);
+    TDEIO::Job* job = createJob(cdInfo);
 
     if (!job)
       return UnknownError;
diff --git a/libkcddb/submit.h b/libkcddb/submit.h
index 512e69b9..60f43b43 100644
--- a/libkcddb/submit.h
+++ b/libkcddb/submit.h
@@ -27,7 +27,7 @@
 #include "cdinfo.h"
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -50,8 +50,8 @@ namespace KCDDB
       Result submit( CDInfo cdInfo, const TrackOffsetList &offsetList);
 
     protected:
-      virtual KIO::Job* createJob(const CDInfo& cdInfo) = 0;
-      virtual Result runJob(KIO::Job* job) = 0;
+      virtual TDEIO::Job* createJob(const CDInfo& cdInfo) = 0;
+      virtual Result runJob(TDEIO::Job* job) = 0;
     
       bool validCategory(const TQString&);
 
diff --git a/libkcddb/synchttplookup.cpp b/libkcddb/synchttplookup.cpp
index fb2c90d7..c50618e1 100644
--- a/libkcddb/synchttplookup.cpp
+++ b/libkcddb/synchttplookup.cpp
@@ -114,12 +114,12 @@ namespace KCDDB
   {
     kdDebug(60010) << "About to fetch: " << cgiURL_.url() << endl;
 
-    KIO::TransferJob* job = KIO::get( cgiURL_, false, false );
+    TDEIO::TransferJob* job = TDEIO::get( cgiURL_, false, false );
 
     if ( 0 == job )
       return ServerError;
 
-    if (!KIO::NetAccess::synchronousRun(job, 0, &data_))
+    if (!TDEIO::NetAccess::synchronousRun(job, 0, &data_))
       return ServerError;
 
     jobFinished();
diff --git a/libkcddb/synchttpsubmit.cpp b/libkcddb/synchttpsubmit.cpp
index 8be4c60b..7920fce2 100644
--- a/libkcddb/synchttpsubmit.cpp
+++ b/libkcddb/synchttpsubmit.cpp
@@ -34,9 +34,9 @@ namespace KCDDB
 
   }
   
-  CDDB::Result SyncHTTPSubmit::runJob(KIO::Job* job)
+  CDDB::Result SyncHTTPSubmit::runJob(TDEIO::Job* job)
   {
-    bool success = KIO::NetAccess::synchronousRun(job, 0);
+    bool success = TDEIO::NetAccess::synchronousRun(job, 0);
 
     if (success)
       return CDDB::Success;
diff --git a/libkcddb/synchttpsubmit.h b/libkcddb/synchttpsubmit.h
index bd2974ac..a52f76e9 100644
--- a/libkcddb/synchttpsubmit.h
+++ b/libkcddb/synchttpsubmit.h
@@ -30,7 +30,7 @@ namespace KCDDB
       virtual ~SyncHTTPSubmit();
 
     protected:
-      virtual Result runJob(KIO::Job* job);
+      virtual Result runJob(TDEIO::Job* job);
   } ;
 }
 
diff --git a/libkcddb/syncsmtpsubmit.cpp b/libkcddb/syncsmtpsubmit.cpp
index 717c77a5..002c3304 100644
--- a/libkcddb/syncsmtpsubmit.cpp
+++ b/libkcddb/syncsmtpsubmit.cpp
@@ -36,9 +36,9 @@ namespace KCDDB
 
   }
 
-  CDDB::Result SyncSMTPSubmit::runJob(KIO::Job* job)
+  CDDB::Result SyncSMTPSubmit::runJob(TDEIO::Job* job)
   {
-    if ( KIO::NetAccess::synchronousRun(job, 0) )
+    if ( TDEIO::NetAccess::synchronousRun(job, 0) )
       return Success;
 
     return UnknownError;
diff --git a/libkcddb/syncsmtpsubmit.h b/libkcddb/syncsmtpsubmit.h
index 57c660f7..a6fb23df 100644
--- a/libkcddb/syncsmtpsubmit.h
+++ b/libkcddb/syncsmtpsubmit.h
@@ -30,7 +30,7 @@ namespace KCDDB
                      const TQString& from, const TQString& to);
       virtual ~SyncSMTPSubmit();
     protected:
-      virtual Result runJob(KIO::Job* job);
+      virtual Result runJob(TDEIO::Job* job);
   } ;
 }
 
diff --git a/noatun/FILES b/noatun/FILES
index b281f414..7f0c67d7 100644
--- a/noatun/FILES
+++ b/noatun/FILES
@@ -9,5 +9,5 @@ noatunview.cpp: The main view within the main view, which only contains the vide
 player: what happens when all the standard player buttons are fondled TODONOW
 playlist: abstraction of a playlist
 playlistview: the window with the playlist TODONOW
-setting: stores all the settings in KConfig
+setting: stores all the settings in TDEConfig
 videoframe: the little box that's supposed to get the video drawn in it
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 3b03971b..0e1ae639 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -68,7 +68,7 @@ NoatunApp::NoatunApp()
 
 	// set the default config data
 	// TODO: Maybe a first time wizard instead?
-	KConfig *config=TDEGlobal::config(); // +
+	TDEConfig *config=TDEGlobal::config(); // +
 	config->setGroup(TQString()); // 1
 	if (!config->readEntry("Modules").length())
 	{
@@ -146,7 +146,7 @@ NoatunApp::NoatunApp()
 NoatunApp::~NoatunApp()
 {
 	saveEngineState();
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("Volume", player()->volume());
 	config->writeEntry("LoopStyle", player()->loopStyle());
@@ -184,7 +184,7 @@ inline bool logicalXOR(bool A, bool B)
 #define READBOOLOPT_EX(name, string, def, group, reversal) \
 bool NoatunApp::name() const \
 { \
-	KConfig *config=TDEGlobal::config(); \
+	TDEConfig *config=TDEGlobal::config(); \
 	config->setGroup(group); \
 	return logicalXOR(config->readBoolEntry(string, def), reversal); \
 }
@@ -211,14 +211,14 @@ bool NoatunApp::clearOnStart() const
 
 int NoatunApp::startupPlayMode() const
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore);
 }
 
 void NoatunApp::setStartupPlayMode(int mode)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("StartupPlayMode", mode);
 	config->sync();
@@ -226,7 +226,7 @@ void NoatunApp::setStartupPlayMode(int mode)
 
 void NoatunApp::setHackUpPlaylist(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("HackUpPlaylist", b);
 	config->sync();
@@ -237,7 +237,7 @@ void NoatunApp::setFastMixer(bool b)
 	bool whatBefore=fastMixer();
 	if (whatBefore!=b)
 	{
-		KConfig *config=TDEGlobal::config();
+		TDEConfig *config=TDEGlobal::config();
 		config->setGroup(TQString());
 		config->writeEntry("FastMixer", b);
 		config->sync();
@@ -247,7 +247,7 @@ void NoatunApp::setFastMixer(bool b)
 
 void NoatunApp::setOneInstance(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("KDE");
 	config->writeEntry("MultipleInstances", !b);
 	config->sync();
@@ -255,7 +255,7 @@ void NoatunApp::setOneInstance(bool b)
 
 void NoatunApp::setLoopList(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("LoopList", b);
 	TDEGlobal::config()->sync();
@@ -263,7 +263,7 @@ void NoatunApp::setLoopList(bool b)
 
 void NoatunApp::setAutoPlay(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("AutoPlay", b);
 	TDEGlobal::config()->sync();
@@ -271,7 +271,7 @@ void NoatunApp::setAutoPlay(bool b)
 
 void NoatunApp::setRememberPositions(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("RememberPositions", b);
 	TDEGlobal::config()->sync();
@@ -279,7 +279,7 @@ void NoatunApp::setRememberPositions(bool b)
 
 void NoatunApp::setSaveDirectory(const TQString &s)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writePathEntry("SaveDirectory", s);
 	config->sync();
@@ -287,21 +287,21 @@ void NoatunApp::setSaveDirectory(const TQString &s)
 
 TQString NoatunApp::saveDirectory() const
 {
-	KConfig *c=TDEGlobal::config();
+	TDEConfig *c=TDEGlobal::config();
 	c->setGroup(TQString());
 	return c->readPathEntry("SaveDirectory", TQString(getenv("HOME")));
 }
 
 TQString NoatunApp::titleFormat() const
 {
-	KConfig *c=TDEGlobal::config();
+	TDEConfig *c=TDEGlobal::config();
 	c->setGroup(TQString());
 	return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")");
 }
 
 void NoatunApp::setTitleFormat(const TQString &format)
 {
-	KConfig *c=TDEGlobal::config();
+	TDEConfig *c=TDEGlobal::config();
 	c->setGroup(TQString());
 	return c->writeEntry("TitleFormat", format);
 }
@@ -313,7 +313,7 @@ void NoatunApp::setClearOnStart(bool b)
 
 void NoatunApp::setClearOnOpen(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("ClearOnOpen", b);
 	config->sync();
@@ -321,7 +321,7 @@ void NoatunApp::setClearOnOpen(bool b)
 
 void NoatunApp::setDisplayRemaining(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("DisplayRemaining", b);
 	config->sync();
@@ -501,7 +501,7 @@ TQImage NoatunApp::readPNG(const TQString &filename)
 
 void NoatunApp::restoreEngineState()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(TQString());
 	int state = config->readNumEntry("EngineState", Arts::posPlaying);
 	switch (state)
@@ -521,7 +521,7 @@ void NoatunApp::restoreEngineState()
 
 void NoatunApp::saveEngineState()
 {
-	KConfig* config=TDEGlobal::config();
+	TDEConfig* config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("EngineState", player()->engine()->state());
 	// we don't sync here since it's done in the destructor afterwards anyway
diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp
index 7836e61b..e1e210cb 100644
--- a/noatun/library/downloader.cpp
+++ b/noatun/library/downloader.cpp
@@ -179,10 +179,10 @@ void Downloader::getNext()
 	localfile=new TQFile(current->local);
 	localfile->open(IO_ReadWrite | IO_Append);
 
-	mJob= KIO::get(current->file, true, false);
-	connect(mJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-	connect(mJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(jobDone(KIO::Job*)));
-	connect(mJob, TQT_SIGNAL(percent(KIO::Job*, unsigned long)), TQT_SLOT(percent(KIO::Job*, unsigned long)));
+	mJob= TDEIO::get(current->file, true, false);
+	connect(mJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+	connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(jobDone(TDEIO::Job*)));
+	connect(mJob, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQT_SLOT(percent(TDEIO::Job*, unsigned long)));
 
 	if (mTimeout)
 		delete mTimeout;
@@ -191,7 +191,7 @@ void Downloader::getNext()
 	connect(mTimeout, TQT_SIGNAL(timeout()), TQT_SLOT(giveUpWithThisDownloadServerIsRunningNT()));
 }
 
-void Downloader::data(KIO::Job *, const TQByteArray &data)
+void Downloader::data(TDEIO::Job *, const TQByteArray &data)
 {
 	localfile->writeBlock(data);
 	localfile->flush();
@@ -199,7 +199,7 @@ void Downloader::data(KIO::Job *, const TQByteArray &data)
 	mTimeout=0;
 }
 
-void Downloader::jobDone(KIO::Job *)
+void Downloader::jobDone(TDEIO::Job *)
 {
 	delete mTimeout;
 	mTimeout=0;
@@ -226,7 +226,7 @@ void Downloader::giveUpWithThisDownloadServerIsRunningNT()
 	getNext();
 }
 
-void Downloader::percent( KIO::Job *, unsigned long percent)
+void Downloader::percent( TDEIO::Job *, unsigned long percent)
 {
 	if (current && current->notifier)
 		current->notifier->downloaded((int)percent);
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index 5cfd23ed..86c10381 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -462,7 +462,7 @@ bool Engine::initArts()
 		{
 			// aRts seems not to be running, let's try to run it
 			// First, let's read the configuration as in kcmarts
-			KConfig config("kcmartsrc");
+			TDEConfig config("kcmartsrc");
 			TQCString cmdline;
 
 			config.setGroup("Arts");
@@ -472,7 +472,7 @@ bool Engine::initArts()
 
 			// put the value of x11Comm into .mcoprc
 			{
-				KConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc");
+				TDEConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc");
 
 				if(x11Comm)
 					X11CommConfig.writeEntry("GlobalComm", "Arts::X11GlobalComm");
diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp
index 40b3606c..f787c585 100644
--- a/noatun/library/ksaver.cpp
+++ b/noatun/library/ksaver.cpp
@@ -115,7 +115,7 @@ bool Noatun::KSaver::close(void)
 		d->textStream = 0;
 		d->dataStream = 0;
 
-		bool retval = KIO::NetAccess::upload(d->tempFile->name(), d->url);
+		bool retval = TDEIO::NetAccess::upload(d->tempFile->name(), d->url);
 
 		delete d->tempFile;
 		d->tempFile = 0;
diff --git a/noatun/library/ksaver.h b/noatun/library/ksaver.h
index 91fc4af8..f9da43e2 100644
--- a/noatun/library/ksaver.h
+++ b/noatun/library/ksaver.h
@@ -42,7 +42,7 @@ class KSaver
 public:
 	/**
 	 * The constructor takes the url and decides the best way to save,
-	 * which will mean using something like KIO::NetAccess or TQFile.
+	 * which will mean using something like TDEIO::NetAccess or TQFile.
 	 */
 	KSaver(const KURL &_target);
 
diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h
index 19b1d30d..093b57d0 100644
--- a/noatun/library/noatun/downloader.h
+++ b/noatun/library/noatun/downloader.h
@@ -10,7 +10,7 @@ class TQTimer;
 class Downloader;
 
 
-namespace KIO
+namespace TDEIO
 {
 	class TransferJob;
 	class Job;
@@ -102,9 +102,9 @@ signals:
 private slots:
 	void getNext();
 
-	void data( KIO::Job *, const TQByteArray &data);
-	void percent( KIO::Job *, unsigned long percent);
-	void jobDone( KIO::Job *);
+	void data( TDEIO::Job *, const TQByteArray &data);
+	void percent( TDEIO::Job *, unsigned long percent);
+	void jobDone( TDEIO::Job *);
 	void giveUpWithThisDownloadServerIsRunningNT();
 
 private:
@@ -112,7 +112,7 @@ private:
 	TQPtrList<Downloader::QueueItem> *mUnstartedQueue;
 	TQFile *localfile;
 	Downloader::QueueItem *current;
-	KIO::TransferJob *mJob;
+	TDEIO::TransferJob *mJob;
 	TQTimer *mTimeout;
 	bool mStarted;
 };
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index dbb91766..49c6084b 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -440,7 +440,7 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt)
 		"file='" << url.url() << "', opt=" << opt << endl;
 
 	TQString dest;
-	if(KIO::NetAccess::download(url, dest, 0L))
+	if(TDEIO::NetAccess::download(url, dest, 0L))
 	{
 		TQFile file(dest);
 		if (!file.open(IO_ReadOnly))
@@ -479,7 +479,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
 	kdDebug(66666) << k_funcinfo << "file='" << file.path() << endl;
 
 	TQString localFile;
-	if(!KIO::NetAccess::download(file, localFile, 0L))
+	if(!TDEIO::NetAccess::download(file, localFile, 0L))
 		return false;
 
 	// if it's a PLS, transfer control, again (KIO bug?)
@@ -616,7 +616,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
 		prop.clear();
 	} // END while()
 
-	KIO::NetAccess::removeTempFile(localFile);
+	TDEIO::NetAccess::removeTempFile(localFile);
 
 //	kdDebug(66666) << k_funcinfo << "END" << endl;
 	return true;
@@ -678,7 +678,7 @@ bool PlaylistSaver::saveM3U(const KURL &file, int opt)
 	}
 
 	saver.close();
-	KIO::NetAccess::upload(local, file, 0L);
+	TDEIO::NetAccess::upload(local, file, 0L);
 	saver.remove();
 	return true;
 }
@@ -698,7 +698,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/)
 	kdDebug(66666) << k_funcinfo << "file='" << file.path() << endl;
 
 	TQString localFile;
-	if(!KIO::NetAccess::download(file, localFile, 0L))
+	if(!TDEIO::NetAccess::download(file, localFile, 0L))
 		return false;
 
 	TQFile checkFile(localFile);
diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp
index f715590a..4ba9ce3d 100644
--- a/noatun/library/pluginloader.cpp
+++ b/noatun/library/pluginloader.cpp
@@ -69,7 +69,7 @@ TQPtrList<Plugin> LibraryLoader::plugins() const
 
 bool LibraryLoader::loadAll()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("");
 	TQStringList modules = config->readListEntry("Modules");
 	return loadAll(modules);
@@ -221,7 +221,7 @@ void LibraryLoader::add(const TQString &spec)
 
 void LibraryLoader::setModules(const TQStringList &mods)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(0);
 	config->writeEntry("Modules", mods);
 	config->sync();
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index 76c2215d..08895643 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -323,7 +323,7 @@ void VEqualizer::init()
 	}
 	else
 	{
-		KConfig *config=kapp->config();
+		TDEConfig *config=kapp->config();
 		config->setGroup("Equalizer");
 		setEnabled(config->readBoolEntry("enabled", false));
 	}
@@ -535,7 +535,7 @@ void VEqualizer::setEnabled(bool e)
 {
 	update(true); // just in case
 	ETQBACK->enabled((long)e);
-	KConfig *config=kapp->config();
+	TDEConfig *config=kapp->config();
 	config->setGroup("Equalizer");
 	config->writeEntry("enabled", e);
 	config->sync();
@@ -586,7 +586,7 @@ bool VEqualizer::save(const KURL &filename, const TQString &friendly) const
 bool VEqualizer::load(const KURL &filename)
 {
 	TQString dest;
-	if(KIO::NetAccess::download(filename, dest, 0L))
+	if(TDEIO::NetAccess::download(filename, dest, 0L))
 	{
 		TQFile file(dest);
 		if (!file.open(IO_ReadOnly))
@@ -698,7 +698,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart)
 	preset.setName(nameReal);
 
 	save(preset.file(), nameReal);
-	KConfig *config=kapp->config();
+	TDEConfig *config=kapp->config();
 	config->setGroup("Equalizer");
 	TQStringList list = config->readListEntry("presets");
 	list += preset.file();
@@ -712,7 +712,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart)
 
 TQValueList<VPreset> VEqualizer::presets() const
 {
-	KConfig *conf=TDEGlobal::config();
+	TDEConfig *conf=TDEGlobal::config();
 	conf->setGroup("Equalizer");
 
 	TQStringList list;
@@ -761,7 +761,7 @@ VPreset VEqualizer::presetByName(const TQString &name)
 
 VPreset VEqualizer::presetByFile(const TQString &file)
 {
-	KConfig *conf=TDEGlobal::config();
+	TDEConfig *conf=TDEGlobal::config();
 	conf->setGroup("Equalizer");
 	TQStringList list=kapp->config()->readListEntry("presets");
 	if (list.contains(file))
@@ -911,7 +911,7 @@ TQString VPreset::file() const
 
 void VPreset::remove()
 {
-	KConfig *config=kapp->config();
+	TDEConfig *config=kapp->config();
 	config->setGroup("Equalizer");
 	TQStringList items=config->readListEntry("presets");
 	items.remove(file());
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 9876b3c1..42eaf19c 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -157,7 +157,7 @@ Excellent::Excellent()
 	setMinimumWidth(250);
 	resize(300, 75);
 
-	KConfig &config = *TDEGlobal::config();
+	TDEConfig &config = *TDEGlobal::config();
 
 	toolBar("main")->applySettings(&config, "Excellent main");
 
@@ -192,7 +192,7 @@ Excellent::Excellent()
 
 Excellent::~Excellent()
 {
-	KConfig &config = *TDEGlobal::config();
+	TDEConfig &config = *TDEGlobal::config();
 	saveMainWindowSettings(&config, "excellent");
 	toolBar("main")->saveSettings(&config, "Excellent main");
 	config.setGroup("excellent");
@@ -205,7 +205,7 @@ Excellent::~Excellent()
 
 void Excellent::showEvent(TQShowEvent *e)
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("excellent");
 	config->writeEntry("mappingState", NET::Visible);
 	config->sync();
@@ -215,7 +215,7 @@ void Excellent::showEvent(TQShowEvent *e)
 
 void Excellent::hideEvent(TQHideEvent *e)
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("excellent");
 	config->writeEntry("mappingState", NET::Withdrawn);
 	config->sync();
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 19097212..ab6c9194 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -129,7 +129,7 @@ void HTMLExport::slotExport()
 
 	file.close();
 	// tempfile -> userdefined file
-	KIO::NetAccess::upload(temp.name(), url, 0);
+	TDEIO::NetAccess::upload(temp.name(), url, 0);
 }
 
 TQString HTMLExport::htmlEscape(const TQString &source) {
@@ -176,7 +176,7 @@ Prefs::Prefs(TQObject *parent)
 {
 
 	// Init Config
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("HTMLExport");
 
 	// Set default values
@@ -275,7 +275,7 @@ Prefs::Prefs(TQObject *parent)
 
 void Prefs::save()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	TQString bgRealURL = bgPicPath->url();
 
@@ -295,7 +295,7 @@ void Prefs::save()
 
 void Prefs::reopen()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	headColorSelect->setColor(config->readColorEntry( "headColor" ) );
 	hoverColorSelect->setColor( config->readColorEntry( "hoverColor" ) );
 	bgColorSelect->setColor( config->readColorEntry( "bgColor" ) );
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index acadeabd..9e710547 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -44,7 +44,7 @@ public:
 private:
 	TQString htmlEscape(const TQString &source);
 	TQString getColorByEntry(TQString s);
-	KConfig *config;
+	TDEConfig *config;
 	KAction *mAction;
 
 private slots:
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 4e3a0711..77753cf4 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -103,8 +103,8 @@ IRPrefs::IRPrefs(TQObject *parent)
 
 void IRPrefs::save()
 {
-	KConfig *c = kapp->config();
-	KConfigGroupSaver groupSaver(c, "Infrared");
+	TDEConfig *c = kapp->config();
+	TDEConfigGroupSaver groupSaver(c, "Infrared");
 	c->writeEntry("CommandCount", s_commands.count());
 	int i = 1;
 	for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it)
@@ -282,8 +282,8 @@ void IRPrefs::readConfig()
 {
 	if (s_configRead)
 		return;
-	KConfig *c = kapp->config();
-	KConfigGroupSaver groupSaver(c, "Infrared");
+	TDEConfig *c = kapp->config();
+	TDEConfigGroupSaver groupSaver(c, "Infrared");
 	int count = c->readNumEntry("CommandCount");
 	for (int i = 1; i <= count; ++i)
 	{
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index eea42474..a53ed72f 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -52,7 +52,7 @@ KaimanPrefDlg::~KaimanPrefDlg()
 
 void KaimanPrefDlg::save()
 {
-    KConfig *config=TDEGlobal::config();
+    TDEConfig *config=TDEGlobal::config();
     config->setGroup("Kaiman");
     config->writeEntry("SkinResource", skin() );
     config->sync();
@@ -73,7 +73,7 @@ void KaimanPrefDlg::reopen()
         readSkinDir(*it);
 
     // load current config
-    KConfig *config=TDEGlobal::config();
+    TDEConfig *config=TDEGlobal::config();
     config->setGroup("Kaiman");
     TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN );
     TQListBoxItem *item = _skinList->findItem( skin );
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index e5dec5b5..462f5718 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -80,7 +80,7 @@ Kaiman::Kaiman()
 	_altSkin = false;
 
 	// init config
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("Kaiman");
 
 	// load skin
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 6fa576f5..b6d8e6eb 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -425,7 +425,7 @@ void KJPrefs::installNewSkin( void )
 		// FIXME: Do I have to wait for the job to finish?
 		// I'd say no because I don't care about the temp-dir
 		// anyway after leaving this method :)
-		KIO::del( tmpUnpackPath );
+		TDEIO::del( tmpUnpackPath );
 		return;
 	}
 
@@ -471,10 +471,10 @@ void KJPrefs::installNewSkin( void )
 				KMessageBox::error ( this,
 					i18n("Installing new skin failed: Destination path is invalid.\n"
 						"Please report a bug to the K-Jöfol maintainer") );
-				KIO::del( tmpUnpackPath );
+				TDEIO::del( tmpUnpackPath );
 				return;
 			}
-			KIO::mkdir( dst );
+			TDEIO::mkdir( dst );
 		}
 
 		if ( !src.isValid() || !dst.isValid() )
@@ -487,8 +487,8 @@ void KJPrefs::installNewSkin( void )
 		{
 			kdDebug(66666) << "src: " << src.path().latin1() << endl;
 			kdDebug(66666) << "dst: " << dst.path().latin1() << endl;
-			KIO::Job *job = KIO::copy(src,dst);
-			connect ( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotResult(KIO::Job*)) );
+			TDEIO::Job *job = TDEIO::copy(src,dst);
+			connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) );
 			skinInstalled = true;
 		}
 	} // END iterate trough dirList
@@ -502,7 +502,7 @@ void KJPrefs::installNewSkin( void )
 		KMessageBox::information ( this, i18n("The new skin has been successfully installed") );
 	}
 
-	KIO::del( tmpUnpackPath );
+	TDEIO::del( tmpUnpackPath );
 }
 
 
@@ -554,8 +554,8 @@ void KJPrefs::removeSelectedSkin( void )
 	if ( dirToDelete.length() != 0 )
 	{
 		kdDebug(66666) << "Deleting Skindir: " << dirToDelete.latin1() << endl;
-		KIO::Job *job = KIO::del( dirToDelete, false, true );
-		connect ( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotResult(KIO::Job*)) );
+		TDEIO::Job *job = TDEIO::del( dirToDelete, false, true );
+		connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) );
 	}
 
 	int item = -1;
@@ -579,7 +579,7 @@ void KJPrefs::removeSelectedSkin( void )
 		save();
 }
 
-void KJPrefs::slotResult(KIO::Job *job )
+void KJPrefs::slotResult(TDEIO::Job *job )
 {
 	if ( job->error() )
 	{
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index 218e20cb..0bb4540d 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -19,7 +19,7 @@ class TQComboBox;
 class TQLabel;
 class TQPushButton;
 class TQTabWidget;
-class KConfig;
+class TDEConfig;
 class KJLoader;
 
 class KJPrefs : public CModule
@@ -72,14 +72,14 @@ public slots:
 
 	// gets called after a KIO-action has finished
 	// KIO is used for installing/removing skins
-	void slotResult(KIO::Job *job);
+	void slotResult(TDEIO::Job *job);
 
 signals:
 	void configChanged();
 
 private:
 	TQPixmap mPixmap; // preview Pixmap
-	KConfig *cfg;
+	TDEConfig *cfg;
 
 	// Dialog-Widgets
 	TQTabWidget *mTabWidget;
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index 566e291d..62c959ac 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -94,7 +94,7 @@ void Marquis::restore(void)
 }
 
 // unload every window, and save the config as TQStringList of those loaded
-void Marquis::saveSessionConfig(KConfig *c)
+void Marquis::saveSessionConfig(TDEConfig *c)
 {
 	kdDebug(66666) << k_funcinfo << endl;
 
@@ -135,7 +135,7 @@ void Marquis::saveSessionConfig(KConfig *c)
 }
 
 // get the list of loaded plugins from the config, and load them
-void Marquis::readSessionConfig(KConfig *c)
+void Marquis::readSessionConfig(TDEConfig *c)
 {
 	Player *player = napp->player();
 
@@ -173,13 +173,13 @@ void Marquis::readSessionConfig(KConfig *c)
 
 void Marquis::dynamicSave()
 {
-	KConfig config( "marquisrc" );
+	TDEConfig config( "marquisrc" );
 	saveSessionConfig( &config );
 }
 
 void Marquis::dynamicRestore()
 {
-	KConfig config( "marquisrc" );
+	TDEConfig config( "marquisrc" );
 	readSessionConfig( &config );
 }
 
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index c96a6bd1..d07ed297 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -43,8 +43,8 @@ public:
 
 	virtual void restore(void);
 private:
-	void saveSessionConfig(KConfig *);
-	void readSessionConfig(KConfig *);
+	void saveSessionConfig(TDEConfig *);
+	void readSessionConfig(TDEConfig *);
 private slots:
 	void dynamicSave();
 	void dynamicRestore();
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index d89c1e3f..d76f3b54 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -83,7 +83,7 @@ SimpleUI::SimpleUI()
     extra_height = (height() - video->height());
 
     // Load configuration
-    KConfig &config = *TDEGlobal::config();
+    TDEConfig &config = *TDEGlobal::config();
     config.setGroup( "Simple" );
     TQString str = config.readEntry( "View", "NormalSize" );
 
@@ -104,7 +104,7 @@ SimpleUI::SimpleUI()
 
 SimpleUI::~SimpleUI()
 {
-    KConfig &config = *TDEGlobal::config();
+    TDEConfig &config = *TDEGlobal::config();
     saveMainWindowSettings( &config, "Simple" );
     config.setGroup( "Simple" );
     TQString str;
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 764cbc7e..50245140 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -490,7 +490,7 @@ void View::exportTo(const KURL &url)
 	}
 	saver.close();
 
-	KIO::NetAccess::upload(local, url, this);
+	TDEIO::NetAccess::upload(local, url, this);
 
 	saver.remove();
 }
@@ -567,18 +567,18 @@ void List::addNextPendingDirectory()
 	if (!listJob &&	(pendingIt!= pendingAddDirectories.end()))
 	{
 		currentJobURL= *pendingIt;
-		listJob= KIO::listRecursive(currentJobURL, false,false);
+		listJob= TDEIO::listRecursive(currentJobURL, false,false);
 		connect(
-				listJob, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
-				TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&))
+				listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
+				TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
 			);
 		connect(
-				listJob, TQT_SIGNAL(result(KIO::Job *)),
-				TQT_SLOT(slotResult(KIO::Job *))
+				listJob, TQT_SIGNAL(result(TDEIO::Job *)),
+				TQT_SLOT(slotResult(TDEIO::Job *))
 			);
 		connect(
-				listJob, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)),
-				TQT_SLOT(slotRedirection(KIO::Job *, const KURL &))
+				listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
+				TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
 			);
 		pendingAddDirectories.remove(pendingIt);
 	}
@@ -592,7 +592,7 @@ void List::addDirectoryRecursive(const KURL &dir, TQListViewItem *after)
 	addNextPendingDirectory();
 }
 
-void List::slotResult(KIO::Job *job)
+void List::slotResult(TDEIO::Job *job)
 {
 	listJob= 0;
 	if (job && job->error())
@@ -600,12 +600,12 @@ void List::slotResult(KIO::Job *job)
 	addNextPendingDirectory();
 }
 
-void List::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
+void List::slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &entries)
 {
 	TQMap<TQString,KURL> __list; // temp list to sort entries
 
-	KIO::UDSEntryListConstIterator it = entries.begin();
-	KIO::UDSEntryListConstIterator end = entries.end();
+	TDEIO::UDSEntryListConstIterator it = entries.begin();
+	TDEIO::UDSEntryListConstIterator end = entries.end();
 
 	for (; it != end; ++it)
 	{
@@ -626,7 +626,7 @@ void List::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
 	}
 }
 
-void List::slotRedirection(KIO::Job *, const KURL & url)
+void List::slotRedirection(TDEIO::Job *, const KURL & url)
 {
 	currentJobURL= url;
 }
@@ -797,7 +797,7 @@ void View::init()
 		list->openGlobal(internalURL);
 	}
 
-	KConfig &config = *TDEGlobal::config();
+	TDEConfig &config = *TDEGlobal::config();
 	config.setGroup("splitplaylist");
 
 	// this has to come after openGlobal, since openGlobal emits modified()
@@ -942,7 +942,7 @@ void View::setModified(void)
 
 void View::saveState(void)
 {
-	KConfig &config = *TDEGlobal::config();
+	TDEConfig &config = *TDEGlobal::config();
 	config.setGroup("splitplaylist");
 
 	config.writeEntry("modified", modified);
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index caad3a66..48a30df5 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -12,7 +12,7 @@
 
 class Finder;
 class View;
-namespace KIO { class ListJob; }
+namespace TDEIO { class ListJob; }
 
 
 class SafeListViewItem
@@ -87,15 +87,15 @@ protected:
 	TQListViewItem *recursiveAddAfter;
 
 protected slots:
-	// used when adding directories via KIO::listRecursive
-	void slotResult(KIO::Job *job);
-	void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries);
-	void slotRedirection(KIO::Job *, const KURL & url);
+	// used when adding directories via TDEIO::listRecursive
+	void slotResult(TDEIO::Job *job);
+	void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries);
+	void slotRedirection(TDEIO::Job *, const KURL & url);
 
 protected:
 	void addNextPendingDirectory();
 	KURL::List pendingAddDirectories;
-	KIO::ListJob *listJob;
+	TDEIO::ListJob *listJob;
 	KURL currentJobURL;
 };
 
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 9a45212b..0788ceb3 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -352,7 +352,7 @@ void NoatunSystray::updateCover()
 void NoatunSystray::removeCover()
 {
 	if(TQFile::exists(tmpCoverPath))
-		KIO::NetAccess::del(KURL(tmpCoverPath), this);
+		TDEIO::NetAccess::del(KURL(tmpCoverPath), this);
 }
 
 
diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp
index 4a252d75..882c05a4 100644
--- a/noatun/modules/voiceprint/prefs.cpp
+++ b/noatun/modules/voiceprint/prefs.cpp
@@ -38,7 +38,7 @@ Prefs::Prefs(TQObject* parent)
 
 void Prefs::reopen()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("VoicePrint");
         TQColor black(0, 0, 0);
         TQColor blue(0, 0, 222);
@@ -49,7 +49,7 @@ void Prefs::reopen()
 
 void Prefs::save()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("VoicePrint");
 	config->writeEntry("Background", mBackground->color());
 	config->writeEntry("Foreground", mForeground->color());
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index 16d01a96..d0447397 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -51,7 +51,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
     analyserCache = NULL;
     winSkinVis = NULL;
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
 
     setVisualizationMode(config->readNumEntry("visualizationMode", MODE_ANALYSER));
@@ -61,7 +61,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
 
 GuiSpectrumAnalyser::~GuiSpectrumAnalyser()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
 
     config->writeEntry("visualizationMode", visualization_mode);
diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp
index f19266b1..d18d9ead 100644
--- a/noatun/modules/winskin/waDigit.cpp
+++ b/noatun/modules/winskin/waDigit.cpp
@@ -20,7 +20,7 @@
 
 WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
 
     reverse_time = config->readNumEntry("timeReversed", false);
@@ -29,7 +29,7 @@ WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
 
 WaDigit::~WaDigit()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
     config->writeEntry("timeReversed", reverse_time);
 }
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index 2692a742..80375a90 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -69,7 +69,7 @@ void WaInfo::scrollerSetup()
     if (completePixmap->width() > size.width()) {
 		xScrollDirection = 1;
 		
-		KConfig *config=TDEGlobal::config();
+		TDEConfig *config=TDEGlobal::config();
 		config->setGroup("Winskin");
 		int s = config->readNumEntry("ScrollDelay", 15);
 		if (s!=0)
diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp
index f76cdabb..fdbad9af 100644
--- a/noatun/modules/winskin/waRegion.cpp
+++ b/noatun/modules/winskin/waRegion.cpp
@@ -27,7 +27,7 @@ const char *pointListNames[] = {"PointList", "pointlist", "Pointlist", "pointLis
 const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoints", "NUMPOINTS", 0};
 
 WaRegion::WaRegion(TQString filename) {
-    // Load the region file, which happens to be in KConfig format
+    // Load the region file, which happens to be in TDEConfig format
     KSimpleConfig regionFile(filename, true);
 
     // Clear our variables by default
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index d6d8fe58..4512d067 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -95,7 +95,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
     connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()));
 
     connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick()));
-    KConfig *config=TDEGlobal::config();
+    TDEConfig *config=TDEGlobal::config();
 
     config->setGroup("Winskin");
     TQString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin());
diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp
index 4288119e..f7d9b777 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -72,8 +72,8 @@ bool WaSkinManager::installSkin(TQString _url) {
 
 	if (mimetype == "inode/directory")
 	{
-		KIO::Job *job = KIO::copy(url, location, !url.isLocalFile());
-		connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+		TDEIO::Job *job = TDEIO::copy(url, location, !url.isLocalFile());
+		connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
 		return true;
 	}
 	else if ((mimetype == "interface/x-winamp-skin") || (mimetype == "application/x-zip"))
@@ -83,8 +83,8 @@ bool WaSkinManager::installSkin(TQString _url) {
 
 		TQString base_path;
 		base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " ");
-		KIO::Job *job = KIO::copy("zip:" + url.path(), base_path);
-		connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+		TDEIO::Job *job = TDEIO::copy("zip:" + url.path(), base_path);
+		connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
 
 		return true;
 	}
@@ -98,8 +98,8 @@ bool WaSkinManager::removeSkin(TQString skinName) {
 
 	TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName);
 
-	KIO::Job *job = KIO::del(KURL(skins[0]), false, false);
-	connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+	TDEIO::Job *job = TDEIO::del(KURL(skins[0]), false, false);
+	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
 
 	return true;
 }
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 13e626fa..7d2c866d 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -78,7 +78,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
 
 void WinSkinConfig::save()
 {
-    KConfig *config=TDEGlobal::config();
+    TDEConfig *config=TDEGlobal::config();
     config->setGroup("Winskin");
     config->writeEntry("CurrentSkin", skin_list->currentText());
     config->writeEntry("ScrollDelay", scrollSpeed->value());
@@ -123,7 +123,7 @@ void WinSkinConfig::reopen() {
         skin_list->setCurrentItem( 0 );
     }
 	
-    KConfig *config=TDEGlobal::config();
+    TDEConfig *config=TDEGlobal::config();
     config->setGroup("Winskin");
 	scrollSpeed->setValue(config->readNumEntry("ScrollDelay", 15));
 }