Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 4 insertions, 4 deletions

diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index c334291e9..0b9aa51eb 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -59,7 +59,7 @@ namespace KPIM {
 class KMKernel;
 class KProcess;
 class KProgressDialog;
-class KInstance;
+class TDEInstance;
 class TQTimer;
 class KProgress;
 class KPassivePopup;
@@ -291,8 +291,8 @@ public:
    */
   KMFolder* findFolderById( const TQString& idString );
 
-  KInstance *xmlGuiInstance() { return mXmlGuiInstance; }
-  void setXmlGuiInstance( KInstance *instance ) { mXmlGuiInstance = instance; }
+  TDEInstance *xmlGuiInstance() { return mXmlGuiInstance; }
+  void setXmlGuiInstance( TDEInstance *instance ) { mXmlGuiInstance = instance; }
 
   KMFolder *inboxFolder() { return the_inboxFolder; }
   KMFolder *outboxFolder() { return the_outboxFolder; }
@@ -489,7 +489,7 @@ private:
   static KMKernel *mySelf;
   KSharedConfig::Ptr mConfig;
   TQTextCodec *netCodec;
-  KInstance* mXmlGuiInstance;
+  TDEInstance* mXmlGuiInstance;
   ConfigureDialog *mConfigureDialog;
 
   TQTimer *mBackgroundTasksTimer;