Rename KInstance and KAboutData to avoid conflicts with KDE4

8 files changed, 13 insertions, 13 deletions

diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index 201acb61..c655583c 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -209,7 +209,7 @@ namespace KMail {
   };
 
   AboutData::AboutData()
-    : KAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION,
+    : TDEAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION,
                   I18N_NOOP("TDE Email Client"), License_GPL,
                   I18N_NOOP("(c) 1997-2008, The KMail developers"), 0,
                   "http://kontact.kde.org/kmail/" )
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 843e7aa6..39fe5662 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -37,7 +37,7 @@
 
 namespace KMail {
 
-  class KDE_EXPORT AboutData : public KAboutData {
+  class KDE_EXPORT AboutData : public TDEAboutData {
   public:
     AboutData();
     ~AboutData();
diff --git a/kmail/dcoptest.cpp b/kmail/dcoptest.cpp
index 04ba43b9..b960b55c 100644
--- a/kmail/dcoptest.cpp
+++ b/kmail/dcoptest.cpp
@@ -15,7 +15,7 @@ int main(int argc,char **argv)
 {
   kdDebug(5006) << "Test KMail DCOP interface." << endl;
 
-  KAboutData aboutData( "testKMailDCOP",
+  TDEAboutData aboutData( "testKMailDCOP",
    "Test for KMail DCOP interface", "0.0" );
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDEApplication app;
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index ac418a95..45da1cd7 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -165,7 +165,7 @@ KMailPart::~KMailPart()
   KMail::cleanup(); // pid file (see kmstartup.cpp)
 }
 
-KAboutData *KMailPart::createAboutData()
+TDEAboutData *KMailPart::createAboutData()
 {
   return new KMail::AboutData();
 }
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 8501519f..dd5d261a 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -37,8 +37,8 @@
 #include <tqwidget.h>
 #include <tdepimmacros.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 class KMailStatusBarExtension;
 class KMKernel;
 class KMMainWidget;
@@ -60,7 +60,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
 
     TQWidget* parentWidget() const;
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
   public slots:
     virtual void save() { /*TODO*/ }
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index c334291e..0b9aa51e 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;
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 264e4b05..4069aaa7 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -142,7 +142,7 @@ void lockOrDie() {
     appName = "kmail";
 
   TQString programName;
-  const KAboutData *about = kapp->aboutData();
+  const TDEAboutData *about = kapp->aboutData();
   if ( about )
     programName = about->programName();
   if ( programName.isEmpty() )
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 54141bb5..22140e85 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -90,7 +90,7 @@ void Composer::slotClose()
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "testrecipienteditor",
+  TDEAboutData aboutData( "testrecipienteditor",
    "Test Recipient Editor", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );