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

1 files changed, 5 insertions, 5 deletions

diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index fbfd9eeb8..959d581dc 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -39,7 +39,7 @@ class TQSignalMapper;
 
 class KActionMenu;
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KRadioAction;
 class KToggleAction;
 class KMenuBar;
@@ -62,7 +62,7 @@ template <typename T> class TQValueList;
 template <typename T, typename S> class TQMap;
 template <typename T> class TQGuardedPtr;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -88,7 +88,7 @@ public:
   KMMainWidget(TQWidget *parent, const char *name,
                KXMLGUIClient *aGUIClient,
                KActionCollection *actionCollection,
-         KConfig*config = KMKernel::config() );
+         TDEConfig*config = KMKernel::config() );
   virtual ~KMMainWidget();
   void destruct();
 
@@ -265,7 +265,7 @@ protected:
   /** @return the correct config dialog depending on whether the parent of the mainWidget
    *          is a KPart or a KMMainWindow. When dealing with geometries, use this pointer
    */
-  KConfig * config();
+  TDEConfig * config();
 
 protected slots:
   void slotCheckOneAccount(int);
@@ -564,7 +564,7 @@ private:
   TQPtrList<KAction> mCustomTemplateActions;
 
   KMSystemTray  *mSystemTray;
-  KConfig *mConfig;
+  TDEConfig *mConfig;
   KXMLGUIClient *mGUIClient;
 
   KMail::MessageActions *mMsgActions;