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

15 files changed, 28 insertions, 28 deletions

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