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

9 files changed, 14 insertions, 14 deletions

diff --git a/ksayit/src/effectstack.cpp b/ksayit/src/effectstack.cpp
index 75ef7f5..cdea2f5 100644
--- a/ksayit/src/effectstack.cpp
+++ b/ksayit/src/effectstack.cpp
@@ -20,7 +20,7 @@
 #include "effectstack.h"
 #include "fxpluginhandler.h"
 
-EffectStack::EffectStack(FXPluginHandler *pluginhandler, KConfig *config)
+EffectStack::EffectStack(FXPluginHandler *pluginhandler, TDEConfig *config)
     : 
      dispatcher(), server(),
      m_pluginhandler(pluginhandler),
diff --git a/ksayit/src/effectstack.h b/ksayit/src/effectstack.h
index 0716ef7..0a2f959 100644
--- a/ksayit/src/effectstack.h
+++ b/ksayit/src/effectstack.h
@@ -35,7 +35,7 @@ class FXPluginHandler;
 */
 class EffectStack{
 public:
-    EffectStack(FXPluginHandler *pluginhandler=0, KConfig *config=0);
+    EffectStack(FXPluginHandler *pluginhandler=0, TDEConfig *config=0);
     ~EffectStack();
     
     // KDE::PlayObject *playobj;
@@ -49,7 +49,7 @@ public: //Methods
 
 private:
     FXPluginHandler *m_pluginhandler;
-    KConfig *m_config;
+    TDEConfig *m_config;
 
 
 };
diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp
index 61d0491..55c87e7 100644
--- a/ksayit/src/fxpluginhandler.cpp
+++ b/ksayit/src/fxpluginhandler.cpp
@@ -26,7 +26,7 @@
 #include "ksayit_ttsplugin.h"
 
 
-FXPluginHandler::FXPluginHandler(TQObject *parent, const char *name, KConfig *config)
+FXPluginHandler::FXPluginHandler(TQObject *parent, const char *name, TDEConfig *config)
  : TQObject(parent, name), m_config(config)
 {
     m_mapPluginList.clear();
diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h
index 4da5fb6..1ee84e7 100644
--- a/ksayit/src/fxpluginhandler.h
+++ b/ksayit/src/fxpluginhandler.h
@@ -49,7 +49,7 @@ class FXPluginHandler : public TQObject
 Q_OBJECT
   
 public:
-    FXPluginHandler(TQObject *parent = 0, const char *name = 0, KConfig *config=0);
+    FXPluginHandler(TQObject *parent = 0, const char *name = 0, TDEConfig *config=0);
     ~FXPluginHandler();
 
 public: // Methods  
@@ -87,7 +87,7 @@ public: // Methods
     void getPlugins(TQStringList &pluginlist); 
 
 private: // Attributes
-    KConfig *m_config;
+    TDEConfig *m_config;
     TQMap<TQString, fx_struct> m_mapPluginList; // holds all plugins found on the system
     // TQMap<TQString, fx_struct> m_mapActivePlugins; // holds the active effects
     TQStringList m_lstActivePlugins;
diff --git a/ksayit/src/fxsetupimpl.cpp b/ksayit/src/fxsetupimpl.cpp
index fc0100e..db2ce0b 100644
--- a/ksayit/src/fxsetupimpl.cpp
+++ b/ksayit/src/fxsetupimpl.cpp
@@ -28,7 +28,7 @@
 #include "fxpluginhandler.h"
 
 FX_SetupImpl::FX_SetupImpl(TQWidget *parent, const char *name,
-        KConfig *config,
+        TDEConfig *config,
         FXPluginHandler *fxpluginhandler )
  : FX_Setup(parent,name), m_config(config), m_fxpluginhandler(fxpluginhandler)
 { 
diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h
index 7f480f9..e062877 100644
--- a/ksayit/src/fxsetupimpl.h
+++ b/ksayit/src/fxsetupimpl.h
@@ -41,7 +41,7 @@ class FX_SetupImpl : public FX_Setup  {
 
 public: 
   FX_SetupImpl(TQWidget *parent=0, const char *name=0,
-          KConfig *config=0,
+          TDEConfig *config=0,
           FXPluginHandler *fxpluginhandler=0);
   ~FX_SetupImpl();
 
@@ -79,7 +79,7 @@ private: // Methods
   void Init(TQStringList c_avail);
 
 private:
-  KConfig *m_config;
+  TDEConfig *m_config;
   FXPluginHandler *m_fxpluginhandler;
   TQStringList pluginlist;
   
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index 14a79f3..dd27641 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -61,7 +61,7 @@ class KSayItBookmarkHandler;
   * full session management as well as using KActions.
   * @see KMainWindow
   * @see TDEApplication
-  * @see KConfig
+  * @see TDEConfig
   *
   * @author Robert Vogl
   */
@@ -322,7 +322,7 @@ private: // Methods
     
     
 private:
-    KConfig *config;
+    TDEConfig *config;
     KSayItViewImpl *view;
     KSayItSystemTray *tray;
     EffectStack *es;
diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index 9fb65d9..7944328 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -41,7 +41,7 @@
 
 VoiceSetupDlg::VoiceSetupDlg(TQWidget *parent, const char *name, const TQString &caption,
         bool modal,
-        KConfig *config,
+        TDEConfig *config,
         FXPluginHandler *fxpluginhandler,
         KTTSDLib *ttslib)
  : KDialogBase(IconList, caption, Ok|Cancel, Ok, parent, name, modal, true),
diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h
index 6ed65c2..01d171c 100644
--- a/ksayit/src/voicesetupdlg.h
+++ b/ksayit/src/voicesetupdlg.h
@@ -38,7 +38,7 @@ class VoiceSetupDlg : public KDialogBase  {
 public: 
   VoiceSetupDlg(TQWidget *parent=0, const char *name=0, const TQString &caption=NULL,
         bool modal=true,
-        KConfig *config=0,
+        TDEConfig *config=0,
         FXPluginHandler *fxpluginhandler=0,
         KTTSDLib *kttslib=0);
                   
@@ -81,7 +81,7 @@ private slots:
     void slotOk();
        
 private:
-    KConfig *m_config;
+    TDEConfig *m_config;
     FXPluginHandler *m_fxpluginhandler;
     KTTSDLib *m_kttslib;
     TQFrame *m_fxPage;