Rename KInstance and KAboutData to avoid conflicts with KDE4

22 files changed, 44 insertions, 44 deletions

diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp
index 15ea6ef8..d52f0061 100644
--- a/kfilereplace/kfilereplacepart.cpp
+++ b/kfilereplace/kfilereplacepart.cpp
@@ -507,13 +507,13 @@ void KFileReplacePart::resetActions()
 }
 
 //PUBLIC METHODS
-KAboutData* KFileReplacePart::createAboutData()
+TDEAboutData* KFileReplacePart::createAboutData()
 {
-  KAboutData * aboutData = new KAboutData("kfilereplacepart",
+  TDEAboutData * aboutData = new TDEAboutData("kfilereplacepart",
                                           I18N_NOOP("KFileReplacePart"),
                                           KFR_VERSION,
                                           I18N_NOOP( "Batch search and replace tool."),
-                                          KAboutData::License_GPL_V2,
+                                          TDEAboutData::License_GPL_V2,
                                           "(C) 1999-2002 Fran�is Dupoux\n(C) 2003-2004 Andras Mantia\n(C) 2004 Emiliano Gulmini", I18N_NOOP("Part of the KDEWebDev module."), "http://www.tdewebdev.org");
   aboutData->addAuthor("Fran�is Dupoux",
                        I18N_NOOP("Original author of the KFileReplace tool"),
diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h
index 0b3b61ae..b2206b59 100644
--- a/kfilereplace/kfilereplacepart.h
+++ b/kfilereplace/kfilereplacepart.h
@@ -20,7 +20,7 @@
 // KDE
 #include <kparts/part.h>
 class KAboutApplication;
-class KAboutData;
+class TDEAboutData;
 class KConfig;
 
 // local
@@ -86,7 +86,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart
 
   //METHODS
   public:
-    static KAboutData* createAboutData();
+    static TDEAboutData* createAboutData();
     KConfig *config(){ return m_config; }
 
   protected:
diff --git a/kfilereplace/main.cpp b/kfilereplace/main.cpp
index 2f4ff1a3..b3adfffe 100644
--- a/kfilereplace/main.cpp
+++ b/kfilereplace/main.cpp
@@ -34,8 +34,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    KAboutData about("kfilereplace", I18N_NOOP("KFileReplace"), version, description,
-                     KAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."),
+    TDEAboutData about("kfilereplace", I18N_NOOP("KFileReplace"), version, description,
+                     TDEAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."),
                      "http://www.tdewebdev.org");
 
     about.addAuthor("Andras Mantia", I18N_NOOP("Shell author, KPart creator, co-maintainer"), "amantia@kde.org");
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 4ca05bc4..7aa45ddb 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -252,12 +252,12 @@ void KImageMapEditor::init()
   setImageActionsEnabled(false);
 }
 
-KAboutData* KImageMapEditor::createAboutData()
+TDEAboutData* KImageMapEditor::createAboutData()
 {
-    KAboutData* aboutData =
-              new KAboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"),
+    TDEAboutData* aboutData =
+              new TDEAboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"),
               "1.0", I18N_NOOP( "An HTML imagemap editor" ),
-              KAboutData::License_GPL,
+              TDEAboutData::License_GPL,
               "(c) 2001-2003 Jan Sch&auml;fer <janschaefer@users.sourceforge.net>");
     return aboutData;
 }
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index d5462645..9497ee84 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -138,7 +138,7 @@ public :
                     TQObject *parent, const char *name, const TQStringList & args = TQStringList());
     virtual ~KImageMapEditor();
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
     static KConfig *config();
 
     /**
diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp
index c27be373..36ab97f6 100644
--- a/kimagemapeditor/main.cpp
+++ b/kimagemapeditor/main.cpp
@@ -40,8 +40,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
 
-  KAboutData aboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"),
-    VERSION, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"),
+    VERSION, description, TDEAboutData::License_GPL,
     "(C) 2001-2008 Jan Schaefer", 0, "http://www.nongnu.org/kimagemap/", "janschaefer@users.sourceforge.net");
   aboutData.addAuthor("Jan Schaefer",0, "janschaefer@users.sourceforge.net");
   aboutData.addCredit("Joerg Jaspert",I18N_NOOP("For helping me with the Makefiles, and creating the Debian package"));
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index f354bbdb..bc890f8c 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -177,15 +177,15 @@ void KLinkStatusPart::slotAbout()
 
 void KLinkStatusPart::slotReportBug()
 {
-    KAboutData aboutData("klinkstatus", I18N_NOOP("KLinkStatus"), version_);
+    TDEAboutData aboutData("klinkstatus", I18N_NOOP("KLinkStatus"), version_);
     KBugReport bugReportDlg(0, true, &aboutData);
     bugReportDlg.exec();
 }
 
-KAboutData* KLinkStatusPart::createAboutData()
+TDEAboutData* KLinkStatusPart::createAboutData()
 {
-    KAboutData * about = new KAboutData("klinkstatuspart", I18N_NOOP("KLinkStatus Part"), version_,
-                                        description_, KAboutData::License_GPL_V2,
+    TDEAboutData * about = new TDEAboutData("klinkstatuspart", I18N_NOOP("KLinkStatus Part"), version_,
+                                        description_, TDEAboutData::License_GPL_V2,
                                         "(C) 2004 Paulo Moura Guedes", 0, 0, "moura@tdewebdev.org");
 
     about->addAuthor("Paulo Moura Guedes", 0, "moura@tdewebdev.org");
diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h
index 79cc5b3f..c27a948e 100644
--- a/klinkstatus/src/klinkstatus_part.h
+++ b/klinkstatus/src/klinkstatus_part.h
@@ -30,7 +30,7 @@ class TQWidget;
 class TQPainter;
 
 class KURL;
-class KAboutData;
+class TDEAboutData;
 class KAboutApplication;
 class KAction;
 
@@ -47,7 +47,7 @@ public:
     /** Reimplemented to disable and enable Save action */
     virtual void setModified(bool modified);
 
-    static KAboutData* createAboutData();
+    static TDEAboutData* createAboutData();
 
 protected:
     /** This must be implemented by each part */
diff --git a/klinkstatus/src/main.cpp b/klinkstatus/src/main.cpp
index b46d02ea..55983fe3 100644
--- a/klinkstatus/src/main.cpp
+++ b/klinkstatus/src/main.cpp
@@ -45,8 +45,8 @@ int main(int argc, char *argv[])
 {
     //____________________________________________________
     
-    KAboutData about("klinkstatus", I18N_NOOP("KLinkStatus"), version, description,
-                     KAboutData::License_GPL_V2, "(C) 2004 Paulo Moura Guedes", 0,
+    TDEAboutData about("klinkstatus", I18N_NOOP("KLinkStatus"), version, description,
+                     TDEAboutData::License_GPL_V2, "(C) 2004 Paulo Moura Guedes", 0,
                      "http://klinkstatus.tdewebdev.org");
 
     about.addAuthor("Paulo Moura Guedes", 0, "moura@tdewebdev.org");
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;
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 23e17790..a1cc5739 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -269,12 +269,12 @@ void KXsldbgPart::quit()
 }
 
 
-KAboutData *KXsldbgPart::createAboutData()
+TDEAboutData *KXsldbgPart::createAboutData()
 {
     // the non-i18n name here must be the same as the directory in
     // which the part's rc file is installed ('partrcdir' in the
     // Makefile)
-    KAboutData *aboutData = new KAboutData("kxsldbgpart", I18N_NOOP("KXsldbgPart"), "0.1");
+    TDEAboutData *aboutData = new TDEAboutData("kxsldbgpart", I18N_NOOP("KXsldbgPart"), "0.1");
     aboutData->addAuthor("Keith Isdale", 0L, "k_isdale@tpg.com.au");
     return aboutData;
 }
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h
index ff420244..e8de28a7 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.h
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h
@@ -33,7 +33,7 @@ class TQWidget;
 class TQPainter;
 class KURL;
 class TQMultiLineEdit;
-class KAboutData;
+class TDEAboutData;
 
 typedef TQDict<QXsldbgDoc> XsldbgDocDict;
 
@@ -62,7 +62,7 @@ public:
      */
     virtual ~KXsldbgPart();
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
 
    /** Checks the debugger, if it is not ready then
diff --git a/kxsldbg/main.cpp b/kxsldbg/main.cpp
index 34f936c6..29b286c7 100644
--- a/kxsldbg/main.cpp
+++ b/kxsldbg/main.cpp
@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("kxsldbg", I18N_NOOP("KXSLDbg"), version, description, KAboutData::License_GPL, "(C) 2003 Keith Isdale", 0, 0, "k_isdale@tpg.com.au");
+    TDEAboutData about("kxsldbg", I18N_NOOP("KXSLDbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", 0, 0, "k_isdale@tpg.com.au");
     about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index cab2c838..5c1177b0 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
     TQString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").arg(exsltLibexsltVersion).arg(exsltLibxmlVersion));
     TQString freeFormText = xsldbgRunTimeInfo + libxmlCompileTimeInfo + libxsltCompileTimeInfo + libexsltCompileTimeInfo;
 
-    KAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, KAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText, 0, "k_isdale@tpg.com.au");
+    TDEAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText, 0, "k_isdale@tpg.com.au");
     about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 52d4b07c..968ad81d 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -66,9 +66,9 @@ int main(int argc, char *argv[])
   char *copyright = new char[200]; //this should be enough
   strcpy(copyright, "(C) 2000-2006 - ");
   strcat(copyright, developers);
-  KAboutData
+  TDEAboutData
     aboutData( QUANTA_PACKAGE, I18N_NOOP("Quanta"),
-    QUANTA_VERSION, description, KAboutData::License_GPL_V2,    
+    QUANTA_VERSION, description, TDEAboutData::License_GPL_V2,    
     copyright,
     othertext,
     "http://tdewebdev.org"
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 81c04aff..82c81283 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -4084,7 +4084,7 @@ TQString QuantaApp::saveCurrentFile()
 
 void QuantaApp::slotReportBug()
 {
-  KAboutData aboutData( "quanta", I18N_NOOP("Quanta"), QUANTA_VERSION);
+  TDEAboutData aboutData( "quanta", I18N_NOOP("Quanta"), QUANTA_VERSION);
   KBugReport bugReportDlg(this, true, &aboutData);
   bugReportDlg.exec();
 }