Use TDESimpleConfig

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

116 files changed, 336 insertions, 338 deletions

diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index d7b3dd4c8..613e9f604 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -39,7 +39,7 @@
 #include <klibloader.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestartupinfo.h>
 
 #include <tqfile.h>
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 5ed8f8354..aad992e3b 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -54,7 +54,7 @@
 #include <kkeydialog.h>
 #include <tdelistbox.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstdaction.h>
 #include <tdestandarddirs.h>
 #include <twin.h>
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 89e67229e..1c7f0f4ba 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -65,7 +65,7 @@
 #include <kmimetype.h>
 #include <kopenwith.h>
 #include <tdepopupmenu.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <tdestandarddirs.h>
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index 9461a8a4a..74c348833 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -101,7 +101,7 @@ KateSession::KateSession(const KateSession &session, const TQString &newSessionN
   createFilename();
   if (session.m_config)
   {
-    m_config = new KSimpleConfig(m_filename);
+    m_config = new TDESimpleConfig(m_filename);
     session.m_config->copyTo(m_filename, m_config);
     m_config->sync();
   }
@@ -139,7 +139,7 @@ void KateSession::load(bool includeGUIInfo)
   if (TDEGlobal::dirs()->exists(m_filename))
   {
     // Create config object if the session file already exists
-    m_config = new KSimpleConfig(m_filename, m_readOnly);
+    m_config = new TDESimpleConfig(m_filename, m_readOnly);
     m_config->setGroup(KS_GENERAL);
     // Session general properties
     m_sessionName = m_config->readEntry(KS_NAME, i18n(KS_UNNAMED));
@@ -211,7 +211,7 @@ void KateSession::save(bool saveGUIInfo, bool setReadOnly)
   // save session config info
   if (!m_config)
   {
-    m_config = new KSimpleConfig(m_filename);
+    m_config = new TDESimpleConfig(m_filename);
   }
 
   if (m_config->hasGroup(KS_GENERAL))
@@ -342,7 +342,7 @@ KateSessionManager::KateSessionManager() :
   if (TDEGlobal::dirs()->exists(m_configFile))
   {
     // Read new style configuration (from TDE R14.1.0)
-    m_config = new KSimpleConfig(m_configFile);
+    m_config = new TDESimpleConfig(m_configFile);
     m_config->setGroup(KSM_SESSIONS_LIST);
     sessionsCount = m_config->readNumEntry(KSM_SESSIONS_COUNT, 0);
     m_lastSessionId = m_config->readNumEntry(KSM_LAST_SESSION_ID, INVALID_SESSION);
@@ -503,7 +503,7 @@ void KateSessionManager::saveConfig(bool saveSessions)
   
   if (!m_config)
   {
-    m_config = new KSimpleConfig(m_configFile);
+    m_config = new TDESimpleConfig(m_configFile);
   }
   if (m_config->hasGroup(KSM_SESSIONS_LIST))
   {
diff --git a/kate/app/katesession.h b/kate/app/katesession.h
index fa267e91f..d9fe8f637 100644
--- a/kate/app/katesession.h
+++ b/kate/app/katesession.h
@@ -22,7 +22,7 @@
 #include "katemain.h"
 
 #include <kdialogbase.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <ksharedptr.h>
 #include <tdeaction.h>
 
@@ -145,7 +145,7 @@ class KateSession
 		TQString       m_filename;
 		bool           m_readOnly;
 		TQStringList   m_documents;           // document URLs
-		KSimpleConfig *m_config;              // session config
+		TDESimpleConfig *m_config;            // session config
 
 };
 //END KateSession
@@ -464,20 +464,20 @@ class KateSessionManager : public TQObject
 		 * @param sessionId the id of the session to save
 		 * @param saveGUIInfo if true, save also the information about the GUI elements
 		 * @param setReadOnly necessary to save a session that has to be turned to read only
-     * @emit sessionSaved
-     */
+		 * @emit sessionSaved
+		 */
 		void saveSession(int sessionId, bool saveGUIInfo, bool setReadOnly = false);
 
 
-		TQString m_baseDir;       					// folder where session files are stored
-		TQString m_configFile;     					// file where the session list config is stored
+		TQString m_baseDir;                 // folder where session files are stored
+		TQString m_configFile;              // file where the session list config is stored
 		int m_activeSessionId;              // id of the active session
-    int m_lastSessionId;                // id of the last active session before closing Kate
+		int m_lastSessionId;                // id of the last active session before closing Kate
 		TQPtrList<KateSession> m_sessions;  // session list
-		KSimpleConfig *m_config;        		// session manager config
+		TDESimpleConfig *m_config;          // session manager config
 		int m_startupOption;                // session option on Kate startup
 		int m_switchOption;                 // session option on session switch or Kate shutdown
-		
+
 		static KateSessionManager *ksm_instance;  // the only KateSessionManager instance
 };
 //END KateSessionManager
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 3beb95826..a3db1dde7 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -39,7 +39,7 @@
 #include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstdaction.h>
 #include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 0908fb778..306514791 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -40,7 +40,7 @@
 #include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstdaction.h>
 #include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index bb206a433..0e63f876f 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -45,7 +45,7 @@
 #include <tdemessagebox.h>
 #include <tdeprocess.h>
 #include <krichtextlabel.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <kurlrequester.h>
 #include <libtdemid/deviceman.h>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 13c314d89..79686182e 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -536,7 +536,7 @@ void BGDialog::loadWallpaperFilesList() {
    TQStringList hiddenfiles;
    for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
    {
-      KSimpleConfig fileConfig(*it);
+      TDESimpleConfig fileConfig(*it);
       fileConfig.setGroup("Wallpaper");
 
       int slash = (*it).findRev('/') + 1;
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 9a3392d84..2f41cb4c0 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <krandomsequence.h>
 #include <konq_defaults.h>
@@ -84,9 +84,9 @@ void KBackgroundPattern::init(bool force_rw)
     m_File = m_pDirs->findResource("dtop_pattern", m_Name + ".desktop");
     if (force_rw || m_File.isEmpty()) {
         m_File = m_pDirs->saveLocation("dtop_pattern") + m_Name + ".desktop";
-        m_pConfig = new KSimpleConfig(m_File);
+        m_pConfig = new TDESimpleConfig(m_File);
     } else
-        m_pConfig = new KSimpleConfig(m_File);
+        m_pConfig = new TDESimpleConfig(m_File);
 
     m_pConfig->setGroup("KDE Desktop Pattern");
 
@@ -251,10 +251,10 @@ void KBackgroundProgram::init(bool force_rw)
     m_File = m_pDirs->findResource("dtop_program", m_Name + ".desktop");
     if (force_rw || m_File.isEmpty()) {
         m_File = m_pDirs->saveLocation("dtop_program") + m_Name + ".desktop";
-        m_pConfig = new KSimpleConfig(m_File);
+        m_pConfig = new TDESimpleConfig(m_File);
         m_bReadOnly = false;
     } else {
-        m_pConfig = new KSimpleConfig(m_File);
+        m_pConfig = new TDESimpleConfig(m_File);
         m_bReadOnly = (m_File != locateLocal("dtop_program", m_Name + ".desktop"));
     }
     m_pConfig->setGroup("KDE Desktop Program");
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index 348446c82..40b2c68d8 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -17,7 +17,7 @@
 
 template <class TQString, class T> class TQMap;
 class TDEStandardDirs;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TDEConfig;
 class TQString;
 class TQImage;
@@ -66,7 +66,7 @@ private:
     TQString m_Name, m_Comment;
     TQString m_Pattern, m_File;
     TDEStandardDirs *m_pDirs;
-    KSimpleConfig *m_pConfig;
+    TDESimpleConfig *m_pConfig;
 };
 
 
@@ -137,7 +137,7 @@ private:
     TQString m_PreviewCommand, m_Comment;
     TQString m_Executable, m_File;
     TDEStandardDirs *m_pDirs;
-    KSimpleConfig *m_pConfig;
+    TDESimpleConfig *m_pConfig;
 };
 
 
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 7b8b029a7..b91dabc06 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -371,8 +371,8 @@ void KColorScheme::save()
     cfg->sync();
 
     // KDE-1.x support
-    KSimpleConfig *config =
-    new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+    TDESimpleConfig *config =
+    new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
     config->setGroup( "General" );
     config->writeEntry("background", cs->back );
     config->writeEntry("selectBackground", cs->select );
@@ -443,7 +443,7 @@ void KColorScheme::slotSave( )
     KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
     if (!entry) return;
     sCurrentScheme = entry->path;
-    KSimpleConfig *config = new KSimpleConfig(sCurrentScheme );
+    TDESimpleConfig *config = new TDESimpleConfig(sCurrentScheme );
     int i = sCurrentScheme.findRev('/');
     if (i >= 0)
       sCurrentScheme = sCurrentScheme.mid(i+1);
@@ -561,7 +561,7 @@ void KColorScheme::slotAdd()
     else
     {
        sFile = TDEGlobal::dirs()->saveLocation("data", "tdedisplay/color-schemes/") + sFile + ".kcsrc";
-       KSimpleConfig *config = new KSimpleConfig(sFile);
+       TDESimpleConfig *config = new TDESimpleConfig(sFile);
        config->setGroup( "Color Scheme");
        config->writeEntry("Name", sName);
        delete config;
@@ -595,7 +595,7 @@ void KColorScheme::slotImport()
 	else
 	{
 		TQString sFile = location + file.fileName( false );
-		KSimpleConfig *config = new KSimpleConfig(sFile);
+		TDESimpleConfig *config = new TDESimpleConfig(sFile);
 		config->setGroup( "Color Scheme");
 		TQString sName = config->readEntry("Name", i18n("Untitled Theme"));
 		delete config;
@@ -798,7 +798,7 @@ void KColorScheme::readScheme( int index )
       KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
       if (!entry) return;
       sCurrentScheme = entry->path;
-      config = new KSimpleConfig(sCurrentScheme, true);
+      config = new TDESimpleConfig(sCurrentScheme, true);
       config->setGroup("Color Scheme");
       int i = sCurrentScheme.findRev('/');
       if (i >= 0)
@@ -865,7 +865,7 @@ void KColorScheme::readSchemeNames()
 
     // And add them
     for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
-       KSimpleConfig *config = new KSimpleConfig(*it);
+       TDESimpleConfig *config = new TDESimpleConfig(*it);
        config->setGroup("Color Scheme");
        TQString str = config->readEntry("Name");
        if (str.isEmpty()) {
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index 011b977c9..3ad2073b1 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -33,7 +33,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kopenwith.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <ktrader.h>
 #include <kurlrequester.h>
@@ -425,7 +425,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
 	TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
 	for (TQStringList::Iterator it=services.begin();it!=services.end();++it)
 	{
-		KSimpleConfig cfg(*it);
+		TDESimpleConfig cfg(*it);
 		ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
 
 	}
@@ -443,7 +443,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 	if (somethingChanged) {
 		if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save();
 	}
-	KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
+	TDESimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
 
 	ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
 	ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
@@ -534,7 +534,7 @@ void ComponentChooser::load() {
 				configWidget->tqt_cast( "CfgPlugin" ) );
 		if( plugin )
 		{
-			KSimpleConfig cfg(latestEditedService);
+			TDESimpleConfig cfg(latestEditedService);
 			plugin->load( &cfg );
 		}
 	}
@@ -547,7 +547,7 @@ void ComponentChooser::save() {
 				configWidget->tqt_cast( "CfgPlugin" ) );
 		if( plugin )
 		{
-			KSimpleConfig cfg(latestEditedService);
+			TDESimpleConfig cfg(latestEditedService);
 			plugin->save( &cfg );
 		}
 	}
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index cf6ec0a5c..a1efa58d0 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -308,9 +308,9 @@ TQString whatstr;
 
   // no need to parse kdeglobals.
   config = new TDEConfig("cryptodefaults", false, false);
-  policies = new KSimpleConfig("ksslpolicies", false);
-  pcerts = new KSimpleConfig("ksslcertificates", false);
-  authcfg = new KSimpleConfig("ksslauthmap", false);
+  policies = new TDESimpleConfig("ksslpolicies", false);
+  pcerts = new TDESimpleConfig("ksslcertificates", false);
+  authcfg = new TDESimpleConfig("ksslauthmap", false);
 
 #ifdef HAVE_SSL
   SSLv3Box = new TQListView(tabSSL, "v3ciphers");
diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h
index f468a473a..bdb0d74ec 100644
--- a/kcontrol/crypto/crypto.h
+++ b/kcontrol/crypto/crypto.h
@@ -34,7 +34,7 @@
 #include <tqvbuttongroup.h>
 
 #include <tdecmodule.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 class TQGridLayout;
 class TQVButtonGroup;
@@ -354,7 +354,7 @@ private:
   TQLabel *cHash;
 
   TDEConfig *config;
-  KSimpleConfig *policies, *pcerts, *authcfg;
+  TDESimpleConfig *policies, *pcerts, *authcfg;
   TDEConfig *cacfg;
 
   bool ___lehack;       // to hack around a lineedit problem
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 21857b5bc..a5c3205b3 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -50,7 +50,7 @@
 #include <tdestandarddirs.h>
 
 #include <unistd.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <string>
 #include <stdio.h>
 #include <tqstring.h>
@@ -64,7 +64,7 @@
 typedef KGenericFactory<KDisplayConfig, TQWidget> KDisplayCFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_displayconfig, KDisplayCFactory("kcmdisplayconfig") )
 
-KSimpleConfig *systemconfig;
+TDESimpleConfig *systemconfig;
 
 TQPoint moveTQRectOutsideTQRect(TQRect base, TQRect movable, int fallback_level = 0) {
 	TQPoint final_result;
@@ -752,11 +752,11 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 
 	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	if (getuid() != 0) {
-		systemconfig = new KSimpleConfig( locateLocal("config", "tdedisplay/", true) + "tdedisplayconfigrc" );
+		systemconfig = new TDESimpleConfig( locateLocal("config", "tdedisplay/", true) + "tdedisplayconfigrc" );
 		systemconfig->setFileWriteMode(0600);
 	}
 	else {
-		systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdedisplay/tdedisplayconfigrc" ));
+		systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdedisplay/tdedisplayconfigrc" ));
 		systemconfig->setFileWriteMode(0644);
 	}
 
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index f634e6bc2..0bad0dfa7 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -38,7 +38,7 @@
 #include <tdeprocess.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
 
@@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); 
 	addConfig(DNSSD::Configuration::self(),this);
 	// it is host-wide setting so it has to be in global config file
-	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
+	domain = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
 	domain->setGroup("publishing");
 	load();
 	connect(hostedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged()));
diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h
index 03699af04..ebc26530d 100644
--- a/kcontrol/dnssd/kcmdnssd.h
+++ b/kcontrol/dnssd/kcmdnssd.h
@@ -26,7 +26,7 @@
 #include <configdialog.h>
 #include <tdeaboutdata.h>
 
-class KSimpleConfig;
+class TDESimpleConfig;
 class KCMDnssd: public ConfigDialog
 {
 	TQ_OBJECT
@@ -45,7 +45,7 @@ private:
 	bool saveMdnsd();
 	TQMap<TQString,TQString> mdnsdLines;
 	bool m_wdchanged;
-	KSimpleConfig* domain;
+	TDESimpleConfig* domain;
 	bool m_enableZeroconfChanged;
 };
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index dd20ec3ae..622cec32c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -38,7 +38,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kservice.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <ktrader.h>
 
@@ -274,7 +274,7 @@ void FilterOptions::save()
         }
       }
 
-      KSimpleConfig service(path + name + ".desktop");
+      TDESimpleConfig service(path + name + ".desktop");
       service.setGroup("Desktop Entry");
       service.writeEntry("Type", "Service");
       service.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
@@ -304,7 +304,7 @@ void FilterOptions::save()
           TQFile::remove(matches[0]);
           continue;
       }
-      KSimpleConfig service(path + *it + ".desktop");
+      TDESimpleConfig service(path + *it + ".desktop");
       service.setGroup("Desktop Entry");
       service.writeEntry("Type", "Service");
       service.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index 741e55200..a33f4e78b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -35,7 +35,7 @@
 #include <tdeapplication.h>
 #include <tdestandarddirs.h>
 #include <kprotocolinfo.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstaticdeleter.h>
 
 #include "kuriikwsfiltereng.h"
@@ -449,7 +449,7 @@ void KURISearchFilterEngine::loadConfig()
   // contains the sycoca based search provider configuration (malte).
   // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time...
   {
-    KSimpleConfig oldConfig(tdeApp->dirs()->saveLocation("config") + TQString(name()) + "rc");
+    TDESimpleConfig oldConfig(tdeApp->dirs()->saveLocation("config") + TQString(name()) + "rc");
     oldConfig.setGroup("General");
 
     if (oldConfig.hasKey("SearchEngines"))
@@ -498,7 +498,7 @@ void KURISearchFilterEngine::loadConfig()
           delete provider;
         }
 
-        KSimpleConfig desktop(tdeApp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
+        TDESimpleConfig desktop(tdeApp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
         desktop.setGroup("Desktop Entry");
         desktop.writeEntry("Type", "Service");
         desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 8c93d556f..6236ad49f 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -29,7 +29,7 @@
 #include <tdemessagebox.h>
 #include <knuminput.h>
 #include <tdeprocio.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <stdlib.h>
 
@@ -186,7 +186,7 @@ void FontUseItem::writeFont()
     config->setGroup(_rcgroup);
     config->writeEntry(_rckey, font(), true, true);
   } else {
-    config = new KSimpleConfig(locateLocal("config", _rcfile));
+    config = new TDESimpleConfig(locateLocal("config", _rcfile));
     config->setGroup(_rcgroup);
     config->writeEntry(_rckey, font());
     config->sync();
@@ -744,7 +744,7 @@ void TDEFonts::save()
   }
 
   // KDE-1.x support
-  KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+  TDESimpleConfig* config = new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
   config->setGroup( "General" );
   for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) {
       if("font"==i->rcKey())
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index 6655bec65..f1726a2a1 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -36,7 +36,7 @@
 #include "tdeprocess.h"
 #include <kpropertiesdialog.h>
 #include <krun.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include <tdeaction.h>
@@ -188,7 +188,7 @@ HwDeviceSystemTray::~HwDeviceSystemTray()
  */
 void HwDeviceSystemTray::quitApp()
 {
-	KSimpleConfig *config = new KSimpleConfig("tdehwdevicetrayrc");
+	TDESimpleConfig *config = new TDESimpleConfig("tdehwdevicetrayrc");
 
 	TQString tmp1 = i18n("Start device monitor automatically when you log in?");
 	int tmp2 = KMessageBox::questionYesNo(0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index 97251cb89..662844ec3 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -44,7 +44,7 @@
 
 #include <unistd.h>
 #include <kpassdlg.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <string>
 #include <stdio.h>
 #include <tqstring.h>
@@ -59,8 +59,8 @@ using namespace std;
 typedef KGenericFactory<TDEHWManager, TQWidget> TDEHWManagerFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_hwmanager, TDEHWManagerFactory("kcmhwmanager") )
 
-KSimpleConfig *config;
-KSimpleConfig *systemconfig;
+TDESimpleConfig *config;
+TDESimpleConfig *systemconfig;
 
 /**** TDEHWManager ****/
 
@@ -68,8 +68,8 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
   : TDECModule(TDEHWManagerFactory::instance(), parent, name)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));
-	systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" ));
+	config = new TDESimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));
+	systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" ));
 
 	TDEAboutData *about =
 	new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Device Manager"), 0,
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 218c3e615..82fc0edfd 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -42,7 +42,7 @@
 #include <kgenericfactory.h>
 
 #include <unistd.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <string>
 #include <stdio.h>
 #include <tqstring.h>
@@ -55,8 +55,8 @@ using namespace std;
 typedef KGenericFactory<KICCConfig, TQWidget> KICCCFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_iccconfig, KICCCFactory("kcmiccconfig") )
 
-KSimpleConfig *config;
-KSimpleConfig *systemconfig;
+TDESimpleConfig *config;
+TDESimpleConfig *systemconfig;
 
 /**** KICCConfig ****/
 
@@ -66,12 +66,12 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
 
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
   if (getuid() != 0) {
-      config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
+      config = new TDESimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
   }
   else {
       config = NULL;
   }
-  systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
+  systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
 
   TDEAboutData *about =
   new TDEAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE Color Profile Control Module"),
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index ce8968198..c2fed475f 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -105,8 +105,8 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
 
     top->activate();
 
-    mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
-    mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
+    mpSystrayConfig = new TDESimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
+    mpKickerConfig = new TDESimpleConfig( TQString::fromLatin1( "kickerrc" ));
 
     init();
     read();
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 3fe37a3a4..2d17ecf0c 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -18,7 +18,7 @@
 
 #include <tdecmodule.h>
 #include <kdialogbase.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 class TQCheckBox;
 class TQColor;
@@ -107,8 +107,8 @@ private:
     TDEIconTheme *mpTheme;
     TDEIconLoader *mpLoader;
     TDEConfig *mpConfig;
-    KSimpleConfig *mpSystrayConfig;
-    KSimpleConfig *mpKickerConfig;
+    TDESimpleConfig *mpSystrayConfig;
+    TDESimpleConfig *mpKickerConfig;
 
     typedef TQLabel *QLabelPtr;
     QLabelPtr mpPreview[3];
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 44b6cb04c..b6a37f11f 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -31,7 +31,7 @@
 #include <tdestandarddirs.h>
 #include <kservice.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #undef Unsorted
 #include <kipc.h>
 
@@ -419,7 +419,7 @@ void IconThemesConfig::save()
   if (!selected)
      return;
 
-  KSimpleConfig *config = new KSimpleConfig("kdeglobals", false);
+  TDESimpleConfig *config = new TDESimpleConfig("kdeglobals", false);
   config->setGroup("Icons");
   config->writeEntry("Theme", m_themeNames[selected->text(0)]);
   delete config;
diff --git a/kcontrol/input/tdesyndaemon.cpp b/kcontrol/input/tdesyndaemon.cpp
index d81371e51..c879c92a6 100644
--- a/kcontrol/input/tdesyndaemon.cpp
+++ b/kcontrol/input/tdesyndaemon.cpp
@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 
 // TDE
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
@@ -122,7 +122,7 @@ bool TDESynDaemon::touchpadEnabled()
     // We can't read from our own TouchpadSettings
     // as it contains the currently applied value
     // so we revert to this
-    KSimpleConfig cfg("kcminputrc");
+    TDESimpleConfig cfg("kcminputrc");
     cfg.setGroup("Touchpad");
     return cfg.readBoolEntry("Enabled", true);
 }
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 33d31357a..32e036f8c 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -24,7 +24,7 @@
 #include <tdeaboutdata.h>
 #include <tdestandarddirs.h>
 #include <tdelistview.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobalsettings.h>
 #include <kdialog.h>
 #include <tdemessagebox.h>
@@ -343,7 +343,7 @@ void ThemePage::insertTheme( const TQString &path )
 	TQString desc   = defaultThemeDescription( name );
 	TQString sample = "left_ptr";
 
-	KSimpleConfig c( path + "/index.theme", true ); // Open read-only
+	TDESimpleConfig c( path + "/index.theme", true ); // Open read-only
 	c.setGroup( "Icon Theme" );
 
 	// Don't insert the theme if it's hidden.
@@ -429,7 +429,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
 			// Parse the index.theme file if one exists
 			if ( haveIndexFile )
 			{
-				KSimpleConfig c( indexfile, true ); // Open read-only
+				TDESimpleConfig c( indexfile, true ); // Open read-only
 				c.setGroup( "Icon Theme" );
 				inherit = c.readListEntry( "Inherits" );
 			}
