Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

1 files changed, 3 insertions, 3 deletions

diff --git a/tdecore/ksocks.h b/tdecore/ksocks.h
index 14067c0f3..b55829941 100644
--- a/tdecore/ksocks.h
+++ b/tdecore/ksocks.h
@@ -29,7 +29,7 @@
 class KSocksTable;
 class KSocksPrivate;
 class KLibrary;
-class KConfigBase;
+class TDEConfigBase;
 struct sockaddr;
 
 typedef unsigned ksocklen_t;
@@ -185,10 +185,10 @@ public:
     *  Set this before the first call to KSocks::self() and it will use
     *  @p config to read its configuration from.
     */
-   static void setConfig(KConfigBase *config);
+   static void setConfig(TDEConfigBase *config);
 
 private:
-   KSocks(KConfigBase *config);
+   KSocks(TDEConfigBase *config);
    ~KSocks();
 
    void stopSocks();