Rename KInstance and KAboutData to avoid conflicts with KDE4

7 files changed, 13 insertions, 13 deletions

diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 672abd25..7f790f0b 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -40,8 +40,8 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char *argv[] )
 {
-  KAboutData aboutData( "kommander", I18N_NOOP("Kommander"),
-                        KOMMANDER_VERSION, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "kommander", I18N_NOOP("Kommander"),
+                        KOMMANDER_VERSION, description, TDEAboutData::License_GPL,
                         "(C) 2002-2005 Kommander authors", text);
   aboutData.addAuthor("Eric Laffoon", I18N_NOOP("Project manager"), "eric@tdewebdev.org");
   aboutData.addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org");
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index 89c4c5c0..b631fd2b 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -55,8 +55,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  KAboutData aboutData( "kmdr-executor", I18N_NOOP("Kommander Executor"),
-    KOMMANDER_VERSION, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "kmdr-executor", I18N_NOOP("Kommander Executor"),
+    KOMMANDER_VERSION, description, TDEAboutData::License_GPL,
     "(c) 2002, Marc Britton, (C) 2008 Andras Mantia", 0, 0, "http://kommander.tdewebdev.org");
   aboutData.addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org");
   aboutData.addAuthor("Michal Rudolf", I18N_NOOP("Previous maintainer"), "mrudolf@tdewebdev.org");
diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp
index d8a0e597..fe4d7199 100644
--- a/kommander/part/kommander_part.cpp
+++ b/kommander/part/kommander_part.cpp
@@ -49,10 +49,10 @@ KommanderPart::~KommanderPart()
   delete m_instance;
 }
 
-KAboutData* KommanderPart::createAboutData()
+TDEAboutData* KommanderPart::createAboutData()
 {
-  KAboutData * aboutData = new KAboutData("kommander_part", I18N_NOOP("Kommander Executor Part"),
-    KOMMANDER_VERSION, description, KAboutData::License_GPL,
+  TDEAboutData * aboutData = new TDEAboutData("kommander_part", I18N_NOOP("Kommander Executor Part"),
+    KOMMANDER_VERSION, description, TDEAboutData::License_GPL,
     "(c) 2008 Andras Mantia", I18N_NOOP("Part of the KDEWebDev module."),  "http://www.tdewebdev.org");
   
   aboutData->addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org");
diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h
index 02aafd30..017e4b35 100644
--- a/kommander/part/kommander_part.h
+++ b/kommander/part/kommander_part.h
@@ -31,7 +31,7 @@ public:
 
     virtual ~KommanderPart();
 
-    static KAboutData* createAboutData();
+    static TDEAboutData* createAboutData();
 
 protected:
     virtual bool openFile();
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index 6030a833..3b0cc6ef 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -56,8 +56,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
   KLocale::setMainCatalogue("kommander");
-  KAboutData aboutData( "kmdr-plugins", I18N_NOOP("Kommander Plugin Manager"),
-    KOMMANDER_VERSION, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "kmdr-plugins", I18N_NOOP("Kommander Plugin Manager"),
+    KOMMANDER_VERSION, description, TDEAboutData::License_GPL,
     "(C) 2004-2005 Kommander authors");
   aboutData.addAuthor("Marc Britton", "Original author", "consume@optusnet.com.au");
   aboutData.addAuthor("Eric Laffoon", "Project manager", "eric@tdewebdev.org");
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 097d0d22..4560f871 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -119,7 +119,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons
   m_appName = appName;
   m_icon = icon;
   m_copyright = copyright;
-  m_aboutData = new KAboutData(m_appName, m_appName, m_version);
+  m_aboutData = new TDEAboutData(m_appName, m_appName, m_version);
   m_aboutData->setCopyrightStatement(m_copyright);
   if (!m_icon.isEmpty())
     m_aboutData->setProgramLogo(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage());  
diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h
index f7721103..079ef849 100644
--- a/kommander/widgets/aboutdialog.h
+++ b/kommander/widgets/aboutdialog.h
@@ -16,7 +16,7 @@
 #include <kommanderwidget.h>
 
 class KAboutApplication;
-class KAboutData;
+class TDEAboutData;
 
 /**
 	@author Andras Mantia <amantia@tdewebdev.org>
@@ -55,7 +55,7 @@ private:
   void setBugAddress(const TQString &bugAddress);
   void setLicense(const TQString &license);
 
-  KAboutData *m_aboutData;
+  TDEAboutData *m_aboutData;
   TQString m_version;
   TQString m_appName;
   TQString m_copyright;