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

16 files changed, 42 insertions, 42 deletions

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()),