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

68 files changed, 200 insertions, 200 deletions

diff --git a/kicker/TODO b/kicker/TODO
index cf43fa146..00cd6d42e 100644
--- a/kicker/TODO
+++ b/kicker/TODO
@@ -82,7 +82,7 @@ Unnasigned
       - Space activates focused control (on panel or within an applet)
 
 +++++ Settings dialog fix up
-***   Now that we have KConfigXT, use it in the settings dialogs
+***   Now that we have TDEConfigXT, use it in the settings dialogs
       Convert the "Arrangement" and "Hiding" modules. "Menus" and
       "Appearance" are done as far as possible.
 
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index b29d52f19..35dccf148 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -68,11 +68,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // Settings
 
-KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
+TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
                                          const char *name, Prefs * prefs,
                                          KDialogBase::DialogType dialogType,
                                          bool modal) :
-    KConfigDialog(parent, name, prefs, dialogType,
+    TDEConfigDialog(parent, name, prefs, dialogType,
                   KDialogBase::Default | KDialogBase::Ok |
                   KDialogBase::Apply | KDialogBase::Cancel,
                   KDialogBase::Ok,
@@ -126,19 +126,19 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
     addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
 }
 
-void KConfigDialogSingle::updateSettings()
+void TDEConfigDialogSingle::updateSettings()
 {
     settings->OkApply();
 }
 
-void KConfigDialogSingle::updateWidgets()
+void TDEConfigDialogSingle::updateWidgets()
 {
     selectPage( _prefs->type() );
 }
 
-void KConfigDialogSingle::updateWidgetsDefault()
+void TDEConfigDialogSingle::updateWidgetsDefault()
 {
-    KConfigSkeletonItem *item = _prefs->findItem("Type");
+    TDEConfigSkeletonItem *item = _prefs->findItem("Type");
     item->swapDefault();
     selectPage( _prefs->type() );
     item->swapDefault();
@@ -147,13 +147,13 @@ void KConfigDialogSingle::updateWidgetsDefault()
     TQTimer::singleShot(0, this, TQT_SLOT(dateToggled()));
 }
 
-void KConfigDialogSingle::selectPage(int p)
+void TDEConfigDialogSingle::selectPage(int p)
 {
     settings->widgetStack->raiseWidget( p );
     dateToggled();
 }
 
-void KConfigDialogSingle::dateToggled()
+void TDEConfigDialogSingle::dateToggled()
 {
     bool showDate;
     switch( settings->kcfg_Type->currentItem() )
@@ -1151,11 +1151,11 @@ void ClockApplet::preferences()
 
 void ClockApplet::preferences(bool timezone)
 {
-  KConfigDialogSingle *dialog = dynamic_cast<KConfigDialogSingle*>(KConfigDialog::exists(configFileName));
+  TDEConfigDialogSingle *dialog = dynamic_cast<TDEConfigDialogSingle*>(TDEConfigDialog::exists(configFileName));
 
   if (!dialog)
   {
-    dialog = new KConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow);
+    dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow);
     connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure()));
   }
 
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index c5295d87b..9a80c24b6 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -52,7 +52,7 @@ class KPopupMenu;
 class Prefs;
 class ClockApplet;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -61,7 +61,7 @@ class DigitalWidget;
 class AnalogWidget;
 class FuzzyWidget;
 class ClockApplet;
-class KConfigDialogManager;
+class TDEConfigDialogManager;
 class SettingsWidgetImp;
 
 class SettingsWidgetImp : public SettingsWidget
@@ -82,12 +82,12 @@ class SettingsWidgetImp : public SettingsWidget
         Zone *zone;
 };
 
-class KConfigDialogSingle : public KConfigDialog
+class TDEConfigDialogSingle : public TDEConfigDialog
 {
     Q_OBJECT
     
     public:
-        KConfigDialogSingle(Zone *zone,
+        TDEConfigDialogSingle(Zone *zone,
                 TQWidget *parent=0,
                 const char *name=0,
                 Prefs *prefs=0,
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index 320d84b4c..bf007c933 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <time.h>
 #include <stdlib.h> // for getenv()
 
-Zone::Zone(KConfig* conf):
+Zone::Zone(TDEConfig* conf):
     config(conf),
     _zoneIndex(0)
 {
diff --git a/kicker/applets/clock/zone.h b/kicker/applets/clock/zone.h
index db34188bd..caaa112f9 100644
--- a/kicker/applets/clock/zone.h
+++ b/kicker/applets/clock/zone.h
@@ -27,13 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <ktimezones.h>
 #include <tqstringlist.h>
 
-class KConfig;
+class TDEConfig;
 class KListView;
 
 class Zone {
 
 public:
-	Zone(KConfig* conf);
+	Zone(TDEConfig* conf);
 	~Zone();
 
 	void writeSettings();
@@ -54,7 +54,7 @@ public:
 protected:
         KTimezones m_zoneDb;
 	TQStringList _remotezonelist;
-	KConfig *config;
+	TDEConfig *config;
         TQString _defaultTZ;
 	unsigned int _zoneIndex;
 };
diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp
index c35f0970c..94bb9c899 100644
--- a/kicker/applets/launcher/configdlg.cpp
+++ b/kicker/applets/launcher/configdlg.cpp
@@ -31,9 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "configdlgbase.h"
 
 ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,
-                     int autoSize, KConfigDialog::DialogType dialogType,
+                     int autoSize, TDEConfigDialog::DialogType dialogType,
                      int dialogButtons) :
-    KConfigDialog(parent, name, config, dialogType, dialogButtons),
+    TDEConfigDialog(parent, name, config, dialogType, dialogButtons),
     m_settings(config),
     m_autoSize(autoSize)
 {
@@ -57,7 +57,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,
 void ConfigDlg::updateSettings()
 {
     kdDebug() << "updateSettings" << endl;
-    KConfigDialog::updateSettings();
+    TDEConfigDialog::updateSettings();
     if (!hasChanged())
     {
         return;
@@ -76,7 +76,7 @@ void ConfigDlg::updateSettings()
 
 void ConfigDlg::updateWidgets()
 {
-    KConfigDialog::updateWidgets();
+    TDEConfigDialog::updateWidgets();
     if (m_settings->iconDim() == m_autoSize)
     {
         m_ui->iconDim->setEditText(i18n("Automatic"));
@@ -89,13 +89,13 @@ void ConfigDlg::updateWidgets()
 
 void ConfigDlg::updateWidgetsDefault()
 {
-    KConfigDialog::updateWidgetsDefault();
+    TDEConfigDialog::updateWidgetsDefault();
 }
 
 bool ConfigDlg::hasChanged()
 {
     return m_oldIconDimText != m_ui->iconDim->currentText() ||
-        KConfigDialog::hasChanged();
+        TDEConfigDialog::hasChanged();
 }
 
 #include "configdlg.moc"
diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h
index ff35098d3..e5fdbe34b 100644
--- a/kicker/applets/launcher/configdlg.h
+++ b/kicker/applets/launcher/configdlg.h
@@ -29,13 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class ConfigDlgBase;
 class Prefs;
 
-class ConfigDlg : public KConfigDialog
+class ConfigDlg : public TDEConfigDialog
 {
     Q_OBJECT
 
 public:
     ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize,
-        KConfigDialog::DialogType dialogType, int dialogButtons);
+        TDEConfigDialog::DialogType dialogType, int dialogButtons);
 
 protected:
     virtual bool hasChanged();
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index ee72d58bb..e5658f1cb 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -833,7 +833,7 @@ public:
 void QuickLauncher::loadConfig()
 {
     DEBUGSTR << "QuickLauncher::loadConfig()" << endl << flush;
-    //KConfig *c = config();
+    //TDEConfig *c = config();
     //c->setGroup("General");
     setConserveSpace(m_settings->conserveSpace());
     setDragEnabled(m_settings->dragEnabled());
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 00187fb3f..72652d74b 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -56,7 +56,7 @@ extern "C"
 Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name)
     : KPanelApplet( configFile, KPanelApplet::Normal, 0, parent, name ), bTransparent( false )
 {
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->setGroup("lockout");
 
     //setFrameStyle(Panel | Sunken);
@@ -190,7 +190,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 
     if( e->type() == TQEvent::MouseButtonPress )
     {
-        KConfig *conf = config();
+        TDEConfig *conf = config();
         conf->setGroup("lockout");
 
         TQMouseEvent *me = TQT_TQMOUSEEVENT( e );
@@ -257,7 +257,7 @@ void Lockout::slotTransparent()
 {
     bTransparent = !bTransparent;
 
-    KConfig* conf = config();
+    TDEConfig* conf = config();
     conf->setGroup("lockout");
     conf->writeEntry( "Transparent", bTransparent );
     conf->sync();
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index 28d982e4f..527c92b62 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -368,7 +368,7 @@ void MediaApplet::positionChange(Position)
 
 void MediaApplet::loadConfig()
 {
-    KConfig *c = config();
+    TDEConfig *c = config();
     c->setGroup("General");
     
     if(c->hasKey("ExcludedTypes"))
@@ -398,7 +398,7 @@ void MediaApplet::loadConfig()
 
 void MediaApplet::saveConfig()
 {
-    KConfig *c = config();
+    TDEConfig *c = config();
     c->setGroup("General");
     
     c->writeEntry("ExcludedTypes", mExcludedTypesList, ';');
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 1a0ab5ebe..732f5acdb 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -339,7 +339,7 @@ void Applet::lostSelection()
 
 void Applet::readSettings()
     {
-    KConfig cfg( "kdesktoprc", true );
+    TDEConfig cfg( "kdesktoprc", true );
     cfg.setGroup( "Menubar" );
     desktop_menu = cfg.readBoolEntry( "ShowMenubar", false );
     cfg.setGroup( "KDE" );
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index c6a2fdc93..9d12279c2 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -94,7 +94,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
     TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
     if (desk.width() <= 800)
     {
-        KConfigSkeleton::ItemBool* item = dynamic_cast<KConfigSkeleton::ItemBool*>(m_settings->findItem("Preview"));
+        TDEConfigSkeleton::ItemBool* item = dynamic_cast<TDEConfigSkeleton::ItemBool*>(m_settings->findItem("Preview"));
         if (item)
         {
             item->setDefaultValue(false);
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 0f33f74d1..f0069cae6 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -79,7 +79,7 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions,
     connect(_input, TQT_SIGNAL(activated(const TQString&)),
 	    TQT_SLOT(run_command(const TQString&)));
 
-    KConfig *c = config();
+    TDEConfig *c = config();
     c->setGroup("General");
 
     // restore history and completion list
@@ -98,7 +98,7 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions,
 
 RunApplet::~RunApplet()
 {
-    KConfig *c = config();
+    TDEConfig *c = config();
     c->setGroup("General");
 
     // save history and completion list
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index b5910e3b0..428d0bb7e 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -111,7 +111,7 @@ SwallowApplet::~SwallowApplet()
 SwallowCommandList* SwallowApplet::readConfig()
 {
     m_swcList->clear();
-    KConfig *kc = config();
+    TDEConfig *kc = config();
 
     kc->setGroup("General");
     int count = kc->readNumEntry("Number of apps");
diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h
index 72795cc79..b4be4f624 100644
--- a/kicker/applets/swallow/swallow.h
+++ b/kicker/applets/swallow/swallow.h
@@ -27,7 +27,7 @@
 #include <kpanelapplet.h>
 
 class TQBoxLayout;
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 class KWinModule;
 
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index d10fd107e..02f13df2b 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -296,7 +296,7 @@ void SystemTrayApplet::applySettings()
 
     m_showClockInTray = m_showClockSettingCB->isChecked();
 
-    KConfig *conf = config();
+    TDEConfig *conf = config();
 
     // Save the sort order and hidden status using the window class (WM_CLASS) rather
     // than window name (caption) - window name is i18n-ed, so it's for example
@@ -485,7 +485,7 @@ void SystemTrayApplet::loadSettings()
     setFrameStyle(NoFrame);
     m_showFrame = KickerSettings::showDeepButtons()?true:false;
 
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->reparseConfiguration();
     conf->setGroup("General");
 
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 166e9164f..57904db43 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -35,8 +35,8 @@ TrashButton::TrashButton(TQWidget *parent)
 	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)),
 	  mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/")
 {
-	KIO::UDSEntry entry;
-	KIO::NetAccess::stat("trash:/", entry, 0L);
+	TDEIO::UDSEntry entry;
+	TDEIO::NetAccess::stat("trash:/", entry, 0L);
 	mFileItem.assign(KFileItem(entry, "trash:/"));
 
 	KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 71160cbe6..393e9a2d6 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -273,7 +273,7 @@ void DockBarExtension::settingsChanged(DockContainer *)
 void DockBarExtension::saveContainerConfig()
 {
     TQStringList applet_list;
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     unsigned count = 0;
 
     for (DockContainer::Vector::const_iterator it = containers.constBegin();
@@ -300,7 +300,7 @@ void DockBarExtension::saveContainerConfig()
 
 void DockBarExtension::loadContainerConfig()
 {
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->setGroup("General");
     TQStringList applets = conf->readListEntry("Applets");
     
diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog
index c8ee55166..cdc356180 100644
--- a/kicker/extensions/kasbar/ChangeLog
+++ b/kicker/extensions/kasbar/ChangeLog
@@ -587,8 +587,8 @@
 
 	* This took me 2 hours to find...
 
-	  -   KConfigGroupSaver( conf, "Appearance" ); +
-	  KConfigGroupSaver saver( conf, "Appearance" );
+	  -   TDEConfigGroupSaver( conf, "Appearance" ); +
+	  TDEConfigGroupSaver saver( conf, "Appearance" );
 
 	  Finally the size is restored correctly.
 
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 708aeb1e6..abd6337df 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -85,7 +85,7 @@ int main( int argc, char **argv )
 
   int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop;
   KasBar *kasbar;
-  KConfig conf( "kasbarrc" );
+  TDEConfig conf( "kasbarrc" );
 
   if ( args->isSet("test") ) {
       kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 42199272a..31f5c5a33 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -164,7 +164,7 @@ void KasPrefsDialog::addLookPage()
 			  "available space will be used." ) );
    TQLabel *maxBoxesLabel = new TQLabel( i18n("Bo&xes per line: "), maxBoxesBox );
 
-   KConfig *conf = kasbar->config();
+   TDEConfig *conf = kasbar->config();
    if ( conf )
        conf->setGroup( "Layout" );
    maxBoxesSpin = new KIntSpinBox( 0, 50, 1,
@@ -447,7 +447,7 @@ void KasPrefsDialog::customSizeChanged ( int value )
 
 void KasPrefsDialog::accept()
 {
-   KConfig *conf = kasbar->config();
+   TDEConfig *conf = kasbar->config();
    if ( conf ) {
        kasbar->writeConfig( conf );
 
diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h
index cc56f2c7f..c3e8be131 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.h
+++ b/kicker/extensions/kasbar/kasprefsdlg.h
@@ -65,7 +65,7 @@ class TQCheckBox;
 class TQSlider;
 class TQSpinBox;
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KIntSpinBox;
 
 class KasTasker;
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 851b7d915..a11c18547 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -539,7 +539,7 @@ void KasTasker::setStandAlone( bool enable )
 // Configuration Loader
 //
 
-void KasTasker::setConfig( KConfig *conf )
+void KasTasker::setConfig( TDEConfig *conf )
 {
     this->conf = conf;
 }
@@ -559,10 +559,10 @@ void KasTasker::writeConfig()
    writeConfig(conf);
 }
 
-void KasTasker::readConfig( KConfig *conf )
+void KasTasker::readConfig( TDEConfig *conf )
 {
     if ( !conf ) {
-	kdWarning() << "KasTasker::readConfig() got a null KConfig" << endl;
+	kdWarning() << "KasTasker::readConfig() got a null TDEConfig" << endl;
 	return;
     }
 
@@ -578,7 +578,7 @@ void KasTasker::readConfig( KConfig *conf )
    //
    // Appearance Settings.
    //
-   KConfigGroupSaver saver( conf, "Appearance" );
+   TDEConfigGroupSaver saver( conf, "Appearance" );
 
    int ext = conf->readNumEntry( "ItemExtent", -1 );
    if ( ext > 0 )
@@ -657,10 +657,10 @@ void KasTasker::readConfig( KConfig *conf )
    emit configChanged();
 }
 
-void KasTasker::writeConfig( KConfig *conf )
+void KasTasker::writeConfig( TDEConfig *conf )
 {
     if ( !conf ) {
-	kdWarning() << "KasTasker::writeConfig() got a null KConfig" << endl;
+	kdWarning() << "KasTasker::writeConfig() got a null TDEConfig" << endl;
 	return;
     }
 
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index 015d9fb37..27dc2ff44 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -62,7 +62,7 @@
 #include <kdemacros.h>
 #include <taskmanager.h>
 
-class KConfig;
+class TDEConfig;
 class KPixmap;
 class KPopupMenu;
 class KAction;
@@ -220,18 +220,18 @@ public slots:
     void showPreferences();
     void showAbout();
 
-    /** Sets the current KConfig object. */
-    void setConfig( KConfig *config );
-    KConfig *config() const { return conf; }
+    /** Sets the current TDEConfig object. */
+    void setConfig( TDEConfig *config );
+    TDEConfig *config() const { return conf; }
 
-    /** Reads the settings from the current KConfig. */
+    /** Reads the settings from the current TDEConfig. */
     void readConfig();
     void writeConfig();
     void writeConfigLater();
     void writeLayout();
 
-    /** Writes the settings of this bar to the specified KConfig. */
-    void writeConfig( KConfig *conf );
+    /** Writes the settings of this bar to the specified TDEConfig. */
+    void writeConfig( TDEConfig *conf );
 
     void setStandAlone( bool enable );
 
@@ -243,11 +243,11 @@ signals:
 
 protected slots:
     /** Load settings from the specified configuration. */
-    void readConfig( KConfig *conf );
+    void readConfig( TDEConfig *conf );
 
 private:
     KPopupMenu *menu;
-    KConfig *conf;
+    TDEConfig *conf;
     KasGrouper *grouper;
     KToggleAction *toggleDetachedAction;
     KToggleAction *showAllWindowsAction;
diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h
index 3d8518519..82c0df75d 100644
--- a/kicker/kicker/buttons/bookmarksbutton.h
+++ b/kicker/kicker/buttons/bookmarksbutton.h
@@ -42,7 +42,7 @@ public:
     BookmarksButton(TQWidget* parent);
     ~BookmarksButton();
 
-    void loadConfig(const KConfigGroup& config);
+    void loadConfig(const TDEConfigGroup& config);
     virtual void properties();
 
 protected:
diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp
index 2e2cb5a2d..e470fb93a 100644
--- a/kicker/kicker/buttons/browserbutton.cpp
+++ b/kicker/kicker/buttons/browserbutton.cpp
@@ -45,7 +45,7 @@ BrowserButton::BrowserButton( const TQString& icon, const TQString& startDir, TQ
     initialize( icon, startDir );
 }
 
-BrowserButton::BrowserButton( const KConfigGroup& config, TQWidget* parent )
+BrowserButton::BrowserButton( const TDEConfigGroup& config, TQWidget* parent )
     : PanelPopupButton( parent, "BrowserButton" )
     , topMenu( 0 )
 {
@@ -73,7 +73,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path )
     setIcon ( _icon );
 }
 
-void BrowserButton::saveConfig( KConfigGroup& config ) const
+void BrowserButton::saveConfig( TDEConfigGroup& config ) const
 {
     config.writeEntry("Icon", _icon);
     config.writePathEntry("Path", topMenu->path());
diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h
index bb08801d9..507a764ed 100644
--- a/kicker/kicker/buttons/browserbutton.h
+++ b/kicker/kicker/buttons/browserbutton.h
@@ -37,10 +37,10 @@ class BrowserButton : public PanelPopupButton
 
 public:
     BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent );
-    BrowserButton( const KConfigGroup& config, TQWidget* parent );
+    BrowserButton( const TDEConfigGroup& config, TQWidget* parent );
     virtual ~BrowserButton();
 
-    void saveConfig( KConfigGroup& config ) const;
+    void saveConfig( TDEConfigGroup& config ) const;
 
     virtual void properties();
 
diff --git a/kicker/kicker/buttons/extensionbutton.cpp b/kicker/kicker/buttons/extensionbutton.cpp
index d4590a024..8ab9fd0bd 100644
--- a/kicker/kicker/buttons/extensionbutton.cpp
+++ b/kicker/kicker/buttons/extensionbutton.cpp
@@ -39,7 +39,7 @@ ExtensionButton::ExtensionButton( const TQString& desktopFile, TQWidget* parent
     initialize( desktopFile );
 }
 
-ExtensionButton::ExtensionButton( const KConfigGroup& config, TQWidget* parent )
+ExtensionButton::ExtensionButton( const TDEConfigGroup& config, TQWidget* parent )
     : PanelPopupButton( parent, "extensionbuttton" )
 {
     initialize( config.readPathEntry("DesktopFile") );
@@ -66,7 +66,7 @@ ExtensionButton::~ExtensionButton()
     delete info;
 }
 
-void ExtensionButton::saveConfig( KConfigGroup& config ) const
+void ExtensionButton::saveConfig( TDEConfigGroup& config ) const
 {
     config.writePathEntry("DesktopFile", info->desktopFile());
 }
diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h
index 48854323e..2d2d2d1f2 100644
--- a/kicker/kicker/buttons/extensionbutton.h
+++ b/kicker/kicker/buttons/extensionbutton.h
@@ -35,10 +35,10 @@ class ExtensionButton : public PanelPopupButton
 
 public:
     ExtensionButton( const TQString& desktopFile, TQWidget* parent );
-    ExtensionButton( const KConfigGroup& config, TQWidget* parent );
+    ExtensionButton( const TDEConfigGroup& config, TQWidget* parent );
     ~ExtensionButton();
 
-    void saveConfig( KConfigGroup& config ) const;
+    void saveConfig( TDEConfigGroup& config ) const;
 
 protected:
     void initialize( const TQString& desktopFile );
diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h
index 523d9ed49..a051e9d57 100644
--- a/kicker/kicker/buttons/kbutton.h
+++ b/kicker/kicker/buttons/kbutton.h
@@ -37,7 +37,7 @@ public:
     KButton( TQWidget *parent );
     ~KButton();
 
-    void loadConfig( const KConfigGroup& config );
+    void loadConfig( const TDEConfigGroup& config );
 
     virtual void properties();
 
diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h
index bc926cf0d..1bdbbafbd 100644
--- a/kicker/kicker/buttons/knewbutton.h
+++ b/kicker/kicker/buttons/knewbutton.h
@@ -42,7 +42,7 @@ public:
     ~KNewButton();
 
     static KNewButton *self() { return m_self; }
-    void loadConfig( const KConfigGroup& config );
+    void loadConfig( const TDEConfigGroup& config );
     TQColor borderColor() const;
     //virtual void setPopupDirection(KPanelApplet::Direction d);
 
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index 808d02633..e48386008 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -65,7 +65,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name,
 }
 
 // this constructor is used when restoring a button, usually at startup
-NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, TQWidget* parent )
+NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent )
   : PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor
 {
     // call the initialization method, this time with values from a config file
@@ -129,7 +129,7 @@ void NonKDEAppButton::initialize(const TQString& name,
     setIcon(iconStr);
 }
 
-void NonKDEAppButton::saveConfig( KConfigGroup& config ) const
+void NonKDEAppButton::saveConfig( TDEConfigGroup& config ) const
 {
     // this is called whenever we change something
     // the config object sent in will already be set to the
@@ -223,7 +223,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr)
         // run in a terminal? ok! we find this in the config file in the
         // [misc] group (this will usually be in kdeglobal, actually, which
         // get merged into the application config automagically for us
-        KConfig *config = TDEGlobal::config();
+        TDEConfig *config = TDEGlobal::config();
         config->setGroup("misc");
         TQString termStr = config->readPathEntry("Terminal", "konsole");
 
diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h
index 2676a667c..0407e85a4 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.h
+++ b/kicker/kicker/buttons/nonkdeappbutton.h
@@ -47,10 +47,10 @@ public:
                     const TQString& cmdLine, bool inTerm, TQWidget* parent);
 
     // ... and once for restoring them at start up
-    NonKDEAppButton(const KConfigGroup& config, TQWidget* parent);
+    NonKDEAppButton(const TDEConfigGroup& config, TQWidget* parent);
 
     // reimplemented from PanelButton
-    virtual void saveConfig(KConfigGroup& config) const;
+    virtual void saveConfig(TDEConfigGroup& config) const;
     virtual void properties();
 
 protected slots:
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index 57a619954..99f8368cf 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -61,7 +61,7 @@ ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent)
     initialize();
 }
 
-ServiceButton::ServiceButton( const KConfigGroup& config, TQWidget* parent )
+ServiceButton::ServiceButton( const TDEConfigGroup& config, TQWidget* parent )
   : PanelButton(parent, "ServiceButton"),
     _service(0)
 {
@@ -149,7 +149,7 @@ void ServiceButton::readDesktopFile()
     setIcon( _service->icon() );
 }
 
-void ServiceButton::saveConfig( KConfigGroup& config ) const
+void ServiceButton::saveConfig( TDEConfigGroup& config ) const
 {
     config.writePathEntry("StorageId", _id );
     if (!config.hasKey("DesktopFile") && _service)
diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h
index 2d881d72c..9d17d1fe5 100644
--- a/kicker/kicker/buttons/servicebutton.h
+++ b/kicker/kicker/buttons/servicebutton.h
@@ -35,11 +35,11 @@ class ServiceButton : public PanelButton
 public:
     ServiceButton( const TQString& desktopFile, TQWidget* parent );
     ServiceButton( const KService::Ptr& service, TQWidget* parent );
-    ServiceButton( const KConfigGroup& config, TQWidget* parent );
+    ServiceButton( const TDEConfigGroup& config, TQWidget* parent );
 
     ~ServiceButton();
 
-    virtual void saveConfig(KConfigGroup& config) const;
+    virtual void saveConfig(TDEConfigGroup& config) const;
     virtual void properties();
 
 protected slots:
diff --git a/kicker/kicker/buttons/servicemenubutton.cpp b/kicker/kicker/buttons/servicemenubutton.cpp
index 7a036e796..0ebc931f4 100644
--- a/kicker/kicker/buttons/servicemenubutton.cpp
+++ b/kicker/kicker/buttons/servicemenubutton.cpp
@@ -39,7 +39,7 @@ ServiceMenuButton::ServiceMenuButton( const TQString& relPath, TQWidget* parent
     initialize( relPath );
 }
 
-ServiceMenuButton::ServiceMenuButton( const KConfigGroup& config, TQWidget* parent )
+ServiceMenuButton::ServiceMenuButton( const TDEConfigGroup& config, TQWidget* parent )
   : PanelPopupButton( parent, "ServiceMenuButton" )
   , topMenu( 0 )
 {
@@ -75,7 +75,7 @@ void ServiceMenuButton::initialize( const TQString& relPath )
     setIcon(group->icon());
 }
 
-void ServiceMenuButton::saveConfig( KConfigGroup& config ) const
+void ServiceMenuButton::saveConfig( TDEConfigGroup& config ) const
 {
     if (topMenu)
         config.writePathEntry("RelPath", topMenu->relPath());
diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h
index 0bd05b8ee..da512105d 100644
--- a/kicker/kicker/buttons/servicemenubutton.h
+++ b/kicker/kicker/buttons/servicemenubutton.h
@@ -37,9 +37,9 @@ class ServiceMenuButton : public PanelPopupButton
 
 public:
     ServiceMenuButton( const TQString& relPath, TQWidget* parent );
-    ServiceMenuButton( const KConfigGroup& config, TQWidget* parent );
+    ServiceMenuButton( const TDEConfigGroup& config, TQWidget* parent );
 
-    void saveConfig( KConfigGroup& config ) const;
+    void saveConfig( TDEConfigGroup& config ) const;
 
 protected:
     void initialize( const TQString& relPath );
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index 3b70fe9c2..132aa8193 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -52,7 +52,7 @@ URLButton::URLButton( const TQString& url, TQWidget* parent )
     initialize( url );
 }
 
-URLButton::URLButton( const KConfigGroup& config, TQWidget* parent )
+URLButton::URLButton( const TDEConfigGroup& config, TQWidget* parent )
   : PanelButton( parent, "URLButton" )
   , fileItem( 0 )
   , pDlg( 0 )
@@ -99,7 +99,7 @@ void URLButton::initialize( const TQString& _url )
     }
 }
 
-void URLButton::saveConfig( KConfigGroup& config ) const
+void URLButton::saveConfig( TDEConfigGroup& config ) const
 {
     config.writePathEntry("URL", fileItem->url().prettyURL());
 }
diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h
index c2cbd2a19..ba4a1b43d 100644
--- a/kicker/kicker/buttons/urlbutton.h
+++ b/kicker/kicker/buttons/urlbutton.h
@@ -38,11 +38,11 @@ class URLButton : public PanelButton
 
 public:
     URLButton( const TQString& url, TQWidget* parent );
-    URLButton( const KConfigGroup& config, TQWidget* parent );
+    URLButton( const TDEConfigGroup& config, TQWidget* parent );
 
     virtual ~URLButton();
 
-    void saveConfig( KConfigGroup& config ) const;
+    void saveConfig( TDEConfigGroup& config ) const;
 
     virtual void properties();
 
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 5fc276d44..a35b34fd0 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -255,7 +255,7 @@ void AppletContainer::showAppletMenu()
     clearOpMenu();
 }
 
-void AppletContainer::slotRemoved(KConfig* config)
+void AppletContainer::slotRemoved(TDEConfig* config)
 {
     BaseContainer::slotRemoved(config);
 
@@ -288,13 +288,13 @@ void AppletContainer::focusRequested(bool focus)
     emit maintainFocus(focus);
 }
 
-void AppletContainer::doLoadConfiguration( KConfigGroup& config )
+void AppletContainer::doLoadConfiguration( TDEConfigGroup& config )
 {
     setWidthForHeightHint(config.readNumEntry("WidthForHeightHint", 0));
     setHeightForWidthHint(config.readNumEntry("HeightForWidthHint", 0));
 }
 
-void AppletContainer::doSaveConfiguration( KConfigGroup& config,
+void AppletContainer::doSaveConfiguration( TDEConfigGroup& config,
                                            bool layoutOnly ) const
 {
     // immutability is checked by ContainerBase
diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h
index 18ce050d5..458f18fe0 100644
--- a/kicker/kicker/core/container_applet.h
+++ b/kicker/kicker/core/container_applet.h
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQHBox;
 class QXEmbed;
 class TQBoxLayout;
-class KConfig;
+class TDEConfig;
 
 class AppletHandle;
 
@@ -72,7 +72,7 @@ signals:
     void updateLayout();
 
 public slots:
-    virtual void slotRemoved(KConfig* config);
+    virtual void slotRemoved(TDEConfig* config);
     virtual void setPopupDirection(KPanelApplet::Direction d);
     virtual void setOrientation(KPanelExtension::Orientation o);
     virtual void setImmutable(bool immutable);
@@ -82,8 +82,8 @@ public slots:
     void activateWindow();
 
 protected:
-    virtual void doLoadConfiguration( KConfigGroup& );
-    virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
+    virtual void doLoadConfiguration( TDEConfigGroup& );
+    virtual void doSaveConfiguration( TDEConfigGroup&, bool layoutOnly ) const;
     virtual void alignmentChange(KPanelExtension::Alignment a);
 
     virtual TQPopupMenu* createOpMenu();
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index e224efe7a..56c09f285 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -72,13 +72,13 @@ void BaseContainer::setImmutable(bool immutable)
     clearOpMenu();
 }
 
-void BaseContainer::loadConfiguration( KConfigGroup& group )
+void BaseContainer::loadConfiguration( TDEConfigGroup& group )
 {
     setFreeSpace( TQMIN( group.readDoubleNumEntry( "FreeSpace2", 0 ), 1 ) );
     doLoadConfiguration( group );
 }
 
-void BaseContainer::saveConfiguration(KConfigGroup& group,
+void BaseContainer::saveConfiguration(TDEConfigGroup& group,
                                       bool layoutOnly) const
 {
     if (isImmutable())
@@ -101,7 +101,7 @@ void BaseContainer::configure(KPanelExtension::Orientation o,
     configure();
 }
 
-void BaseContainer::slotRemoved(KConfig* config)
+void BaseContainer::slotRemoved(TDEConfig* config)
 {
     if (!config)
     {
diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h
index f1eaddee1..88e06e715 100644
--- a/kicker/kicker/core/container_base.h
+++ b/kicker/kicker/core/container_base.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kpanelextension.h>
 #include <kpanelapplet.h>
 
-class KConfigGroup;
+class TDEConfigGroup;
 class TQPopupMenu;
 
 class BaseContainer : public TQWidget
@@ -80,8 +80,8 @@ public:
     TQPopupMenu* opMenu();
     void clearOpMenu();
 
-    void loadConfiguration( KConfigGroup& );
-    void saveConfiguration( KConfigGroup&, bool layoutOnly = false ) const;
+    void loadConfiguration( TDEConfigGroup& );
+    void saveConfiguration( TDEConfigGroup&, bool layoutOnly = false ) const;
 
     void configure(KPanelExtension::Orientation, KPanelApplet::Direction);
     virtual void configure() {}
@@ -93,7 +93,7 @@ public:
     virtual TQString visibleName() const = 0;
 
 public slots:
-    virtual void slotRemoved(KConfig* config);
+    virtual void slotRemoved(TDEConfig* config);
     virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; }
     virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; }
 
@@ -108,8 +108,8 @@ signals:
     void focusReqested(bool);
 
 protected:
-    virtual void doLoadConfiguration( KConfigGroup& ) {}
-    virtual void doSaveConfiguration( KConfigGroup&,
+    virtual void doLoadConfiguration( TDEConfigGroup& ) {}
+    virtual void doSaveConfiguration( TDEConfigGroup&,
                                       bool /* layoutOnly */ ) const {}
     virtual void alignmentChange(KPanelExtension::Alignment) {}
 
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index 0cd7d6f19..0ec70bc93 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -114,7 +114,7 @@ void ButtonContainer::configure()
     }
 }
 
-void ButtonContainer::doSaveConfiguration(KConfigGroup& config, bool layoutOnly) const
+void ButtonContainer::doSaveConfiguration(TDEConfigGroup& config, bool layoutOnly) const
 {
     // immutability is checked by ContainerBase
     if (_button && !layoutOnly)
@@ -315,7 +315,7 @@ void ButtonContainer::slotMenuClosed()
         _button->setDown(false);
 }
 
-void ButtonContainer::checkImmutability(const KConfigGroup& config)
+void ButtonContainer::checkImmutability(const TDEConfigGroup& config)
 {
     m_immutable = config.groupIsImmutable() ||
                   config.entryIsImmutable("ConfigFile") ||
@@ -323,7 +323,7 @@ void ButtonContainer::checkImmutability(const KConfigGroup& config)
 }
 
 // KMenuButton containerpan
-KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
+KMenuButtonContainer::KMenuButtonContainer(const TDEConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
   : ButtonContainer(opMenu, parent)
 {
     checkImmutability(config);
@@ -359,7 +359,7 @@ DesktopButtonContainer::DesktopButtonContainer(TQPopupMenu *opMenu, TQWidget* pa
     embedButton( new DesktopButton(this) );
 }
 
-DesktopButtonContainer::DesktopButtonContainer(const KConfigGroup& config,
+DesktopButtonContainer::DesktopButtonContainer(const TDEConfigGroup& config,
                                                TQPopupMenu *opMenu, TQWidget* parent)
   : ButtonContainer(opMenu, parent)
 {
@@ -384,7 +384,7 @@ ServiceButtonContainer::ServiceButtonContainer( const KService::Ptr &service,
     _actions = KPanelApplet::Preferences;
 }
 
-ServiceButtonContainer::ServiceButtonContainer( const KConfigGroup& config,
+ServiceButtonContainer::ServiceButtonContainer( const TDEConfigGroup& config,
                                                 TQPopupMenu* opMenu, TQWidget* parent)
   : ButtonContainer(opMenu, parent)
 {
@@ -411,7 +411,7 @@ URLButtonContainer::URLButtonContainer( const TQString& url, TQPopupMenu* opMenu
     _actions = KPanelApplet::Preferences;
 }
 
-URLButtonContainer::URLButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
+URLButtonContainer::URLButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
   : ButtonContainer(opMenu, parent)
 {
     checkImmutability(config);
@@ -437,7 +437,7 @@ BrowserButtonContainer::BrowserButtonContainer(const TQString &startDir, TQPopup
     _actions = KPanelApplet::Preferences;
 }
 
-BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
+BrowserButtonContainer::BrowserButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
   : ButtonContainer(opMenu, parent)
 {
     checkImmutability(config);
@@ -452,7 +452,7 @@ ServiceMenuButtonContainer::ServiceMenuButtonContainer(const TQString& relPath,
     embedButton( new ServiceMenuButton(relPath, this) );
 }
 
-ServiceMenuButtonContainer::ServiceMenuButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
+ServiceMenuButtonContainer::ServiceMenuButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
   : ButtonContainer(opMenu, parent)
 {
     checkImmutability(config);
@@ -470,7 +470,7 @@ TQString ServiceMenuButtonContainer::visibleName() const
 }
 
 // WindowListButton container
-WindowListButtonContainer::WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
+WindowListButtonContainer::WindowListButtonContainer(const TDEConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
   : ButtonContainer(opMenu, parent)
 {
     checkImmutability(config);
@@ -484,7 +484,7 @@ WindowListButtonContainer::WindowListButtonContainer(TQPopupMenu *opMenu, TQWidg
 }
 
 // BookmarkButton container
-BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
+BookmarksButtonContainer::BookmarksButtonContainer(const TDEConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
   : ButtonContainer(opMenu, parent)
 {
     checkImmutability(config);
@@ -515,7 +515,7 @@ NonKDEAppButtonContainer::NonKDEAppButtonContainer(const TQString &name,
     _actions = KPanelApplet::Preferences;
 }
 
-NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent)
+NonKDEAppButtonContainer::NonKDEAppButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent)
   : ButtonContainer(opMenu, parent)
 {
     checkImmutability(config);
@@ -530,7 +530,7 @@ ExtensionButtonContainer::ExtensionButtonContainer(const TQString& df, TQPopupMe
     embedButton( new ExtensionButton(df, this) );
 }
 
-ExtensionButtonContainer::ExtensionButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent)
+ExtensionButtonContainer::ExtensionButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent)
   : ButtonContainer(opMenu, parent)
 {
     checkImmutability(config);
diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h
index f67ac5ec2..79d75e594 100644
--- a/kicker/kicker/core/container_button.h
+++ b/kicker/kicker/core/container_button.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class TQLayout;
 class PanelButton;
-class KConfigGroup;
+class TDEConfigGroup;
 
 class ButtonContainer : public BaseContainer
 {
@@ -68,10 +68,10 @@ protected slots:
     void dragButton(const TQPixmap icon);
 
 protected:
-    virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
+    virtual void doSaveConfiguration( TDEConfigGroup&, bool layoutOnly ) const;
     void embedButton(PanelButton* p);
     TQPopupMenu* createOpMenu();
-    void checkImmutability(const KConfigGroup&);
+    void checkImmutability(const TDEConfigGroup&);
 
 protected:
     PanelButton  *_button;
@@ -82,7 +82,7 @@ protected:
 class KMenuButtonContainer : public ButtonContainer
 {
 public:
-    KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+    KMenuButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     KMenuButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
     virtual TQString appletType() const { return "KMenuButton"; }
     virtual TQString icon() const { return "kmenu"; }
@@ -95,7 +95,7 @@ public:
 class DesktopButtonContainer : public ButtonContainer
 {
 public:
-    DesktopButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+    DesktopButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     DesktopButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
     TQString appletType() const { return "DesktopButton"; }
     virtual TQString icon() const { return "desktop"; }
@@ -105,7 +105,7 @@ public:
 class ServiceButtonContainer : public ButtonContainer
 {
 public:
-    ServiceButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+    ServiceButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     ServiceButtonContainer(const KService::Ptr & service,  TQPopupMenu* opMenu,TQWidget* parent = 0);
     ServiceButtonContainer(const TQString& desktopFile,  TQPopupMenu* opMenu,TQWidget* parent = 0);
     TQString appletType() const { return "ServiceButton"; }
@@ -116,7 +116,7 @@ public:
 class URLButtonContainer : public ButtonContainer
 {
 public:
-    URLButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+    URLButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     URLButtonContainer(const TQString& url, TQPopupMenu* opMenu, TQWidget* parent = 0);
     TQString appletType() const { return "URLButton"; }
     virtual TQString icon() const;
@@ -126,7 +126,7 @@ public:
 class BrowserButtonContainer : public ButtonContainer
 {
 public:
-    BrowserButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+    BrowserButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     BrowserButtonContainer(const TQString& startDir, TQPopupMenu* opMenu, const TQString& icon = "kdisknav", TQWidget* parent = 0);
     TQString appletType() const { return "BrowserButton"; }
     virtual TQString icon() const { return "kdisknav"; }
@@ -137,7 +137,7 @@ public:
 class ServiceMenuButtonContainer : public ButtonContainer
 {
 public:
-    ServiceMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+    ServiceMenuButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     ServiceMenuButtonContainer(const TQString& relPath, TQPopupMenu* opMenu, TQWidget* parent = 0);
     TQString appletType() const { return "ServiceMenuButton"; }
     virtual TQString icon() const;
@@ -148,7 +148,7 @@ public:
 class WindowListButtonContainer : public ButtonContainer
 {
 public:
-    WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+    WindowListButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
     TQString appletType() const { return "WindowListButton"; }
     virtual TQString icon() const { return "window_list"; }
@@ -159,7 +159,7 @@ public:
 class BookmarksButtonContainer : public ButtonContainer
 {
 public:
-    BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+    BookmarksButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     BookmarksButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
     TQString appletType() const { return "BookmarksButton"; }
     virtual TQString icon() const { return "bookmark"; }
@@ -170,7 +170,7 @@ public:
 class NonKDEAppButtonContainer : public ButtonContainer
 {
 public:
-    NonKDEAppButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0);
+    NonKDEAppButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0);
     NonKDEAppButtonContainer(const TQString &name, const TQString &description,
                              const TQString &filePath, const TQString &icon,
                              const TQString &cmdLine, bool inTerm,
@@ -183,7 +183,7 @@ public:
 class ExtensionButtonContainer : public ButtonContainer
 {
 public:
-    ExtensionButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0);
+    ExtensionButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0);
     ExtensionButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu, TQWidget *parent= 0);
     TQString appletType() const { return "ExtensionButton"; }
     virtual TQString icon() const;
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 37cd1516a..7639fe146 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -172,7 +172,7 @@ void ExtensionContainer::init()
     updateHighlightColor();
 
     // if we were hidden when kicker quit, let's start out hidden as well!
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup(extensionId());
     int tmp = config->readNumEntry("UserHidden", Unhidden);
     if (tmp > Unhidden && tmp <= RightBottom)
@@ -187,7 +187,7 @@ void ExtensionContainer::init()
         // defaults in the settings object since the extension may differ
         // from the "normal" panels. for example, the universal sidebar's
         // preferred position is the left, not the bottom/top
-        KConfigSkeleton::ItemInt* item = dynamic_cast<KConfigSkeleton::ItemInt*>(m_settings.findItem("Position"));
+        TDEConfigSkeleton::ItemInt* item = dynamic_cast<TDEConfigSkeleton::ItemInt*>(m_settings.findItem("Position"));
         if (item)
         {
             KPanelExtension::Position p = m_extension->preferedPosition();
@@ -195,13 +195,13 @@ void ExtensionContainer::init()
             item->readConfig(m_settings.config());
         }
 
-        item = dynamic_cast<KConfigSkeleton::ItemInt*>(m_settings.findItem("Size"));
+        item = dynamic_cast<TDEConfigSkeleton::ItemInt*>(m_settings.findItem("Size"));
         if (item)
         {
             item->setDefaultValue(m_extension->sizeSetting());
         }
 
-        item = dynamic_cast<KConfigSkeleton::ItemInt*>(m_settings.findItem("CustomSize"));
+        item = dynamic_cast<TDEConfigSkeleton::ItemInt*>(m_settings.findItem("CustomSize"));
         if (item)
         {
             item->setDefaultValue(m_extension->customSize());
@@ -359,7 +359,7 @@ void ExtensionContainer::readConfig()
 void ExtensionContainer::writeConfig()
 {
 //    kdDebug(1210) << "ExtensionContainer::writeConfig()" << endl;
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup(extensionId());
 
     config->writePathEntry("ConfigFile", _info.configFile());
@@ -984,7 +984,7 @@ void ExtensionContainer::animatedHide(bool left)
 
     // save our hidden status so that when kicker starts up again
     // we'll come back in the same state
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup(extensionId());
     config->writeEntry("UserHidden", userHidden());
 
@@ -998,7 +998,7 @@ bool ExtensionContainer::reserveStrut() const
 
 KPanelExtension::Alignment ExtensionContainer::alignment() const
 {
-    // KConfigXT really needs to get support for vars that are enums that
+    // TDEConfigXT really needs to get support for vars that are enums that
     // are defined in other classes
     return static_cast<KPanelExtension::Alignment>(m_settings.alignment());
 }
@@ -1385,7 +1385,7 @@ void ExtensionContainer::positionChange(KPanelExtension::Position p)
 
 void ExtensionContainer::updateHighlightColor()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("WM");
     TQColor color = TQApplication::palette().active().highlight();
     m_highlightColor = config->readColorEntry("activeBackground", &color);
@@ -1470,7 +1470,7 @@ void ExtensionContainer::setSize(KPanelExtension::Size size, int custom)
 
 KPanelExtension::Size ExtensionContainer::size() const
 {
-    // KConfigXT really needs to get support for vars that are enums that
+    // TDEConfigXT really needs to get support for vars that are enums that
     // are defined in other classes
     return static_cast<KPanelExtension::Size>(m_settings.size());
 }
@@ -1592,7 +1592,7 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const
 
 KPanelExtension::Position ExtensionContainer::position() const
 {
-    // KConfigXT really needs to get support for vars that are enums that
+    // TDEConfigXT really needs to get support for vars that are enums that
     // are defined in other classes
     return static_cast<KPanelExtension::Position>(m_settings.position());
 }
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index 81752bffa..8948341d1 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -43,7 +43,7 @@ class TQTimer;
 class TQVBox;
 class QXEmbed;
 class HideButton;
-class KConfig;
+class TDEConfig;
 class KWinModule;
 class PopupWidgetFilter;
 class PanelExtensionOpMenu;
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index d2407182e..12949f95b 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -70,7 +70,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // for multihead
 extern int kicker_screen_number;
 
-ContainerArea::ContainerArea(KConfig* _c,
+ContainerArea::ContainerArea(TDEConfig* _c,
                              TQWidget* parent,
                              TQPopupMenu* opMenu,
                              const char* name)
@@ -310,7 +310,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
             continue;
         }
 
-        KConfigGroup group(_config, appletId.latin1());
+        TDEConfigGroup group(_config, appletId.latin1());
 
         BaseContainer* a = 0;
 
@@ -395,13 +395,13 @@ void ContainerArea::saveContainerConfig(bool layoutOnly)
         BaseContainer* a = dynamic_cast<BaseContainer*>(it2.current()->widget());
         if (a)
         {
-            KConfigGroup group(_config, a->appletId().latin1());
+            TDEConfigGroup group(_config, a->appletId().latin1());
             a->saveConfiguration(group, layoutOnly);
             alist.append(a->appletId());
         }
     }
 
-    KConfigGroup group( _config, "General" );
+    TDEConfigGroup group( _config, "General" );
     group.writeEntry("Applets2", alist);
 
     _config->sync();
diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h
index 54bbf6f48..f52003982 100644
--- a/kicker/kicker/core/containerarea.h
+++ b/kicker/kicker/core/containerarea.h
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "panner.h"
 #include "container_base.h"
 
-class KConfig;
+class TDEConfig;
 class DragIndicator;
 class PanelContainer;
 class KRootPixmap;
@@ -48,7 +48,7 @@ class ContainerArea : public Panner
     Q_OBJECT
 
 public:
-    ContainerArea( KConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 );
+    ContainerArea( TDEConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 );
     ~ContainerArea();
 
     void initialize(bool useDefaultConfig);
@@ -150,7 +150,7 @@ private:
     BaseContainer::List   m_containers;
     BaseContainer*  _moveAC;
     KPanelExtension::Position	    _pos;
-    KConfig*	    _config;
+    TDEConfig*	    _config;
     DragIndicator*  _dragIndicator;
     BaseContainer*  _dragMoveAC;
     TQPoint	    _dragMoveOffset;
diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg
index 12bf9e37c..b8fd66100 100644
--- a/kicker/kicker/core/extensionSettings.kcfg
+++ b/kicker/kicker/core/extensionSettings.kcfg
@@ -11,7 +11,7 @@
 <group name="General">
 
 <entry name="IExist" type="Bool">
-    <label>Whether this panel actually exists or not. Primarily to work around the fact that KConfigXT won't write a config file unless there is at least one non-default entry.</label>
+    <label>Whether this panel actually exists or not. Primarily to work around the fact that TDEConfigXT won't write a config file unless there is at least one non-default entry.</label>
     <default>false</default>
 </entry>
 <entry name="Position" type="Int" >
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index fce133a0f..62594443f 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -87,7 +87,7 @@ ExtensionManager::~ExtensionManager()
 void ExtensionManager::initialize()
 {
 //    kdDebug(1210) << "ExtensionManager::loadContainerConfig()" << endl;
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     PluginManager* pm = PluginManager::the();
 
     // set up the "main" panel
@@ -175,9 +175,9 @@ void ExtensionManager::initialize()
 
 void ExtensionManager::configureMenubar(bool duringInit)
 {
-    KConfig menuConfig( "kdesktoprc", true );
-    if( KConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false)
-        || KConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false ))
+    TDEConfig menuConfig( "kdesktoprc", true );
+    if( TDEConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false)
+        || TDEConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false ))
     {
         if (TDEGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() ||
             m_menubarPanel)
@@ -239,7 +239,7 @@ void ExtensionManager::migrateMenubar()
     // panel, meaning kickerrc itself would have to be vastly modified
     // with lots of complications. not work it IMHO.
 
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup("General");
 
     if (config->readBoolEntry("CheckedForMenubar", false))
@@ -272,7 +272,7 @@ void ExtensionManager::migrateMenubar()
 
         config->setGroup(extensionId);
         TQString extension = config->readPathEntry("ConfigFile");
-        KConfig extensionConfig(locate("config", extension));
+        TDEConfig extensionConfig(locate("config", extension));
         extensionConfig.setGroup("General");
 
         if (extensionConfig.hasKey("Applets2"))
@@ -290,7 +290,7 @@ void ExtensionManager::migrateMenubar()
                     continue;
                 }
 
-                KConfigGroup group(&extensionConfig, appletId.latin1());
+                TDEConfigGroup group(&extensionConfig, appletId.latin1());
                 TQString appletType = appletId.left(appletId.findRev('_'));
 
                 if (appletType == "Applet")
@@ -299,7 +299,7 @@ void ExtensionManager::migrateMenubar()
                     if (appletFile.find("menuapplet.desktop") != -1)
                     {
                         TQString menubarConfig = locate("config", extension);
-                        KIO::NetAccess::copy(menubarConfig,
+                        TDEIO::NetAccess::copy(menubarConfig,
                                              locateLocal("config",
                                              "kicker_menubarpanelrc"), 0);
                         elist.remove(it);
@@ -322,7 +322,7 @@ void ExtensionManager::saveContainerConfig()
 {
 //    kdDebug(1210) << "ExtensionManager::saveContainerConfig()" << endl;
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     // build the extension list
     TQStringList elist;
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 864bcec6f..3fa04e374 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -197,7 +197,7 @@ void Kicker::slotSettingsChanged(int category)
 
 void Kicker::paletteChanged()
 {
-    KConfigGroup c(TDEGlobal::config(), "General");
+    TDEConfigGroup c(TDEGlobal::config(), "General");
     KickerSettings::setTintColor(c.readColorEntry("TintColor",
                                            &palette().active().mid()));
     KickerSettings::self()->writeConfig();
@@ -227,7 +227,7 @@ void Kicker::configure()
 {
     static bool notFirstConfig = false;
 
-    KConfig* c = TDEGlobal::config();
+    TDEConfig* c = TDEGlobal::config();
     c->reparseConfiguration();
     c->setGroup("General");
     m_canAddContainers = !c->entryIsImmutable("Applets2");
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 893efdd41..17a148474 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -122,7 +122,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     aboutData.addAuthor("John Firebaugh",0, "jfirebaugh@kde.org");
     aboutData.addAuthor("Waldo Bastian", I18N_NOOP("Kiosk mode"), "bastian@kde.org");
 
-    aboutData.addCredit("Jessica Hall", /* I18N_NOOP("KConfigXT") */ 0, "jes.hall@kdemail.net");
+    aboutData.addCredit("Jessica Hall", /* I18N_NOOP("TDEConfigXT") */ 0, "jes.hall@kdemail.net");
     aboutData.addCredit("Stefan Nikolaus", /* I18N_NOOP("Bug fixes") */ 0, "stefan.nikolaus@kdemail.net");
     aboutData.addCredit("Benoît Minisini", /* I18N_NOOP("Bug fixes") */ 0, "gambas@users.sourceforge.net");
     TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index 0ac38610f..32eeba076 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -113,7 +113,7 @@ AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles,
 
 PluginManager::PluginManager()
 {
-    KConfigGroup generalGroup(TDEGlobal::config(), "General");
+    TDEConfigGroup generalGroup(TDEGlobal::config(), "General");
     m_untrustedApplets = generalGroup.readListEntry("UntrustedApplets");
     m_untrustedExtensions = generalGroup.readListEntry("UntrustedExtensions");
 }
@@ -282,7 +282,7 @@ AppletContainer* PluginManager::createAppletContainer(
     {
         // we haven't loaded this puppy before and we're not in the untrusted list
         m_untrustedApplets.append(desktopFile);
-        KConfigGroup generalGroup(TDEGlobal::config(), "General");
+        TDEConfigGroup generalGroup(TDEGlobal::config(), "General");
         generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets);
         generalGroup.sync();
     }
@@ -335,7 +335,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk
         {
             // we don't have an instance around and we're not in the untrusted list!
             m_untrustedExtensions.append(desktopFile);
-            KConfigGroup generalGroup(TDEGlobal::config(), "General");
+            TDEConfigGroup generalGroup(TDEGlobal::config(), "General");
             generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions);
             generalGroup.sync();
         }
@@ -349,7 +349,7 @@ void PluginManager::clearUntrustedLists()
     m_untrustedExtensions.clear();
     m_untrustedApplets.clear();
 
-    KConfigGroup generalGroup(TDEGlobal::config(), "General");
+    TDEConfigGroup generalGroup(TDEGlobal::config(), "General");
     generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets);
     generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions);
     generalGroup.sync();
diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp
index 748850eee..4a6639574 100644
--- a/kicker/kicker/core/showdesktop.cpp
+++ b/kicker/kicker/core/showdesktop.cpp
@@ -74,7 +74,7 @@ void ShowDesktop::slotWindowAdded(WId w)
     if ((windowType == NET::Normal || windowType == NET::Unknown) &&
         inf.mappingState() == NET::Visible)
     {
-        KConfig twincfg( "twinrc", true ); // see in twin
+        TDEConfig twincfg( "twinrc", true ); // see in twin
         twincfg.setGroup( "Windows" );
         if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false ))
         {
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 696065266..c6ca4ab32 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -149,7 +149,7 @@ void PanelBrowserMenu::initialize()
     // only the first part menu got them
     if(_startid == 0 && !_filesOnly) {
        insertTitle(path());
-       KConfig *c = TDEGlobal::config();
+       TDEConfig *c = TDEGlobal::config();
        c->setGroup("menus");
        insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager()));
 	if (kapp->authorize("shell_access") && c->readBoolEntry("kickerOpenInTerminalIsVisible",false)) 
@@ -229,7 +229,7 @@ void PanelBrowserMenu::initialize()
         else if(fi->isFile())
         {
             TQString name = fi->fileName();
-            TQString title = KIO::decodeFileName(name);
+            TQString title = TDEIO::decodeFileName(name);
 
             TQPixmap icon;
             TQString path = fi->absFilePath();
@@ -449,7 +449,7 @@ void PanelBrowserMenu::slotExec(int id)
 
 void PanelBrowserMenu::slotOpenTerminal()
 {
-    KConfig * config = kapp->config();
+    TDEConfig * config = kapp->config();
     config->setGroup("General");
     TQString term = config->readPathEntry("TerminalApplication", "konsole");
 
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 8dca46038..84c977331 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -383,7 +383,7 @@ void PanelKMenu::initialize()
     /*
       If  the user configured ksmserver to
     */
-    KConfig ksmserver("ksmserverrc", false, false);
+    TDEConfig ksmserver("ksmserverrc", false, false);
     ksmserver.setGroup("General");
     if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
     {
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 7dc8424d1..eba68ed1c 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1206,7 +1206,7 @@ void KMenu::initialize()
    /*
        If  the user configured ksmserver to
      */
-    KConfig ksmserver("ksmserverrc", false, false);
+    TDEConfig ksmserver("ksmserverrc", false, false);
     ksmserver.setGroup("General");
     connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage()));
     m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout"));
@@ -1289,7 +1289,7 @@ void KMenu::insertStaticExitItems()
        m_exitView->leftView()->insertItem( "lock", i18n( "Lock" ),
                                    i18n( "Lock screen" ), "kicker:/lock", nId++, index++ );
 
-    KConfig ksmserver("ksmserverrc", false, false);
+    TDEConfig ksmserver("ksmserverrc", false, false);
     ksmserver.setGroup("General");
     if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
     {
@@ -2890,7 +2890,7 @@ void KMenu::slotContextMenu(int selected)
     TQDataStream ds(ba, IO_WriteOnly);
 
     KURL src,dest;
-    KIO::CopyJob *job;
+    TDEIO::CopyJob *job;
 
     TDEProcess *proc;
 
@@ -2904,7 +2904,7 @@ void KMenu::slotContextMenu(int selected)
 	        dest.setPath( TDEGlobalSettings::desktopPath() );
 	        dest.setFileName( src.fileName() );
 
-                job = KIO::copyAs( src, dest );
+                job = TDEIO::copyAs( src, dest );
                 job->setDefaultPermissions( true );
  	    }
             else {
@@ -3492,7 +3492,7 @@ void KMenu::updateMedia()
                 uint64_t total = ( uint64_t )sfs.f_blocks * sfs.f_bsize;
                 uint64_t avail = ( uint64_t )( getuid() ? sfs.f_bavail : sfs.f_bfree ) * sfs.f_bsize;
                 if ( avail < total && avail > 1024 ) {
-                    label += " " + i18n( "(%1 available)" ).arg( KIO::convertSize(avail) );
+                    label += " " + i18n( "(%1 available)" ).arg( TDEIO::convertSize(avail) );
                 }
             }
         }
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 64f779807..6432cf032 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -669,7 +669,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
     TQDataStream ds(ba, IO_WriteOnly);
 
     KURL src,dest;
-    KIO::CopyJob *job;
+    TDEIO::CopyJob *job;
     KDesktopFile *df;
 
     switch (selected) {
@@ -680,7 +680,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
 	    dest.setPath( TDEGlobalSettings::desktopPath() );
 	    dest.setFileName( src.fileName() );
 
-            job = KIO::copyAs( src, dest );
+            job = TDEIO::copyAs( src, dest );
             job->setDefaultPermissions( true );
 	    break;
 
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 0527f8224..f300df3a2 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -196,7 +196,7 @@ TQString copyDesktopFile(const KURL& url)
    TQString file = newDesktopFile(url);
    KURL dest;
    dest.setPath(file);
-   KIO::NetAccess::upload(url.path(), dest, 0);
+   TDEIO::NetAccess::upload(url.path(), dest, 0);
    return file;
 }
 
@@ -326,7 +326,7 @@ TQPoint popupPosition(KPanelApplet::Direction d,
 
 void colorize(TQImage& image)
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("WM");
     TQColor color = TQApplication::palette().active().highlight();
     TQColor activeTitle = config->readColorEntry("activeBackground", &color);
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 3ecc19dfd..e9481ea85 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -108,7 +108,7 @@ void PanelButton::configure()
         return;
     }
 
-    KConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" );
+    TDEConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" );
     if( !tilesGroup.readBoolEntry( "Enable" + name + "Tiles", true ) ) {
             setTile( TQString::null );
         return;
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index 3a455a58f..b67bc2b9a 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kickertip.h"
 
 class TQPopupMenu;
-class KConfigGroup;
+class TDEConfigGroup;
 class KShadowEngine;
 
 /**
@@ -66,9 +66,9 @@ public:
 
     /**
      * Prompts the button to save it's configuration. Subclass specific
-     * settings should be saved in this method to the KConfigGroup passed in.
+     * settings should be saved in this method to the TDEConfigGroup passed in.
      */
-    virtual void saveConfig(KConfigGroup&) const {}
+    virtual void saveConfig(TDEConfigGroup&) const {}
 
     /**
      * Reimplement this to display a properties dialog for your button.
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index ea7668c8a..a3c076741 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -63,7 +63,7 @@ void KonquerorProfilesMenu::initialize()
    for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt )
    {
       TQFileInfo info( *pIt );
-      TQString profileName = KIO::decodeFileName( info.baseName() );
+      TQString profileName = TDEIO::decodeFileName( info.baseName() );
       TQString niceName=profileName;
       KSimpleConfig cfg( *pIt, true );
       if ( cfg.hasGroup( "Profile" ) )
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 16e11a039..dbaa1e434 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -205,7 +205,7 @@ void KonsoleMenu::initialize()
     for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt)
     {
         TQFileInfo info(*pIt);
-        TQString profileName = KIO::decodeFileName(info.baseName());
+        TQString profileName = TDEIO::decodeFileName(info.baseName());
         TQString niceName = profileName;
         KSimpleConfig cfg(*pIt, true);
         if (cfg.hasGroup("Profile"))
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 5ab089f0d..19ff376f4 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -180,7 +180,7 @@ TOM::TOM(TQWidget *parent, const char *name)
     setCaption(i18n("Task-Oriented Menu"));
 
     // KMenu legacy: support some menu config options
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup("menus");
     m_detailedTaskEntries = config->readBoolEntry("DetailedMenuEntries", false);
     if (m_detailedTaskEntries)
@@ -244,7 +244,7 @@ void TOM::initializeRecentDocs()
     }
 }
 
-int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
+int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
 {
     if (!config.hasGroup("General"))
     {
@@ -452,7 +452,7 @@ void TOM::initialize()
 
         for (; eIt != eEnd; ++eIt )
         {
-            KConfig config(*dIt + *eIt);
+            TDEConfig config(*dIt + *eIt);
             appendTaskGroup(config);
         }
     }
@@ -476,7 +476,7 @@ void TOM::initialize()
 
     if (!destinationsConfig.isEmpty() && TQFile::exists(destinationsConfig))
     {
-        KConfig config(destinationsConfig);
+        TDEConfig config(destinationsConfig);
         numDests = appendTaskGroup(config, false);
     }
 
@@ -516,7 +516,7 @@ void TOM::initialize()
     }
 
 
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     TQStringList menu_ext = config->readListEntry("Extensions");
     if (!menu_ext.isEmpty())
     {
@@ -628,7 +628,7 @@ void TOM::removeTask()
  *
 bool TOM::loadSidePixmap()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   TQColor color = palette().active().highlight();
   TQImage image;
 
diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h
index b42feb536..e4b8cc884 100644
--- a/kicker/menuext/tom/tom.h
+++ b/kicker/menuext/tom/tom.h
@@ -66,7 +66,7 @@ class TOM : public KPanelMenu
     protected:
         void reload();
 
-        int  appendTaskGroup(KConfig& config, bool inSubMenu = true );
+        int  appendTaskGroup(TDEConfig& config, bool inSubMenu = true );
         void initializeRecentApps(TQPopupMenu* menu);
         //int  insertTOMTitle(TQPopupMenu* menu, const TQString &text, int id = -1, int index = -1);
 
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index 581719660..db7fd8729 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -62,8 +62,8 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
     TQFile configFileObject(locateLocal("config", configFile));
     if (!configFileObject.exists())
     {
-        KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
-        KConfig localConfig(configFile);
+        TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+        TDEConfig localConfig(configFile);
         globalConfig.copyTo(configFile, &localConfig);
         localConfig.sync();
     }
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index b5bcf40e1..6215f9ba6 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -93,7 +93,7 @@ TaskManager::~TaskManager()
 
 void TaskManager::configure_startup()
 {
-    KConfig c("klaunchrc", true);
+    TDEConfig c("klaunchrc", true);
     c.setGroup("FeedbackStyle");
     if (!c.readBoolEntry("TaskbarButton", false))
         return;