Rename KInstance and KAboutData to avoid conflicts with KDE4

5 files changed, 11 insertions, 11 deletions

diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index da2d1556..775b5220 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -730,12 +730,12 @@ void CervisiaPart::aboutCervisia()
 }
 
 
-KAboutData* CervisiaPart::createAboutData()
+TDEAboutData* CervisiaPart::createAboutData()
 {
-    KAboutData* about = new KAboutData(
+    TDEAboutData* about = new TDEAboutData(
                             "cervisiapart", I18N_NOOP("Cervisia Part"),
                             CERVISIA_VERSION, I18N_NOOP("A CVS frontend"),
-                            KAboutData::License_GPL,
+                            TDEAboutData::License_GPL,
                             I18N_NOOP("Copyright (c) 1999-2002 Bernd Gehrmann"), 0,
                             "http://www.kde.org/apps/cervisia");
 
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index f1a7ea5b..5ab4efe4 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -40,7 +40,7 @@ class TQSplitter;
 class TQTimer;
 class UpdateView;
 class ProtocolView;
-class KAboutData;
+class TDEAboutData;
 class KListView;
 class KRecentFilesAction;
 class CvsService_stub;
@@ -67,7 +67,7 @@ public:
 
     TQString sandBox() const { return sandbox; }
 
-    static KAboutData* createAboutData();
+    static TDEAboutData* createAboutData();
 
 public slots:
     // unused because we overwrite the default behaviour of openURL()
diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp
index ac6a6796..1215a812 100644
--- a/cervisia/cvsservice/cvsaskpass.cpp
+++ b/cervisia/cvsservice/cvsaskpass.cpp
@@ -37,9 +37,9 @@ static KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
 {
-    KAboutData about("cvsaskpass", I18N_NOOP("cvsaskpass"), "0.1",
+    TDEAboutData about("cvsaskpass", I18N_NOOP("cvsaskpass"), "0.1",
                      I18N_NOOP("ssh-askpass for the CVS DCOP Service"),
-                     KAboutData::License_LGPL,
+                     TDEAboutData::License_LGPL,
                      I18N_NOOP("Copyright (c) 2003 Christian Loose"));
 
     TDECmdLineArgs::init(argc, argv, &about);
diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp
index bcb666a2..7b4ab31e 100644
--- a/cervisia/cvsservice/main.cpp
+++ b/cervisia/cvsservice/main.cpp
@@ -27,8 +27,8 @@
 
 extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
 {
-    KAboutData about("cvsservice", I18N_NOOP("CVS DCOP service"), "0.1",
-            I18N_NOOP("DCOP service for CVS"), KAboutData::License_LGPL,
+    TDEAboutData about("cvsservice", I18N_NOOP("CVS DCOP service"), "0.1",
+            I18N_NOOP("DCOP service for CVS"), TDEAboutData::License_LGPL,
             "Copyright (c) 2002-2003 Christian Loose");
     about.addAuthor("Christian Loose", I18N_NOOP("Developer"),
             "christian.loose@hamburg.de");
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 1290995b..9d9c89a9 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -146,8 +146,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
         { "annotate <file>", I18N_NOOP("Show annotation dialog for the given file"), 0 },
         KCmdLineLastOption
     };
-    KAboutData about("cervisia", I18N_NOOP("Cervisia"), CERVISIA_VERSION,
-                     I18N_NOOP("A CVS frontend"), KAboutData::License_GPL,
+    TDEAboutData about("cervisia", I18N_NOOP("Cervisia"), CERVISIA_VERSION,
+                     I18N_NOOP("A CVS frontend"), TDEAboutData::License_GPL,
                      I18N_NOOP("Copyright (c) 1999-2002 Bernd Gehrmann\n"
                                "Copyright (c) 2002-2007 the Cervisia authors"), 0,
                      "http://www.kde.org/apps/cervisia");