@@ -493,7 +493,7 @@ void ThemePage::insertThemes()
 			// Parse the index.theme file if the theme has one.
 			if ( haveIndexFile )
 			{
-				KSimpleConfig c( indexfile, true );
+				TDESimpleConfig c( indexfile, true );
 				c.setGroup( "Icon Theme" );
 
 				// Skip this theme if it's hidden.
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 1c7340220..1cf193fde 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdemessagebox.h>
 #include <kseparator.h>
 #include <dcopclient.h>
@@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange()
 
 /*void KKeyModule::slotSave( )
 {
-    KSimpleConfig config(*sFileList->at( sList->currentItem() ) );
+    TDESimpleConfig config(*sFileList->at( sList->currentItem() ) );
     //  global=true is necessary in order to
     //  let both 'Global Shortcuts' and 'Shortcut Sequences' be
     //  written to the same scheme file.
@@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index )
   else {
     TDEConfigBase* config = 0;
     if( index == 0 )	config = new TDEConfig( "kdeglobals" );
-    //else		config = new KSimpleConfig( *sFileList->at( index ), true );
+    //else		config = new TDESimpleConfig( *sFileList->at( index ), true );
 
     actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
     kc->listSync();
@@ -394,8 +394,8 @@ void KKeyModule::readScheme( int index )
      sList->setCurrentItem( exists );
   }
 
-  KSimpleConfig *config =
-    new KSimpleConfig( sFile );
+  TDESimpleConfig *config =
+    new TDESimpleConfig( sFile );
 
   config->setGroup( KeyScheme );
   config->writeEntry( "Name", sName );
@@ -449,7 +449,7 @@ void KKeyModule::readScheme( int index )
     //if( r.search( *it ) != -1 )
     //   continue;
 
-    KSimpleConfig config( *it, true );
+    TDESimpleConfig config( *it, true );
     // TODO: Put 'Name' in "Settings" group
     config.setGroup( KeyScheme );
     TQString str = config.readEntry( "Name" );
@@ -496,7 +496,7 @@ void KKeyModule::init()
   keys->readActions( "Global Keys" );
 
   {
-    KSimpleConfig cfg( "kdeglobals" );
+    TDESimpleConfig cfg( "kdeglobals" );
     cfg.deleteGroup( "Global Keys" );
   }
 
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index db7416c28..b54ffb5cd 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <dcopref.h>
 
 #include "commandShortcuts.h"
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 99a5aa2a6..c225e5f68 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -39,7 +39,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdeshortcutlist.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <dcopref.h>
 
@@ -282,7 +282,7 @@ void ShortcutsModule::readSchemeNames()
 		//if( r.search( *it ) != -1 )
 		//   continue;
 
-		KSimpleConfig config( *it, true );
+		TDESimpleConfig config( *it, true );
 		config.setGroup( "Settings" );
 		TQString str = config.readEntry( "Name" );
 
@@ -324,7 +324,7 @@ void ShortcutsModule::slotSelectScheme( int )
 		m_pkcSequence->syncToConfig( "Global Shortcuts", 0, true );
 		m_pkcApplication->syncToConfig( "Shortcuts", 0, false );
 	} else {
-		KSimpleConfig config( sFilename );
+		TDESimpleConfig config( sFilename );
 		config.setGroup( "Settings" );
 		//m_sBaseSchemeFile = config.readEntry( "Name" );
 
@@ -427,7 +427,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 		m_pcbSchemes->setCurrentItem( iScheme );
 	}
 
-	KSimpleConfig *config = new KSimpleConfig( sFile );
+	TDESimpleConfig *config = new TDESimpleConfig( sFile );
 
 	config->setGroup( "Settings" );
 	config->writeEntry( "Name", sName );
@@ -442,7 +442,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 void ShortcutsModule::saveScheme()
 {
 	TQString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ];
-	KSimpleConfig config( sFilename );
+	TDESimpleConfig config( sFilename );
 
 	m_pkcGeneral->commitChanges();
 	m_pkcSequence->commitChanges();
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index 2132a01c3..15e47d657 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -167,7 +167,7 @@ void SessionEditor::loadAllSession(TQString currentFile)
 
     TQString name = (*it);
 
-    KSimpleConfig* co = new KSimpleConfig(name,true);
+    TDESimpleConfig* co = new TDESimpleConfig(name,true);
     co->setDesktopGroup();
     TQString sesname = co->readEntry("Name",i18n("Unnamed"));
     delete co;
@@ -187,7 +187,7 @@ void SessionEditor::readSession(int num)
 {
     int i,counter;
     TQString str;
-    KSimpleConfig* co;
+    TDESimpleConfig* co;
 
     if(sesMod) {
         disconnect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
@@ -201,7 +201,7 @@ void SessionEditor::readSession(int num)
     if( sessionList->item(num) )
     {
         removeButton->setEnabled( TQFileInfo ( ((SessionListBoxText *)sessionList->item(num))->filename() ).isWritable () );
-        co = new KSimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true);
+        co = new TDESimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true);
 
         co->setDesktopGroup();
         str = co->readEntry("Name");
@@ -328,7 +328,7 @@ void SessionEditor::saveCurrent()
   if (fullpath[0] != '/')
     fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
 
-  KSimpleConfig* co = new KSimpleConfig(fullpath);
+  TDESimpleConfig* co = new TDESimpleConfig(fullpath);
   co->setDesktopGroup();
   co->writeEntry("Type","KonsoleApplication");
   co->writeEntry("Name",nameLine->text());
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 6907b87d2..4827f1c40 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <kipc.h>
 #include <tdelocale.h>
 #include <kservice.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <ktar.h>
 #include <tdestyle.h>
@@ -535,7 +535,7 @@ void KTheme::apply()
         TDEConfig * colorConf = TDEGlobal::config();
 
         TQString sCurrentScheme = locateLocal("data", "tdedisplay/color-schemes/thememgr.kcsrc");
-        KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
+        TDESimpleConfig *colorScheme = new TDESimpleConfig( sCurrentScheme );
         colorScheme->setGroup("Color Scheme" );
 
         for ( uint i = 0; i < colorList.count(); i++ )
@@ -657,7 +657,7 @@ void KTheme::apply()
     if ( !fontsElem.isNull() )
     {
         TDEConfig * fontsConf = TDEGlobal::config();
-        TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+        TDEConfig * kde1xConf = new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
         kde1xConf->setGroup( "General" );
 
         TQDomNodeList fontList = fontsElem.childNodes();
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 68a9ec3fb..22d815866 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -36,7 +36,7 @@
 #include <tdeprocess.h>
 #include <kiconloader.h>
 #include <klanguagebutton.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include "kcmlocale.h"
@@ -299,7 +299,7 @@ void TDELocaleConfig::loadLanguageList()
       menu_index = -2; // first entries should _not_ be sorted
       continue;
     }
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup("KCM Locale");
     TQString name = entry.readEntry("Name",
                                    m_locale->translate("without name"));
@@ -346,7 +346,7 @@ void TDELocaleConfig::loadCountryList()
     if (index != -1)
       tag.truncate(index);
 
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup("KCM Locale");
     TQString name = entry.readEntry("Name",
                                    m_locale->translate("without name"));
@@ -367,7 +367,7 @@ void TDELocaleConfig::loadCountryList()
   for ( TQStringList::ConstIterator it = countrylist.begin();
         it != countrylist.end(); ++it )
   {
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup("KCM Locale");
     TQString name = entry.readEntry("Name",
                                    m_locale->translate("without name"));
@@ -403,7 +403,7 @@ void TDELocaleConfig::readLocale(const TQString &path, TQString &name,
     .arg(sub)
     .arg(path);
 
-  KSimpleConfig entry(locate("locale", filepath));
+  TDESimpleConfig entry(locate("locale", filepath));
   entry.setGroup("KCM Locale");
   name = entry.readEntry("Name");
 
@@ -505,7 +505,7 @@ TQStringList TDELocaleConfig::languageList() const
                             TQString::fromLatin1("l10n/%1/entry.desktop")
                             .arg(m_locale->country()));
 
-  KSimpleConfig entry(fileName);
+  TDESimpleConfig entry(fileName);
   entry.setGroup("KCM Locale");
 
   return entry.readListEntry("Languages");
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 22b4bd533..cd3780067 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -34,7 +34,7 @@
 
 #include <knuminput.h>
 #include <kdialog.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include "toplevel.h"
@@ -130,7 +130,7 @@ void TDELocaleConfigMoney::save()
   TDEConfig *config = TDEGlobal::config();
   TDEConfigGroupSaver saver(config, "Locale");
 
-  KSimpleConfig ent(locate("locale",
+  TDESimpleConfig ent(locate("locale",
                            TQString::fromLatin1("l10n/%1/entry.desktop")
                            .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index d4311a1e7..0079edbd1 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -28,7 +28,7 @@
 #include <tqregexp.h>
 
 #include <kdialog.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include "toplevel.h"
@@ -88,7 +88,7 @@ void TDELocaleConfigNumber::save()
   TDEConfig *config = TDEGlobal::config();
   TDEConfigGroupSaver saver(config, "Locale");
 
-  KSimpleConfig ent(locate("locale",
+  TDESimpleConfig ent(locate("locale",
 			   TQString::fromLatin1("l10n/%1/entry.desktop")
 			   .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 0f6ccd561..509b22c7f 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -28,7 +28,7 @@
 
 #include <kdialog.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include "localeother.h"
@@ -79,7 +79,7 @@ void TDELocaleConfigOther::save()
   TDEConfig *config = TDEGlobal::config();
   TDEConfigGroupSaver saver(config, "Locale");
 
-  KSimpleConfig ent(locate("locale",
+  TDESimpleConfig ent(locate("locale",
                            TQString::fromLatin1("l10n/%1/entry.desktop")
                            .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index c181dfb11..4275965d3 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -29,7 +29,7 @@
 #include <tqvaluevector.h>
 
 #include <kdialog.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
@@ -252,7 +252,7 @@ void TDELocaleConfigTime::save()
   TDEConfig *config = TDEGlobal::config();
   TDEConfigGroupSaver saver(config, "Locale");
 
-  KSimpleConfig ent(locate("locale",
+  TDESimpleConfig ent(locate("locale",
 			   TQString::fromLatin1("l10n/%1/entry.desktop")
 			   .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 1167207b0..7f32c438a 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeprocess.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 7506f3907..1c95bd552 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -88,7 +88,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 		last_known_y = currentScreen()->currentPixelHeight();
 	}
 
-	t_config = new KSimpleConfig("kiccconfigrc");
+	t_config = new TDESimpleConfig("kiccconfigrc");
 
 	TQString cur_profile;
 	cur_profile = getCurrentProfile();
@@ -108,7 +108,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
  * result is written to the KDE configfile.
  */
 void KRandRSystemTray::_quit (){
-	r_config = new KSimpleConfig("tderandrtrayrc");
+	r_config = new TDESimpleConfig("tderandrtrayrc");
 
 	TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?");
 	int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index 101905140..5d6e16053 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -91,8 +91,8 @@ private:
 	int last_known_y;
 
 	TDEPopupMenu* m_menu;
-	KSimpleConfig *r_config;
-	KSimpleConfig *t_config;
+	TDESimpleConfig *r_config;
+	TDESimpleConfig *t_config;
 
 private slots:
 	void _quit();
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 1b13bfe12..c639bba4e 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -43,7 +43,7 @@
 #include <tdeprocess.h>
 #include <kservicegroup.h>
 #include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include <X11/Xlib.h>
 #include "scrnsave.h"
@@ -84,10 +84,10 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
 
     struct stat st;
     if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {
-			mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+			mTDMConfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
 		}
 		else {
-			mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+			mTDMConfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
 		}
 		mTDMConfig->setGroup("X-:*-Greeter");
 
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index f5c32adee..f7953f1e4 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -125,7 +125,7 @@ protected:
     bool        mHideActiveWindowsFromSaver;
     bool        mHideCancelButton;
 
-    KSimpleConfig* mTDMConfig;
+    TDESimpleConfig* mTDMConfig;
 };
 
 #endif
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 0ef66c6b3..d72467364 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -51,7 +51,7 @@
 #include <klibloader.h>
 #include <tdelistview.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestyle.h>
 #include <tdestandarddirs.h>
 
@@ -745,7 +745,7 @@ void KCMStyle::loadStyle( TDEConfig& config )
 	TQStringList list = TDEGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
 	for (TQStringList::iterator it = list.begin(); it != list.end(); ++it)
 	{
-		KSimpleConfig config( *it, true );
+		TDESimpleConfig config( *it, true );
 		if ( !(config.hasGroup("KDE") && config.hasGroup("Misc")) )
 			continue;
 
diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index 9ee0b58c6..9bab933b8 100644
--- a/kcontrol/tdeio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -36,7 +36,7 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeio/http_slave_defaults.h>
 
 #include "ksaveioconfig.h"
@@ -186,7 +186,7 @@ void UserAgentDlg::save()
   if (!deleteList.isEmpty())
   {
      // Remove entries from local file.
-     KSimpleConfig cfg("tdeio_httprc");
+     TDESimpleConfig cfg("tdeio_httprc");
      for ( TQStringList::Iterator it = deleteList.begin();
            it != deleteList.end(); ++it )
      {
diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp
index c1f459924..efeb6b088 100644
--- a/kcontrol/tdm/background.cpp
+++ b/kcontrol/tdm/background.cpp
@@ -34,10 +34,10 @@
 #include "../background/bgdialog.h"
 #include "background.h"
 #include <tqcheckbox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kdialog.h>
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 KBackground::KBackground(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
@@ -51,7 +51,7 @@ KBackground::KBackground(TQWidget *parent, const char *name)
 		" This is done by running some program (possibly xsetroot) in the script"
 		" specified in the Setup= option in tdmrc (usually Xsetup).") );
     config->setGroup( "X-*-Greeter" );
-    m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) );
+    m_simpleConf=new TDESimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) );
     m_background = new BGDialog( this, m_simpleConf, false );
 
     connect(m_background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h
index 74f1b09ec..a15377784 100644
--- a/kcontrol/tdm/background.h
+++ b/kcontrol/tdm/background.h
@@ -14,7 +14,7 @@
 #include <tqwidget.h>
 
 
-class KSimpleConfig;
+class TDESimpleConfig;
 class BGDialog;
 class TDEGlobalBackgroundSettings;
 class TQCheckBox;
@@ -42,7 +42,7 @@ private:
 
     TQCheckBox *m_pCBEnable;
     TQLabel *m_pMLabel;
-    KSimpleConfig *m_simpleConf;
+    TDESimpleConfig *m_simpleConf;
     BGDialog *m_background;
 };
 
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 71e09cb0d..fdba26c5d 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -76,7 +76,7 @@ KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg)
     return 0;
 }
 
-KSimpleConfig *config;
+TDESimpleConfig *config;
 
 TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
   : TDECModule(TDMFactory::instance(), parent, name)
@@ -175,10 +175,10 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
 
   struct stat st;
   if( stat( KDE_CONFDIR "/tdm/tdmdistrc" ,&st ) == 0) {
-    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+    config = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
   }
   else {
-    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+    config = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
   }
 
   TQVBoxLayout *top = new TQVBoxLayout(this);
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 06eb86c32..c057867d1 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -51,7 +51,7 @@
 
 #include "config.h"
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 #define TSAK_LOCKFILE "/tmp/tdesocket-global/tsak.lock"
 
@@ -307,7 +307,7 @@ void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
     int index = fpath.findRev('/');
     TQString nid = fpath.mid(index + 1);
 
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup(TQString::fromLatin1("KCM Locale"));
     TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
     combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null);
@@ -321,7 +321,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
       findAllResources("data", "tdedisplay/color-schemes/*.kcsrc", false, true);
   for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
   {
-    KSimpleConfig config(*it, true);
+    TDESimpleConfig config(*it, true);
     config.setGroup("Color Scheme");
 
     TQString str;
@@ -342,7 +342,7 @@ void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
       findAllResources("data", "tdestyle/themes/*.themerc", false, true);
   for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
   {
-    KSimpleConfig config(*it, true);
+    TDESimpleConfig config(*it, true);
 
     if (!(config.hasGroup("KDE") && config.hasGroup("Misc")))
 	continue;
diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp
index a324e866a..1d73dc4c8 100644
--- a/kcontrol/tdm/tdm-conv.cpp
+++ b/kcontrol/tdm/tdm-conv.cpp
@@ -32,12 +32,12 @@
 #include <tqheader.h>
 
 #include <kdialog.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 
 #include "tdm-conv.h"
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index 0aa2e4a70..1e103d915 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -30,14 +30,14 @@
 #include <tqwhatsthis.h>
 
 #include <kdialog.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdefontrequester.h>
 #include <tdelocale.h>
 
 #include "tdm-font.h"
 
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   : TQWidget(parent, name)
diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp
index 30dd0f506..03fef8cae 100644
--- a/kcontrol/tdm/tdm-shut.cpp
+++ b/kcontrol/tdm/tdm-shut.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <karrowbutton.h>
 #include <klineedit.h>
 #include <tdelocale.h>
@@ -39,7 +39,7 @@
 #include "tdm-shut.h"
 #include "kbackedcombobox.h"
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 
 TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index 901287dee..35929102c 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -43,7 +43,7 @@
 #include <sys/stat.h>
 
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
diff --git a/kdesktop/init.cpp b/kdesktop/init.cpp
index 9a2b3644a..0259c5a40 100644
--- a/kdesktop/init.cpp
+++ b/kdesktop/init.cpp
@@ -40,7 +40,7 @@
 #include <dirent.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 // for multihead
 extern int kdesktop_screen_number;
@@ -234,7 +234,7 @@ void testLocalInstallation()
         (void)TDEIO::NetAccess::synchronousRun( job, 0 );
 
         // OK the only thing missing is to convert the icon position...
-        KSimpleConfig cfg( locateLocal("appdata", "IconPositions") );
+        TDESimpleConfig cfg( locateLocal("appdata", "IconPositions") );
         if ( cfg.hasGroup( "IconPosition::Trash" ) && !cfg.hasGroup( "IconPosition::trash.desktop" ) ) {
             const TQMap<TQString, TQString> entries = cfg.entryMap( "IconPosition::Trash" );
             cfg.setGroup( "IconPosition::trash.desktop" );
diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp
index 4b0527674..9c86a07a1 100644
--- a/kdesktop/kdiconview.cpp
+++ b/kdesktop/kdiconview.cpp
@@ -74,7 +74,7 @@ TQRect KDIconView::desktopRect()
 
 // -----------------------------------------------------------------------------
 
-void KDIconView::saveIconPosition(KSimpleConfig *config, int x, int y)
+void KDIconView::saveIconPosition(TDESimpleConfig *config, int x, int y)
 {
   // save the icon position in absolute coordinates
   config->writeEntry("Xabs", x);
@@ -90,7 +90,7 @@ void KDIconView::saveIconPosition(KSimpleConfig *config, int x, int y)
 
 // -----------------------------------------------------------------------------
 
-void KDIconView::readIconPosition(KSimpleConfig *config, int &x, int &y)
+void KDIconView::readIconPosition(TDESimpleConfig *config, int &x, int &y)
 {
   // check if we have the position for the current desktop size
   TQRect desk = desktopRect();
@@ -226,7 +226,7 @@ void KDIconView::initDotDirectories()
 
     delete m_dotDirectory;
 
-    m_dotDirectory = new KSimpleConfig( dotFileName );
+    m_dotDirectory = new TDESimpleConfig( dotFileName );
     // If we don't allow editable desktop icons, empty m_dotDirectory
     if (!m_bEditableDesktopIcons)
     {
@@ -248,7 +248,7 @@ void KDIconView::initDotDirectories()
 
         if (TQFile::exists(localDotFileName))
         {
-           KSimpleConfig dotDir(localDotFileName, true); // Read only
+           TDESimpleConfig dotDir(localDotFileName, true); // Read only
 
            TQStringList groups = dotDir.groupList();
            TQStringList::ConstIterator gIt = groups.begin();
@@ -906,7 +906,7 @@ bool KDIconView::deleteGlobalDesktopFiles()
         // Web Browser		kfmclient openBrowser %u		Application	TDE;
 
         if ( isDesktopFile(fItem) ) {
-            KSimpleConfig cfg( fItem->url().path(), true );
+            TDESimpleConfig cfg( fItem->url().path(), true );
             cfg.setDesktopGroup();
             if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" ) {
                 removeBuiltinIcon(cfg.readEntry( "Name" ));
@@ -1062,7 +1062,7 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
 
     if ( !desktopFile.isEmpty() )
     {
-        KSimpleConfig cfg( desktopFile, true );
+        TDESimpleConfig cfg( desktopFile, true );
         cfg.setDesktopGroup();
         if (cfg.readBoolEntry("Hidden")) {
             return false;
@@ -1145,7 +1145,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
   if (m_nextItemPos.isNull() && !m_dotDirectory)  {
       // Not found, we'll need to save the new pos
       kdDebug(1214)<<"Neither a  drop position stored nor m_dotDirectory set"<<endl;
-      m_dotDirectory = new KSimpleConfig( dotDirectoryPath(), true );
+      m_dotDirectory = new TDESimpleConfig( dotDirectoryPath(), true );
       // recursion
       slotNewItems( entries );
       delete m_dotDirectory;
@@ -1406,7 +1406,7 @@ void KDIconView::refreshTrashIcon()
         KFileIVI * fileIVI = static_cast<KFileIVI *>(it);
         KFileItem* item = fileIVI->item();
         if ( isDesktopFile( item ) ) {
-            KSimpleConfig cfg( item->url().path(), true );
+            TDESimpleConfig cfg( item->url().path(), true );
             cfg.setDesktopGroup();
             if ( cfg.readEntry( "Type" ) == "Link" &&
                  cfg.readEntry( "URL" ) == "trash:/" ) {
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 61d35560a..7ef8d4889 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -33,7 +33,7 @@
 
 class KDirLister;
 class KonqSettings;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TDEAccel;
 class KShadowEngine;
 class KDesktopShadowSettings;
@@ -205,8 +205,8 @@ private:
     void refreshTrashIcon();
 
     static TQRect desktopRect();
-    static void saveIconPosition(KSimpleConfig *config, int x, int y);
-    static void readIconPosition(KSimpleConfig *config, int &x, int &y);
+    static void saveIconPosition(TDESimpleConfig *config, int x, int y);
+    static void readIconPosition(TDESimpleConfig *config, int &x, int &y);
 
     void showFreeSpaceOverlay(KFileIVI*  item);
 
@@ -243,7 +243,7 @@ private:
     TQStringList m_desktopDirs;
 
     /** The desktop's .directory, used for storing icon positions */
-    KSimpleConfig *m_dotDirectory;
+    TDESimpleConfig *m_dotDirectory;
 
     /** Position of last deleted icon - used when renaming a file */
     TQPoint m_lastDeletedIconPos;
diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp
index 3f59fd461..c5d3d1aea 100644
--- a/kdesktop/lock/lockdlg.cpp
+++ b/kdesktop/lock/lockdlg.cpp
@@ -21,7 +21,7 @@
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -987,7 +987,7 @@ void PasswordDlg::attemptCardLogin() {
 #endif
 
 	// Make sure card logins are enabled before attempting one
-	KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	TDESimpleConfig *systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 	systemconfig->setGroup(NULL);
 	bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false);
 	delete systemconfig;
diff --git a/kdesktop/lock/main.cpp b/kdesktop/lock/main.cpp
index 2e00b4c3a..41b918664 100644
--- a/kdesktop/lock/main.cpp
+++ b/kdesktop/lock/main.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
 #include <dcopref.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include <tdmtsak.h>
@@ -374,12 +374,12 @@ int main( int argc, char **argv )
 		TDEGlobal::locale()->insertCatalogue("libdmctl");
 
 		struct stat st;
-		KSimpleConfig* tdmconfig;
+		TDESimpleConfig* tdmconfig;
 		if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {
-			tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+			tdmconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
 		}
 		else {
-			tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+			tdmconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
 		}
 		tdmconfig->setGroup("X-:*-Greeter");
 
diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp
index 7216acc4f..3de190484 100644
--- a/kdesktop/lockeng.cpp
+++ b/kdesktop/lockeng.cpp
@@ -22,7 +22,7 @@
 #include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <kservicegroup.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tqfile.h>
@@ -869,14 +869,14 @@ bool SaverEngineEventHandler::restartLockProcess()
 
 		// Create SAK process only if SAK is enabled
 		struct stat st;
-		KSimpleConfig *config;
+		TDESimpleConfig *config;
 		if (stat(KDE_CONFDIR "/tdm/tdmdistrc" , &st) == 0)
 		{
-			config = new KSimpleConfig(TQString::fromLatin1(KDE_CONFDIR "/tdm/tdmdistrc"));
+			config = new TDESimpleConfig(TQString::fromLatin1(KDE_CONFDIR "/tdm/tdmdistrc"));
 		}
 		else
 		{
-			config = new KSimpleConfig(TQString::fromLatin1(KDE_CONFDIR "/tdm/tdmrc"));
+			config = new TDESimpleConfig(TQString::fromLatin1(KDE_CONFDIR "/tdm/tdmrc"));
 		}
 		config->setGroup("X-:*-Greeter");
 		bool useSAKProcess = false;
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 6a4998b35..5244689d2 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -3,7 +3,7 @@
 #include <kdebug.h>
 #include <tdestandarddirs.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include "htmlsearch.h"
 
@@ -112,7 +112,7 @@ TQString DocMetaInfo::languageName( const TQString &langcode )
 
   kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl;
   
-  KSimpleConfig cfg( cfgfile );
+  TDESimpleConfig cfg( cfgfile );
   cfg.setGroup( "KCM Locale" );
   TQString name = cfg.readEntry( "Name", langcode );
   
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index e823fc34b..d130f9dbd 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -184,7 +184,7 @@ void TDEHTMLSearchConfig::loadLanguages()
 
   for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
     {
-      KSimpleConfig entry(*it);
+      TDESimpleConfig entry(*it);
       entry.setGroup(TQString::fromLatin1("KCM Locale"));
       TQString name = entry.readEntry(TQString::fromLatin1("Name"), TDEGlobal::locale()->translate("without name"));
 
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index e52d4bab5..a87d5039f 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -39,7 +39,7 @@
 
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index 176db92c7..3dc86ed5d 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqcombobox.h>
 #include <tqlayout.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeapplication.h>
 #include <tdelocale.h>
 #include <kdebug.h>
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 0d326b225..80c50d56c 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <tdemessagebox.h>
 #include <tdeglobal.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdefiledialog.h>
 #include <dcopref.h>
 #include <klibloader.h>
@@ -285,7 +285,7 @@ void Module::import()
         i18n( "Select File with Actions to Be Imported" ));
     if( file.isEmpty())
         return;
-    KSimpleConfig cfg( file, true );
+    TDESimpleConfig cfg( file, true );
     if( !settings.import( cfg, true ))
         {
         KMessageBox::error( topLevelWidget(),
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 7fa213fad..85f5c74cc 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <konq_operations.h>
 #include <tdeprocess.h>
 #include <krun.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
 
@@ -189,7 +189,7 @@ void PanelBrowserMenu::initialize()
             // parse .directory if it does exist
             if (TQFile::exists(path + "/.directory")) {
 
-                KSimpleConfig c(path + "/.directory", true);
+                TDESimpleConfig c(path + "/.directory", true);
                 c.setDesktopGroup();
                 TQString iconPath = c.readEntry("Icon");
 
@@ -239,7 +239,7 @@ void PanelBrowserMenu::initialize()
             // .desktop files
             if(KDesktopFile::isDesktopFile(path))
             {
-                KSimpleConfig c(path, true);
+                TDESimpleConfig c(path, true);
                 c.setDesktopGroup();
                 title = c.readEntry("Name", title);
 
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 43169f0c8..b9c7a6960 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeio/netaccess.h>
 #include <tdestandarddirs.h>
 #include <kservice.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include "global.h"
 #include "kickerSettings.h"
@@ -161,7 +161,7 @@ int maxButtonDim()
     int maxDim;
     //return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge;
 
-    KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
+    TDESimpleConfig *kickerconfig = new TDESimpleConfig( TQString::fromLatin1( "kickerrc" ));
     kickerconfig->setGroup("General");
     maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);;
     delete kickerconfig;
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index 4f8b9f80a..9e275f90c 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqwidget.h>
 
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <klibloader.h>
 #include <tdestandarddirs.h>
 #include <kpanelmenu.h>
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 MenuInfo::MenuInfo(const TQString& desktopFile)
 {
-    KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
+    TDESimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
     df.setGroup("Desktop Entry");
 
     TQStringList list = df.readListEntry("X-TDE-AuthorizeAction");
diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index 36c64843a..3084e74b0 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include "findmenu.h"
@@ -52,7 +52,7 @@ void FindMenu::initialize()
 
   mConfigList.clear();
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
-    KSimpleConfig config( *it, true );
+    TDESimpleConfig config( *it, true );
     config.setDesktopGroup();
 
     mConfigList.append( *it );
@@ -69,7 +69,7 @@ void FindMenu::slotExec( int pos )
 
   tdeApp->propagateSessionManager();
 
-  KSimpleConfig config(app, true);
+  TDESimpleConfig config(app, true);
   config.setDesktopGroup();
   if (tdeApp && config.readEntry("Type") == "Link")
   {
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index b270daad3..198cb4f7a 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -29,7 +29,7 @@
 #include <klibloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include <tqvalidator.h>
@@ -80,7 +80,7 @@ void KateSessionMenu::initialize()
   if (TDEGlobal::dirs()->exists(configFile))
   {
     // Read new style configuration (from TDE R14.1.0)
-    KSimpleConfig *config = new KSimpleConfig(configFile, true);
+    TDESimpleConfig *config = new TDESimpleConfig(configFile, true);
     config->setGroup("Sessions list");
     int sessionsCount = config->readNumEntry("Sessions count", 0);
     for (int i = 0;  i < sessionsCount;  ++i)
@@ -89,7 +89,7 @@ void KateSessionMenu::initialize()
       if (!urlStr.isEmpty() && TDEGlobal::dirs()->exists(urlStr))
       {
         // Filter out empty URLs or non existing sessions
-        KSimpleConfig *sessionConfig = new KSimpleConfig(urlStr, true);
+        TDESimpleConfig *sessionConfig = new TDESimpleConfig(urlStr, true);
         sessionConfig->setGroup("General");
         // Session general properties
         TQString sessionName = sessionConfig->readEntry("Name", i18n("Unnamed"));
@@ -102,7 +102,7 @@ void KateSessionMenu::initialize()
     TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true);
     for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-      KSimpleConfig config( *it, true );
+      TDESimpleConfig config( *it, true );
       config.setGroup( "General" );
       m_sessions.append( config.readEntry( "Name" ) );
     }
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index 45ed07bd7..46d0faa9e 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <krun.h>
 #include <tdestandarddirs.h>
 #include <tdeio/global.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include <tqregexp.h>
 #include <tqfileinfo.h>
@@ -65,7 +65,7 @@ void KonquerorProfilesMenu::initialize()
       TQFileInfo info( *pIt );
       TQString profileName = TDEIO::decodeFileName( info.baseName() );
       TQString niceName=profileName;
-      KSimpleConfig cfg( *pIt, true );
+      TDESimpleConfig cfg( *pIt, true );
       if ( cfg.hasGroup( "Profile" ) )
       {
          cfg.setGroup( "Profile" );
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index ed28d5e49..709cde6c7 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <krun.h>
 #include <kshell.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include "konsole_mnu.h"
@@ -113,7 +113,7 @@ void KonsoleMenu::initialize()
            continue;
         }
 
-        KSimpleConfig conf(*it, true /* read only */);
+        TDESimpleConfig conf(*it, true /* read only */);
         conf.setDesktopGroup();
         TQString text = conf.readEntry("Name");
 
@@ -207,7 +207,7 @@ void KonsoleMenu::initialize()
         TQFileInfo info(*pIt);
         TQString profileName = TDEIO::decodeFileName(info.baseName());
         TQString niceName = profileName;
-        KSimpleConfig cfg(*pIt, true);
+        TDESimpleConfig cfg(*pIt, true);
         if (cfg.hasGroup("Profile"))
         {
             cfg.setGroup("Profile");
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 7df429401..c1c5754d6 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -41,7 +41,7 @@
 #include <tdemessagebox.h>
 #include <ksavefile.h>
 #include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstringhandler.h>
 #include <ksystemtray.h>
 #include <kurldrag.h>
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 94aff5e2b..ad20f1923 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -37,7 +37,7 @@
 #include <tdestandarddirs.h>
 #include <kinputdialog.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kdesktopfile.h>
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index 0e97c008a..44504aff5 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -422,7 +422,7 @@
     <include location="global" impldecl="in implementation">kiconloader.h</include>
     <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="global" impldecl="in implementation">tdeglobalsettings.h</include>
-    <include location="global" impldecl="in implementation">ksimpleconfig.h</include>
+    <include location="global" impldecl="in implementation">tdesimpleconfig.h</include>
     <include location="global" impldecl="in implementation">tdeapplication.h</include>
     <include location="global" impldecl="in implementation">tdestandarddirs.h</include>
     <include location="global" impldecl="in implementation">kdirnotify_stub.h</include>
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index 5cbdd9aa4..07678f2b5 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -181,7 +181,7 @@ void KNetAttach::finished()
 
 	TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
 	path += name + ".desktop";
-	KSimpleConfig desktopFile(path, false);
+	TDESimpleConfig desktopFile(path, false);
 	desktopFile.setGroup("Desktop Entry");
 	desktopFile.writeEntry("Icon", "server");
 	desktopFile.writeEntry("Name", name);
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index 3454f0bf1..07033960f 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -844,7 +844,7 @@ bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView
           if ( f.open(IO_ReadOnly) )
             {
               f.close();
-              KSimpleConfig config( urlDotDir.path(), true );
+              TDESimpleConfig config( urlDotDir.path(), true );
               config.setGroup( "URL properties" );
               HTMLAllowed = config.readBoolEntry( "HTMLAllowed", m_bHTMLAllowed );
               serviceName = config.readEntry( "ViewMode", serviceName );
@@ -1253,7 +1253,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
     }
 
     TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" );
-    KSimpleConfig cfg( locate( "data", profileName ), true );
+    TDESimpleConfig cfg( locate( "data", profileName ), true );
     cfg.setGroup( "Profile" );
 
     if ( windowArgs.x != -1 )
@@ -1714,7 +1714,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
       u.addPath(".directory");
       if ( u.isLocalFile() )
       {
-          KSimpleConfig config( u.path() ); // if we have no write access, just drop it
+          TDESimpleConfig config( u.path() ); // if we have no write access, just drop it
           config.setGroup( "URL properties" );
           config.writeEntry( "ViewMode", modeName );
           config.sync();
@@ -1740,7 +1740,7 @@ void KonqMainWindow::showHTML( KonqView * _view, bool b, bool _activateView )
       u.addPath(".directory");
       if ( u.isLocalFile() )
       {
-          KSimpleConfig config( u.path() ); // No checks for access
+          TDESimpleConfig config( u.path() ); // No checks for access
           config.setGroup( "URL properties" );
           config.writeEntry( "HTMLAllowed", b );
           config.sync();
@@ -2980,7 +2980,7 @@ void KonqMainWindow::slotRemoveLocalProperties()
       if ( f.open(IO_ReadWrite) )
       {
           f.close();
-          KSimpleConfig config( u.path() );
+          TDESimpleConfig config( u.path() );
           config.deleteGroup( "URL properties" ); // Bye bye
           config.sync();
           // TODO: Notify the view...
diff --git a/konqueror/konq_profiledlg.cpp b/konqueror/konq_profiledlg.cpp
index 55114690f..d3d6f5384 100644
--- a/konqueror/konq_profiledlg.cpp
+++ b/konqueror/konq_profiledlg.cpp
@@ -34,7 +34,7 @@
 #include <tdeio/global.h>
 #include <tdestandarddirs.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kseparator.h>
 #include <kpushbutton.h>
 
@@ -49,7 +49,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles()
   {
     TQFileInfo info( *pIt );
     TQString profileName = TDEIO::decodeFileName( info.baseName() );
-    KSimpleConfig cfg( *pIt, true );
+    TDESimpleConfig cfg( *pIt, true );
     if ( cfg.hasGroup( "Profile" ) )
     {
       cfg.setGroup( "Profile" );
@@ -211,7 +211,7 @@ void KonqProfileDlg::slotItemRenamed( TQListViewItem * item )
     if ( it != m_mapEntries.end() )
     {
       TQString fileName = it.data();
-      KSimpleConfig cfg( fileName );
+      TDESimpleConfig cfg( fileName );
       cfg.setGroup( "Profile" );
       cfg.writeEntry( "Name", newName );
       cfg.sync();
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index 435710ad8..c57b643cd 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -1081,7 +1081,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString
   if ( TQFile::exists( path ) )
     TQFile::remove( path );
 
-  KSimpleConfig cfg( path );
+  TDESimpleConfig cfg( path );
   cfg.setGroup( "Profile" );
   if ( !profileName.isEmpty() )
       cfg.writePathEntry( "Name", profileName );
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 5c82a55ef..2cd49fbe5 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -28,7 +28,7 @@
 #include <private/tqucomextra_p.h>
 
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -211,7 +211,7 @@ void addBackEnd::activatedAddMenu(int id)
 				if (!myFile.isEmpty())
 				{
 					kdDebug() <<"trying to save to file: "<<myFile << endl;
-					KSimpleConfig scf(myFile,false);
+					TDESimpleConfig scf(myFile,false);
 					scf.setGroup("Desktop Entry");
 					for (TQMap<TQString,TQString>::ConstIterator it = map.begin(); it != map.end(); ++it) {
 						kdDebug() <<"writing:"<<it.key()<<" / "<<it.data()<<endl;
@@ -349,7 +349,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 	// Go through list to see which ones exist.  Check them for the URL
 	TQStringList files = TQDir(list).entryList("websidebarplugin*.desktop");
 	for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it){
-		KSimpleConfig scf(list + *it, false);
+		TDESimpleConfig scf(list + *it, false);
 		scf.setGroup("Desktop Entry");
 		if (scf.readPathEntry("URL", TQString::null) == url.url()) {
 			// We already have this one!
@@ -363,7 +363,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 	TQString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile);
 
 	if (!myFile.isEmpty()) {
-		KSimpleConfig scf(myFile, false);
+		TDESimpleConfig scf(myFile, false);
 		scf.setGroup("Desktop Entry");
 		scf.writeEntry("Type", "Link");
 		scf.writePathEntry("URL", url.url());
@@ -438,7 +438,7 @@ void Sidebar_Widget::initialCopy()
 		return; //oups;
 
 	int nVersion=-1;
-	KSimpleConfig lcfg(m_path+".version");
+	TDESimpleConfig lcfg(m_path+".version");
 	int lVersion=lcfg.readNumEntry("Version",0);
 
 
@@ -451,7 +451,7 @@ void Sidebar_Widget::initialCopy()
 
 	        if ( !dirtree_dir.isEmpty() && dirtree_dir != m_path )
         	{
-			KSimpleConfig gcfg(dirtree_dir+".version");
+			TDESimpleConfig gcfg(dirtree_dir+".version");
 			int gversion = gcfg.readNumEntry("Version", 1);
 			nVersion=(nVersion>gversion)?nVersion:gversion;
 			if (lVersion >= gversion)
@@ -504,7 +504,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 			kdDebug()<<"New Icon Name:"<<iconname<<endl;
 			if (!iconname.isEmpty())
 			{
-				KSimpleConfig ksc(m_path+m_currentButton->file);
+				TDESimpleConfig ksc(m_path+m_currentButton->file);
 				ksc.setGroup("Desktop Entry");
 				ksc.writeEntry("Icon",iconname);
 				ksc.sync();
@@ -518,7 +518,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
                         dlg->fileDialog()->setMode( KFile::Directory );
 			if (dlg->exec())
 			{
-				KSimpleConfig ksc(m_path+m_currentButton->file);
+				TDESimpleConfig ksc(m_path+m_currentButton->file);
 				ksc.setGroup("Desktop Entry");
                                 if ( !dlg->selectedURL().isValid())
                                 {
@@ -560,7 +560,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 			if(ok)
 			{
 				// Write the name in the .desktop file of this side button.
-				KSimpleConfig ksc(m_path+m_currentButton->file);
+				TDESimpleConfig ksc(m_path+m_currentButton->file);
 				ksc.setGroup("Desktop Entry");
 				ksc.writeEntry("Name", name, true, false, true /*localized*/ );
 				ksc.sync();
@@ -815,11 +815,11 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 	int lastbtn = m_buttons.count();
 	m_buttons.resize(m_buttons.size()+1);
 
-  	KSimpleConfig *confFile;
+  	TDESimpleConfig *confFile;
 
 	kdDebug() << "addButton:" << (m_path+desktoppath) << endl;
 
-	confFile = new KSimpleConfig(m_path+desktoppath,true);
+	confFile = new TDESimpleConfig(m_path+desktoppath,true);
 	confFile->setGroup("Desktop Entry");
 
     	TQString icon = confFile->readEntry("Icon");
@@ -943,8 +943,8 @@ KParts::BrowserExtension *Sidebar_Widget::getExtension()
 bool Sidebar_Widget::createView( ButtonInfo *data)
 {
 	bool ret = true;
-	KSimpleConfig *confFile;
-	confFile = new KSimpleConfig(data->file,true);
+	TDESimpleConfig *confFile;
+	confFile = new TDESimpleConfig(data->file,true);
 	confFile->setGroup("Desktop Entry");
 
 	data->dock = m_area->createDockWidget(confFile->readEntry("Name",i18n("Unknown")),0);
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 33b35aeb4..64de7c4e0 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -93,7 +93,7 @@ void KonqSidebarTree::loadModuleFactories()
 
   for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
   {
-    KSimpleConfig ksc(*it);
+    TDESimpleConfig ksc(*it);
     ksc.setGroup("Desktop Entry");
     TQString name    = ksc.readEntry("X-TDE-TreeModule");
     TQString libName = ksc.readEntry("X-TDE-TreeModule-Lib");
@@ -610,7 +610,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
 				// Version 7 includes update of network places
 				const int currentVersion = 7;
 				TQString key = TQString::fromLatin1("X-TDE-DirTreeVersionNumber");
-				KSimpleConfig versionCfg( path + "/.directory" );
+				TDESimpleConfig versionCfg( path + "/.directory" );
 				int versionNumber = versionCfg.readNumEntry( key, 0 );
 				kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
 				if ( versionNumber < currentVersion )
@@ -720,7 +720,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt
     if ( TQFile::exists( dotDirectoryFile ) )
     {
         kdDebug(1201) << "Reading the .directory" << endl;
-        KSimpleConfig cfg( dotDirectoryFile, true );
+        TDESimpleConfig cfg( dotDirectoryFile, true );
         cfg.setDesktopGroup();
         name = cfg.readEntry( "Name", name );
         icon = cfg.readEntry( "Icon", icon );
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 0ba22363f..bafcb973e 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -35,7 +35,7 @@ void KonqSidebarTreeTopLevelItem::init()
     TQString desktopFile = m_path;
     if ( isTopLevelGroup() )
         desktopFile += "/.directory";
-    KSimpleConfig cfg( desktopFile, true );
+    TDESimpleConfig cfg( desktopFile, true );
     cfg.setDesktopGroup();
     m_comment = cfg.readEntry( "Comment" );
 }
@@ -189,7 +189,7 @@ void KonqSidebarTreeTopLevelItem::rename( const TQString & name )
     TQString desktopFile = m_path;
     if ( isTopLevelGroup() )
         desktopFile += "/.directory";
-    KSimpleConfig cfg( desktopFile );
+    TDESimpleConfig cfg( desktopFile );
     cfg.setDesktopGroup();
     cfg.writeEntry( "Name", name );
     cfg.sync();
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index f0ccc2e6d..9baa24d1d 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -3,7 +3,7 @@
 #include "konq_sidebartree.h"
 #include <kdebug.h>
 #include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
 #include <tdelistviewsearchline.h>
@@ -17,7 +17,7 @@
 KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
                    KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
 	{
-		KSimpleConfig ksc(desktopName_);
+		TDESimpleConfig ksc(desktopName_);
 		ksc.setGroup("Desktop Entry");
 		int virt= ( (ksc.readEntry("X-TDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link);
 		if (virt==1) desktopName_=ksc.readEntry("X-TDE-RelURL","");
@@ -139,7 +139,7 @@ extern "C"
 	  TQStringList names;
 	  for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
 	  {
-		KSimpleConfig sc(*it);
+		TDESimpleConfig sc(*it);
 		sc.setGroup("Desktop Entry");
 		names<<sc.readEntry("Name");
 	  }
@@ -150,7 +150,7 @@ extern "C"
 		{
 			int id=names.findIndex( item );
 			if (id==-1) return false;
-			KSimpleConfig ksc2(*list.at(id));
+			TDESimpleConfig ksc2(*list.at(id));
 			ksc2.setGroup("Desktop Entry");
 		        map->insert("Type","Link");
 			map->insert("Icon",ksc2.readEntry("Icon"));
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index a64cfaf18..559f7bfeb 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -63,7 +63,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare
 
 	_desktopName = desktopName;
 
-	KSimpleConfig ksc(_desktopName);
+	TDESimpleConfig ksc(_desktopName);
 	ksc.setGroup("Desktop Entry");
         reloadTimeout = ksc.readNumEntry("Reload", 0);
 	_url = ksc.readPathEntry("URL");
@@ -102,7 +102,7 @@ void KonqSideBarWebModule::setAutoReload(){
 	if( dlg.exec() == TQDialog::Accepted ) {
 		int msec = ( mins->value() * 60 + secs->value() ) * 1000;
 		reloadTimeout = msec;
-		KSimpleConfig ksc(_desktopName);
+		TDESimpleConfig ksc(_desktopName);
 		ksc.setGroup("Desktop Entry");
 		ksc.writeEntry("Reload", reloadTimeout);	
 		reload();
@@ -147,7 +147,7 @@ void KonqSideBarWebModule::loadFavicon() {
 	if (!icon.isEmpty()) {
 		emit setIcon(icon);
 
-		KSimpleConfig ksc(_desktopName);
+		TDESimpleConfig ksc(_desktopName);
 		ksc.setGroup("Desktop Entry");
 		if (icon != ksc.readPathEntry("Icon")) {
 			ksc.writePathEntry("Icon", icon);
@@ -165,7 +165,7 @@ void KonqSideBarWebModule::setTitle(const TQString& title) {
 	if (!title.isEmpty()) {
 		emit setCaption(title);
 
-		KSimpleConfig ksc(_desktopName);
+		TDESimpleConfig ksc(_desktopName);
 		ksc.setGroup("Desktop Entry");
 		if (title != ksc.readPathEntry("Name")) {
 			ksc.writePathEntry("Name", title);
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index b28256e55..1c435165c 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -184,7 +184,7 @@ void KonsoleFontSelectAction::slotActivated(int index) {
 }
 
 template class TQPtrDict<TESession>;
-template class TQIntDict<KSimpleConfig>;
+template class TQIntDict<TDESimpleConfig>;
 template class TQPtrDict<TDERadioAction>;
 
 #define DEFAULT_HISTORY_SIZE 1000
@@ -317,7 +317,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
   if (currentSize != size())
      defaultSize = size();
 
-  KSimpleConfig *co;
+  TDESimpleConfig *co;
   if (!type.isEmpty())
     setDefaultSession(type+".desktop");
   co = defaultSession();
@@ -1487,7 +1487,7 @@ void Konsole::slotSaveSessionsProfile()
     if ( TQFile::exists( path ) )
       TQFile::remove( path );
 
-    KSimpleConfig cfg( path );
+    TDESimpleConfig cfg( path );
     savePropertiesInternal(&cfg,1);
     saveMainWindowSettings(&cfg);
   }
@@ -2797,7 +2797,7 @@ void Konsole::allowPrevNext()
   notifySessionState(se,NOTIFYNORMAL);
 }
 
-KSimpleConfig *Konsole::defaultSession()
+TDESimpleConfig *Konsole::defaultSession()
 {
   if (!m_defaultSession) {
     TDEConfig * config = TDEGlobal::config();
@@ -2810,7 +2810,7 @@ KSimpleConfig *Konsole::defaultSession()
 void Konsole::setDefaultSession(const TQString &filename)
 {
   delete m_defaultSession;
-  m_defaultSession = new KSimpleConfig(locate("appdata", filename), true /* read only */);
+  m_defaultSession = new TDESimpleConfig(locate("appdata", filename), true /* read only */);
   m_defaultSession->setDesktopGroup();
   b_showstartuptip = m_defaultSession->readBoolEntry("Tips", true);
 
@@ -2819,13 +2819,13 @@ void Konsole::setDefaultSession(const TQString &filename)
 
 void Konsole::newSession(const TQString &pgm, const TQStrList &args, const TQString &term, const TQString &icon, const TQString &title, const TQString &cwd)
 {
-  KSimpleConfig *co = defaultSession();
+  TDESimpleConfig *co = defaultSession();
   newSession(co, pgm, args, term, icon, title, cwd);
 }
 
 TQString Konsole::newSession()
 {
-  KSimpleConfig *co = defaultSession();
+  TDESimpleConfig *co = defaultSession();
   return newSession(co, TQString::null, TQStrList());
 }
 
@@ -2845,7 +2845,7 @@ void Konsole::newSession(int i)
     return;
   }
 
-  KSimpleConfig* co = no2command.find(i);
+  TDESimpleConfig* co = no2command.find(i);
   if (co) {
     newSession(co);
     resetScreenSessions();
@@ -2868,7 +2868,7 @@ void Konsole::newSessionTabbar(int i)
     return;
   }
 
-  KSimpleConfig* co = no2command.find(i);
+  TDESimpleConfig* co = no2command.find(i);
   if (co) {
     newSession(co);
     resetScreenSessions();
@@ -2877,15 +2877,15 @@ void Konsole::newSessionTabbar(int i)
 
 TQString Konsole::newSession(const TQString &type)
 {
-  KSimpleConfig *co;
+  TDESimpleConfig *co;
   if (type.isEmpty())
      co = defaultSession();
   else
-     co = new KSimpleConfig(locate("appdata", type + ".desktop"), true /* read only */);
+     co = new TDESimpleConfig(locate("appdata", type + ".desktop"), true /* read only */);
   return newSession(co);
 }
 
-TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrList &args,
+TQString Konsole::newSession(TDESimpleConfig *co, TQString program, const TQStrList &args,
                             const TQString &_term,const TQString &_icon,
                             const TQString &_title, const TQString &_cwd)
 {
@@ -3048,7 +3048,7 @@ void Konsole::newSession(const TQString& sURL, const TQString& title)
 
    KURL url = KURL(sURL);
    if ((url.protocol() == "file") && (url.hasPath())) {
-     KSimpleConfig *co = defaultSession();
+     TDESimpleConfig *co = defaultSession();
      path = url.path();
      newSession(co, TQString::null, TQStrList(), TQString::null, TQString::null,
                 title.isEmpty() ? path : title, path);
@@ -3433,11 +3433,11 @@ static void insertItemSorted(TDEPopupMenu *menu, const TQIconSet &iconSet, const
 
 void Konsole::addSessionCommand(const TQString &path)
 {
-  KSimpleConfig* co;
+  TDESimpleConfig* co;
   if (path.isEmpty())
-    co = new KSimpleConfig(locate("appdata", "shell.desktop"), true /* read only */);
+    co = new TDESimpleConfig(locate("appdata", "shell.desktop"), true /* read only */);
   else
-    co = new KSimpleConfig(path,true);
+    co = new TDESimpleConfig(path,true);
   co->setDesktopGroup();
   TQString typ = co->readEntry("Type");
   TQString txt = co->readEntry("Name");
@@ -3518,7 +3518,7 @@ void Konsole::createSessionMenus()
     return;
   }
 
-  KSimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID];
+  TDESimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID];
   TQString txt = cfg->readEntry("Name");
   TQString icon = cfg->readEntry("Icon", "konsole");
   insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon),
@@ -3536,7 +3536,7 @@ void Konsole::createSessionMenus()
   m_session->insertSeparator();
   m_tabbarSessionsCommands->insertSeparator();
 
-  TQIntDictIterator<KSimpleConfig> it( no2command );
+  TQIntDictIterator<TDESimpleConfig> it( no2command );
   for ( ; it.current(); ++it ) {
     if ( it.currentKey() == SESSION_NEW_SHELL_ID )
       continue;
@@ -3567,7 +3567,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket)
 {
   KTempFile *tmpFile = new KTempFile();
   tmpFile->setAutoDelete(true);
-  KSimpleConfig *co = new KSimpleConfig(tmpFile->name());
+  TDESimpleConfig *co = new TDESimpleConfig(tmpFile->name());
   co->setDesktopGroup();
   co->writeEntry("Name", socket);
   TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket);
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index b5e1f926b..7af520661 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -28,7 +28,7 @@
 
 #include <tdemainwindow.h>
 #include <kdialogbase.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <keditcl.h>
 
 #include <twinmodule.h>
@@ -257,8 +257,8 @@ private slots:
 
   void slotSetEncoding();
 private:
-  KSimpleConfig *defaultSession();
-  TQString newSession(KSimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(),
+  TDESimpleConfig *defaultSession();
+  TQString newSession(TDESimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(),
                      const TQString &_term = TQString::null, const TQString &_icon = TQString::null,
                      const TQString &_title = TQString::null, const TQString &_cwd = TQString::null);
   void readProperties(TDEConfig *config, const TQString &schema, bool globalConfigOnly);
@@ -298,9 +298,9 @@ private:
   TQPtrDict<TDERadioAction> session2action;
   TQPtrList<TESession> sessions;
 
-  TQIntDict<KSimpleConfig> no2command;
+  TQIntDict<TDESimpleConfig> no2command;
 
-  KSimpleConfig* m_defaultSession;
+  TDESimpleConfig* m_defaultSession;
   TQString m_defaultSessionFilename;
 
   KTabWidget* tabwidget;
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index 6621d8638..6a9961de3 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -20,7 +20,7 @@
 #include <tqmap.h>
 
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdestandarddirs.h>
@@ -85,7 +85,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
 	TQMap<TQString,TQString> regionnames;
 
 	for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
-		KSimpleConfig entry(*it);
+		TDESimpleConfig entry(*it);
 		entry.setGroup(TQString::fromLatin1("KCM Locale"));
 		TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 
@@ -112,7 +112,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
 	countrylist.sort();
 
 	for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) {
-		KSimpleConfig entry(*it);
+		TDESimpleConfig entry(*it);
 		entry.setGroup(TQString::fromLatin1("KCM Locale"));
 		TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 		TQString submenu = '-' + entry.readEntry("Region");
@@ -181,7 +181,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
 }
 
 void KCountryPage::setLangForCountry(const TQString &country) {
-	KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
+	TDESimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
 	ent.setGroup(TQString::fromLatin1("KCM Locale"));
 	langs = ent.readListEntry(TQString::fromLatin1("Languages"));
 
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index faf7138a8..25855e871 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -24,7 +24,7 @@
 #include <tqsettings.h>
 #include <tqfont.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobal.h>
 #include <tdestandarddirs.h>
 #include <tdelocale.h>
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index 31dc1c411..bcf1f83ad 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -21,7 +21,7 @@
 #include <tqstringlist.h>
 #include <tqmap.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobal.h>
 #include <tdestandarddirs.h>
 #include <tdelocale.h>
@@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() {
 	}
 
 	// get the users primary Languages
-	KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
+	TDESimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
 	ent.setGroup("KCM Locale");
 	TQStringList langs = ent.readListEntry("Languages");
 	if (langs.isEmpty())
@@ -77,7 +77,7 @@ KFindLanguage::KFindLanguage() {
 	langlist += alllang;
 
 	for ( TQStringList::ConstIterator it = langlist.begin();	it != langlist.end(); ++it ) {
-		KSimpleConfig entry(*it);
+		TDESimpleConfig entry(*it);
 		entry.setGroup("KCM Locale");
 		TQString name = entry.readEntry("Name", i18n("without name"));
 
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index aee2a68b3..885519a61 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -21,7 +21,7 @@
 #include <tqtextview.h>
 #include <tqmap.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdelocale.h>
@@ -309,9 +309,9 @@ void KOSPage::writeKeyEntrys(TQString keyfile){
 	kdDebug() << "KOSPage::writeKeyEntrys()" << endl;
 
 	// load the given .kksrc - file
-	KSimpleConfig* scheme = new KSimpleConfig(keyfile, true);
+	TDESimpleConfig* scheme = new TDESimpleConfig(keyfile, true);
 	// load the default .kksrc - file
-	KSimpleConfig* defScheme = new KSimpleConfig(locate("keys", "trinity.kksrc"), true);
+	TDESimpleConfig* defScheme = new TDESimpleConfig(locate("keys", "trinity.kksrc"), true);
 
 	// we need the entries from the default - file, so we can compare with them
 	TQMap<TQString, TQString> defMap = defScheme->entryMap("Global Shortcuts");
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 007326922..c42276845 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 #include <tqcursor.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
 #include <tdestandarddirs.h>
diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp
index b7eb45557..8b59699eb 100644
--- a/kpersonalizer/tdestylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -34,7 +34,7 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 #include <kipc.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <dcopclient.h>
 #include <tdestyle.h>
 #include <kicontheme.h>
@@ -187,8 +187,8 @@ void TDEStylePage::saveColors(bool curSettings){
 
 	////////////////////////////////////////////////////
 	// KDE-1.x support
-	KSimpleConfig *tdeconfig =
-	new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+	TDESimpleConfig *tdeconfig =
+	new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
 	tdeconfig->setGroup( "General" );
 	tdeconfig->writeEntry("background", toSave->background );
 	tdeconfig->writeEntry("selectBackground", toSave->selectBackground );
@@ -363,7 +363,7 @@ void TDEStylePage::getColors(colorSet *set, bool colorfile ){
 			set->colorFile=locate("colors","EveX.kcsrc");
 		}
 		set->contrast=7;
-		config = new KSimpleConfig(set->colorFile, true);
+		config = new TDESimpleConfig(set->colorFile, true);
 		config->setGroup("Color Scheme");
 		kdDebug() << "TDEStylePage::getColors(): schemefile: " << set->colorFile << endl;
                 deleteConfig = true;
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index ec786d050..d0bde9fc3 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -29,7 +29,7 @@
 #include <kdatastream.h> // DO NOT REMOVE, otherwise bool marshalling breaks
 #include <kicontheme.h>
 #include <kimageio.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 #include <tdeio/job.h>
 
@@ -47,7 +47,7 @@ struct FaviconsModulePrivate
     };
     TQMap<TDEIO::Job *, DownloadInfo> downloads;
     TQStringList failedDownloads;
-    KSimpleConfig *config;
+    TDESimpleConfig *config;
     TQPtrList<TDEIO::Job> killJobs;
     TDEIO::MetaData metaData;
     TQString faviconsDir;
@@ -66,7 +66,7 @@ FaviconsModule::FaviconsModule(const TQCString &obj)
     d->metaData.insert("UseCache", "false");
     d->metaData.insert("cookies", "none");
     d->metaData.insert("no-auth", "true");
-    d->config = new KSimpleConfig(locateLocal("data", "konqueror/faviconrc"));
+    d->config = new TDESimpleConfig(locateLocal("data", "konqueror/faviconrc"));
     d->killJobs.setAutoDelete(true);
     d->faviconsCache.setAutoDelete(true);
 }
diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp
index b6a5ffc18..051b3f236 100644
--- a/libkonq/knewmenu.cpp
+++ b/libkonq/knewmenu.cpp
@@ -146,7 +146,7 @@ void KNewMenu::parseFiles()
             // If a desktop file, then read the name from it.
             // Otherwise (or if no name in it?) use file name
             if ( KDesktopFile::isDesktopFile( filePath ) ) {
-                KSimpleConfig config( filePath, true );
+                TDESimpleConfig config( filePath, true );
                 config.setDesktopGroup();
                 text = config.readEntry("Name");
                 (*templ).icon = config.readEntry("Icon");
@@ -333,7 +333,7 @@ void KNewMenu::slotFillTemplates()
                 s_templatesList->prepend( e );
             else
             {
-                KSimpleConfig config( *it, true );
+                TDESimpleConfig config( *it, true );
                 config.setDesktopGroup();
 
                 // tricky solution to ensure that TextFile is at the beginning
diff --git a/libkonq/konq_historymgr.cpp b/libkonq/konq_historymgr.cpp
index 11f15071e..7ee04f170 100644
--- a/libkonq/konq_historymgr.cpp
+++ b/libkonq/konq_historymgr.cpp
@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksavefile.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 #include <zlib.h>
@@ -594,7 +594,7 @@ bool KonqHistoryManager::loadFallback()
 	return false;
 
     KonqHistoryEntry *entry;
-    KSimpleConfig config( file );
+    TDESimpleConfig config( file );
     config.setGroup("History");
     TQStringList items = config.readListEntry( "CompletionItems" );
     TQStringList::Iterator it = items.begin();
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 58e7eadc3..226a34413 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -1433,7 +1433,7 @@ void KonqIconViewWidget::slotSaveIconPositions()
   if ( !m_bDesktop )
     return; // Currently not available in Konqueror
   kdDebug(1214) << "KonqIconViewWidget::slotSaveIconPositions" << endl;
-  KSimpleConfig dotDirectory( m_dotDirectoryPath );
+  TDESimpleConfig dotDirectory( m_dotDirectoryPath );
   TQIconViewItem *it = firstItem();
   if ( !it )
     return; // No more icons. Maybe we're closing and they've been removed already
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index d04f00159..4ed65e189 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -459,7 +459,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                       || (m_sMimeType == "media/builtin-printers")
                       || (m_sMimeType == "media/builtin-trash")
                       || (m_sMimeType == "media/builtin-webbrowser")) ) {
-            KSimpleConfig cfg( firstPopupURL.path(), true );
+            TDESimpleConfig cfg( firstPopupURL.path(), true );
             cfg.setDesktopGroup();
             isTrashLink = ( cfg.readEntry("Type") == "Link" && cfg.readEntry("URL") == "trash:/" );
         }
@@ -599,7 +599,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     if ( isCurrentTrash )
     {
         act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQ_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
-        KSimpleConfig trashConfig( "trashrc", true );
+        TDESimpleConfig trashConfig( "trashrc", true );
         trashConfig.setGroup( "Status" );
         act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
         addAction( act );
@@ -662,7 +662,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         // get builtin services, like mount/unmount
         s.builtin = KDEDesktopMimeType::builtinServices( urlForServiceMenu );
         const TQString path = urlForServiceMenu.path();
-        KSimpleConfig cfg( path, true );
+        TDESimpleConfig cfg( path, true );
         cfg.setDesktopGroup();
         const TQString priority = cfg.readEntry("X-TDE-Priority");
         const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
@@ -684,7 +684,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         if (isDirectory && isSingleLocal)
         {
             TQString dotDirectoryFile = urlForServiceMenu.path(1).append(".directory");
-            KSimpleConfig cfg( dotDirectoryFile, true );
+            TDESimpleConfig cfg( dotDirectoryFile, true );
             cfg.setDesktopGroup();
 
             if (KIOSKAuthorizedAction(cfg))
@@ -704,7 +704,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         const TQStringList::ConstIterator eEnd = entries.end();
         for (; eIt != eEnd; ++eIt )
         {
-            KSimpleConfig cfg( *eIt, true );
+            TDESimpleConfig cfg( *eIt, true );
             cfg.setDesktopGroup();
 
             if (!KIOSKAuthorizedAction(cfg))
diff --git a/libkonq/konq_propsview.cpp b/libkonq/konq_propsview.cpp
index e0b1ab9bb..2d525c23c 100644
--- a/libkonq/konq_propsview.cpp
+++ b/libkonq/konq_propsview.cpp
@@ -32,7 +32,7 @@
 #include <kinstance.h>
 #include <assert.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include "konq_sort_constants.h"
 
@@ -173,7 +173,7 @@ TDEConfigBase * KonqPropsView::currentConfig()
         assert ( !isDefaultProperties() );
 
         if (!dotDirectory.isEmpty())
-            m_currentConfig = new KSimpleConfig( dotDirectory );
+            m_currentConfig = new TDESimpleConfig( dotDirectory );
         // the "else" is when we want to save locally but this is a remote URL -> no save
     }
     return m_currentConfig;
@@ -230,7 +230,7 @@ bool KonqPropsView::enterDir( const KURL & dir )
   if (dotDirExists)
   {
     //kdDebug(1203) << "Found .directory file" << endl;
-    KSimpleConfig * config = new KSimpleConfig( dotDirectory, true );
+    TDESimpleConfig * config = new TDESimpleConfig( dotDirectory, true );
     config->setGroup("URL properties");
 
     m_iIconSize = config->readNumEntry( "IconSize", m_iIconSize );
@@ -290,7 +290,7 @@ void KonqPropsView::setSaveViewPropertiesLocally( bool value )
     //kdDebug(1203) << "KonqPropsView::setSaveViewPropertiesLocally " << value << endl;
 
     if ( m_bSaveViewPropertiesLocally )
-        delete m_currentConfig; // points to a KSimpleConfig
+        delete m_currentConfig; // points to a TDESimpleConfig
 
     m_bSaveViewPropertiesLocally = value;
     m_currentConfig = 0L; // mark as dirty
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index 48b2b7e4f..3f4c1fc41 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -172,7 +172,7 @@ private:
   // save-view-properties-locally mode, otherwise to the global config
   // It is set to 0L to mark it as "needs to be constructed".
   // This is to be used for SAVING only.
-  // Can be a TDEConfig or a KSimpleConfig
+  // Can be a TDEConfig or a TDESimpleConfig
   TDEConfigBase * m_currentConfig;
 
   // If this is not a "default properties" instance (but one used by a view)
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
index 15ac5fb45..9bfc062b7 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.cpp
+++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp
@@ -279,7 +279,7 @@ void NotifierSettings::save()
 		delete a;
 	}
 	
-	KSimpleConfig config( "medianotifierrc" );
+	TDESimpleConfig config( "medianotifierrc" );
 	config.setGroup( "Auto Actions" );
 	
 	TQMap<TQString,NotifierAction*>::iterator auto_it = m_autoMimetypesMap.begin();
diff --git a/tdeioslave/smb/tdeio_smb_auth.cpp b/tdeioslave/smb/tdeio_smb_auth.cpp
index 87dd8c026..e025f837e 100644
--- a/tdeioslave/smb/tdeio_smb_auth.cpp
+++ b/tdeioslave/smb/tdeio_smb_auth.cpp
@@ -32,7 +32,7 @@
 #include "tdeio_smb.h"
 #include "tdeio_smb_internal.h"
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tqdir.h>
 #include <stdlib.h>
 
@@ -163,7 +163,7 @@ bool SMBSlave::auth_initialize_smbc()
     if(m_initialized_smbc == false)
     {
         kdDebug(TDEIO_SMB) << "smbc_init call" << endl;
-        KSimpleConfig cfg( "tdeioslaverc", true );
+        TDESimpleConfig cfg( "tdeioslaverc", true );
 
         cfg.setGroup( "SMB" );
         int debug_level = cfg.readNumEntry( "DebugLevel", 0 );
diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
index f294c92de..84c0106d8 100644
--- a/tdeioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -372,7 +372,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat
     TQFileInfo info( infoPath );
     assert( info.exists() );
     assert( info.isFile() );
-    KSimpleConfig infoFile( info.absFilePath(), true );
+    TDESimpleConfig infoFile( info.absFilePath(), true );
     if ( !infoFile.hasGroup( "Trash Info" ) )
         kdFatal() << "no Trash Info group in " << info.absFilePath() << endl;
     infoFile.setGroup( "Trash Info" );
@@ -476,7 +476,7 @@ void TestTrash::trashUmlautFileFromHome()
 
 void TestTrash::testTrashNotEmpty()
 {
-    KSimpleConfig cfg( "trashrc", true );
+    TDESimpleConfig cfg( "trashrc", true );
     assert( cfg.hasGroup( "Status" ) );
     cfg.setGroup( "Status" );
     assert( cfg.readBoolEntry( "Empty", true ) == false );
@@ -1179,7 +1179,7 @@ void TestTrash::emptyTrash()
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
 
-    KSimpleConfig cfg( "trashrc", true );
+    TDESimpleConfig cfg( "trashrc", true );
     assert( cfg.hasGroup( "Status" ) );
     cfg.setGroup( "Status" );
     assert( cfg.readBoolEntry( "Empty", false ) == true );
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index 7a54309af..19078539c 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -251,7 +251,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi
         return false;
     }
 
-    // Contents of the info file. We could use KSimpleConfig, but that would
+    // Contents of the info file. We could use TDESimpleConfig, but that would
     // mean closing and reopening fd, i.e. opening a race condition...
     TQCString info = "[Trash Info]\n";
     info += "Path=";
@@ -620,7 +620,7 @@ bool TrashImpl::infoForFile( int trashId, const TQString& fileId, TrashedFileInf
 
 bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, int trashId )
 {
-    KSimpleConfig cfg( infoPath, true );
+    TDESimpleConfig cfg( infoPath, true );
     if ( !cfg.hasGroup( "Trash Info" ) ) {
         error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, infoPath );
         return false;
diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
index 90032762d..6d96859f7 100644
--- a/tdeioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -21,7 +21,7 @@
 #define TRASHIMPL_H
 
 #include <tdeio/jobclasses.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include <tqstring.h>
 #include <tqdatetime.h>
@@ -172,7 +172,7 @@ private:
     mutable bool m_trashDirectoriesScanned;
     int m_mibEnum;
 
-    KSimpleConfig m_config;
+    TDESimpleConfig m_config;
 
     // We don't cache any data related to the trashed files.
     // Another tdeioslave could change that behind our feet.
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index b285c6a2d..731cb33b5 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdecmdlineargs.h>
 #include <tdecrash.h>
 #include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #ifdef WITH_XRANDR
@@ -193,8 +193,6 @@ xIOErr( Display * )
 	exit( EX_RESERVER_DPY );
 }
 
-//KSimpleConfig *iccconfig;
-
 void
 checkSAK(GreeterApp* app)
 {
@@ -306,7 +304,7 @@ kg_main( const char *argv0 )
 	// Load up the systemwide ICC profile
 	TQString iccConfigFile = TQString(KDE_CONFDIR);
 	iccConfigFile += "/kicc/kiccconfigrc";
-	KSimpleConfig iccconfig(iccConfigFile, true);
+	TDESimpleConfig iccconfig(iccConfigFile, true);
 	if (iccconfig.readBoolEntry("EnableICC", false) == true) {
 		TQString iccCommand = TDEGlobal::dirs()->findExe("dispwin");
 		if (iccCommand.isEmpty())
@@ -346,7 +344,7 @@ kg_main( const char *argv0 )
 
 	_colorScheme = locate( "data", "tdedisplay/color-schemes/" + _colorScheme + ".kcsrc" );
 	if (!_colorScheme.isEmpty()) {
-		KSimpleConfig config( _colorScheme, true );
+		TDESimpleConfig config( _colorScheme, true );
 		config.setGroup( "Color Scheme" );
 		app->setPalette( app->createApplicationPalette( &config, 7 ) );
 	}
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 2a3c90327..a9901b08c 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdestandarddirs.h>
 #include <kseparator.h>
 #include <tdelistview.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
 #include <kdialog.h>
@@ -201,7 +201,7 @@ KGreeter::KGreeter( bool framed )
   , showInfoMessages( true )
   , closingDown( false )
 {
-	stsFile = new KSimpleConfig( _stsFile );
+	stsFile = new TDESimpleConfig( _stsFile );
 	stsFile->setGroup( "PrevUser" );
 
 	if (_userList) {
@@ -615,7 +615,7 @@ KGreeter::insertSessions()
 		TQStringList ents = TQDir( *dit ).entryList();
 		for (TQStringList::ConstIterator it = ents.begin(); it != ents.end(); ++it)
 		  if ((*it).endsWith( ".desktop" ) && !(*it).endsWith("admin.desktop")) {
-				KSimpleConfig dsk( TQString( *dit ).append( '/' ).append( *it ) );
+				TDESimpleConfig dsk( TQString( *dit ).append( '/' ).append( *it ) );
 				dsk.setGroup( "Desktop Entry" );
 				putSession( (*it).left( (*it).length() - 8 ),
 				            dsk.readEntry( "Name" ),
@@ -871,7 +871,7 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
 	return;
 #endif
 	// Make sure card logins are enabled before attempting one
-	KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	TDESimpleConfig *systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 	systemconfig->setGroup(NULL);
 	bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false);
 	delete systemconfig;
diff --git a/tdm/kfrontend/kgreeter.h b/tdm/kfrontend/kgreeter.h
index ed634c6e8..51a4f799e 100644
--- a/tdm/kfrontend/kgreeter.h
+++ b/tdm/kfrontend/kgreeter.h
@@ -37,7 +37,7 @@ class KdmThemer;
 class KdmItem;
 
 class TDEListView;
-class KSimpleConfig;
+class TDESimpleConfig;
 
 class TQLabel;
 class TQPushButton;
@@ -125,7 +125,7 @@ class KGreeter : public KGDialog, public KGVerifyHandler {
 	virtual void pluginSetup();
 	void setPrevWM( int );
 
-	KSimpleConfig *stsFile;
+	TDESimpleConfig *stsFile;
 	UserListView *userView;
 	TQStringList *userList;
 	TQPopupMenu *sessMenu;
diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp
index a52adabb2..93f8521e1 100644
--- a/tdm/kfrontend/krootimage.cpp
+++ b/tdm/kfrontend/krootimage.cpp
@@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA.
 #include <config.h>
 
 #include <tdecmdlineargs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 
 #include <tqfile.h>
@@ -49,7 +49,7 @@ static bool properties_inited = false;
 
 MyApplication::MyApplication( const char *conf )
 	: TDEApplication(),
-	  renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) )
+	  renderer( 0, new TDESimpleConfig( TQFile::decodeName( conf ) ) )
 {
 	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
 	connect( &renderer, TQ_SIGNAL(imageDone( int )), this, TQ_SLOT(renderDone()) );
diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp
index c64f1f34b..685d1b2c8 100644
--- a/tdm/kfrontend/themer/tdmpixmap.cpp
+++ b/tdm/kfrontend/themer/tdmpixmap.cpp
@@ -73,7 +73,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
 					// Software blend only (no compositing support)
 					// Use the preset TDM background...
 					TDEStandardDirs *m_pDirs = TDEGlobal::dirs();
-					KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) );
+					TDESimpleConfig *config = new TDESimpleConfig( TQFile::decodeName( _backgroundCfg ) );
 					config->setGroup("Desktop0");
 					pixmap.normal.fullpath = m_pDirs->findResource("wallpaper", config->readPathEntry("Wallpaper"));
 					// TODO: Detect when there is no wallpaper and use the background settings instead
diff --git a/tdm/kfrontend/themer/tdmpixmap.h b/tdm/kfrontend/themer/tdmpixmap.h
index c3994b15c..eb304fde3 100644
--- a/tdm/kfrontend/themer/tdmpixmap.h
+++ b/tdm/kfrontend/themer/tdmpixmap.h
@@ -27,7 +27,7 @@
 //#include <tqrect.h>
 #include <tqpixmap.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestandarddirs.h>
 
 /*
diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp
index f064e384a..82ebf55e7 100644
--- a/tdm/kfrontend/themer/tdmthemer.cpp
+++ b/tdm/kfrontend/themer/tdmthemer.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <kimageeffect.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
@@ -62,7 +62,7 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget
 	// read the XML file and create DOM tree
 	TQString filename = _filename;
 	if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
-		KSimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" );
+		TDESimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" );
 		cfg.setGroup( "GdmGreeterTheme" );
 		filename += '/' + cfg.readEntry( "Greeter" );
 	}
diff --git a/tdmlib/kgreet_classic.h b/tdmlib/kgreet_classic.h
index f5dc52122..2da7e633c 100644
--- a/tdmlib/kgreet_classic.h
+++ b/tdmlib/kgreet_classic.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class KLineEdit;
 class KPasswordEdit;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TQGridLayout;
 class TQLabel;
 
@@ -81,7 +81,7 @@ class KClassicGreeter : public TQObject, public KGreeterPlugin {
 	TQLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
 	KLineEdit *loginEdit;
 	KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
-	KSimpleConfig *stsFile;
+	TDESimpleConfig *stsFile;
 	TQString fixedUser, curUser;
 	Function func;
 	Context ctx;
diff --git a/tdmlib/kgreet_pam.h b/tdmlib/kgreet_pam.h
index 98e3315b1..9ce055113 100644
--- a/tdmlib/kgreet_pam.h
+++ b/tdmlib/kgreet_pam.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class KLineEdit;
 class KPasswordEdit;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TQGridLayout;
 class TQLabel;
 
@@ -84,7 +84,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
 	KLineEdit *loginEdit;
         TQWidget* m_parentWidget;
         TQValueList<KPasswordEdit*> authEdit;
-	KSimpleConfig *stsFile;
+	TDESimpleConfig *stsFile;
         KdmThemer *m_themer;
 	TQString fixedUser, curUser;
 	Function func;
diff --git a/tdmlib/kgreet_winbind.h b/tdmlib/kgreet_winbind.h
index 9d26f4719..8ec404edd 100644
--- a/tdmlib/kgreet_winbind.h
+++ b/tdmlib/kgreet_winbind.h
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class KComboBox;
 class KLineEdit;
 class KPasswordEdit;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TQGridLayout;
 class TQLabel;
 class KdmThemer;
@@ -89,7 +89,7 @@ class KWinbindGreeter : public TQObject, public KGreeterPlugin {
 	KComboBox *domainCombo;
 	KLineEdit *loginEdit;
 	KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
-	KSimpleConfig *stsFile;
+	TDESimpleConfig *stsFile;
 	TQString fixedDomain, fixedUser, curUser;
 	TQStringList allUsers, mDomainListing;
 	TDEProcIO* m_domainLister;
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index d222ce288..3f0e209ec 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -1,7 +1,7 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdestandarddirs.h>
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
         TQDir().mkdir(localDirStr);
 
     TQFileInfo fi(f);
-    KSimpleConfig input(fi.absFilePath());
+    TDESimpleConfig input(fi.absFilePath());
     srcStr = fi.dirPath(true) + "/";
     TDEConfig *output = TDEGlobal::config();
     input.setGroup("Window Border");
diff --git a/twin/rules.cpp b/twin/rules.cpp
index 7bd2cd469..aa4b7904a 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tdeconfig.h>
 #include <tqregexp.h>
 #include <tdetempfile.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tqfile.h>
 
 #ifndef KCMRULES
@@ -75,7 +75,7 @@ Rules::Rules( const TQString& str, bool temporary )
         f->writeBlock( s.data(), s.length());
         }
     file.close();
-    KSimpleConfig cfg( file.name());
+    TDESimpleConfig cfg( file.name());
     readFromCfg( cfg );
     if( description.isEmpty())
         description = "temporary";