Rename KInstance and KAboutData to avoid conflicts with KDE4

21 files changed, 53 insertions, 53 deletions

diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index bdfe7727..c83a5091 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -915,11 +915,11 @@ int artsbuilder_main(int argc, char **argv)
 int main(int argc, char **argv)
 #endif
 {
-	KAboutData aboutData("artsbuilder",
+	TDEAboutData aboutData("artsbuilder",
 						 I18N_NOOP("artsbuilder"),
 						 ARTS_VERSION,
 						 I18N_NOOP("aRts synthesizer designer"),
-						 KAboutData::License_GPL,
+						 TDEAboutData::License_GPL,
 						 "(C) 1998-2001, Stefan Westerfeld",
 						 I18N_NOOP("The analog real-time synthesizer graphical design tool."),
 						 "http://www.arts-project.org/",
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index e792edd8..9e569567 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -26,8 +26,8 @@ kdDebug() << k_funcinfo << endl;
 
 int main( int argc, char* argv[] ) {
 
-	KAboutData aboutData(  "dbtest", I18N_NOOP( "dBTest" ),
-		"0.1", "", KAboutData::License_GPL,
+	TDEAboutData aboutData(  "dbtest", I18N_NOOP( "dBTest" ),
+		"0.1", "", TDEAboutData::License_GPL,
 		"(c) 2002, Arnold Krille" );
 	aboutData.addAuthor( "Arnold Krille", I18N_NOOP(  "Creator" ), "arnold@arnoldarts.de");
 	TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index e4a7e16a..e086749a 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -74,9 +74,9 @@ kdDebug()<<k_funcinfo<<endl;
 #include <kaboutapplication.h>
 
 void ArtsControlApplet::about() {
-	KAboutData about( "artscontrolapplet", I18N_NOOP( "aRts Control Applet" ), "0.5",
+	TDEAboutData about( "artscontrolapplet", I18N_NOOP( "aRts Control Applet" ), "0.5",
 		I18N_NOOP( "A kickerapplet to control aRts." ),
-		KAboutData::License_GPL, I18N_NOOP( "(c) 2003 by Arnold Krille" ) );
+		TDEAboutData::License_GPL, I18N_NOOP( "(c) 2003 by Arnold Krille" ) );
 	about.addAuthor( "Arnold Krille", I18N_NOOP( "Author of the Applet" ), "arnold@arnoldarts.de" );
 	about.addCredit( "Stefan Westerfeld", I18N_NOOP( "Thanks for creating aRts!" ) );
 	KAboutApplication a( &about, this );
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 4d0fc782..0037be6e 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -189,9 +189,9 @@ kdDebug() << k_funcinfo << endl;
 }
 
 int main(int argc, char **argv) {
-	KAboutData aboutData( "artscontrol", I18N_NOOP("aRts control"),
+	TDEAboutData aboutData( "artscontrol", I18N_NOOP("aRts control"),
 		ARTS_VERSION, I18N_NOOP("Control tool for the aRts server"),
-			KAboutData::License_GPL, I18N_NOOP("(c) 2000 Stefan Westerfeld\n(c) 2003 Arnold Krille") );
+			TDEAboutData::License_GPL, I18N_NOOP("(c) 2000 Stefan Westerfeld\n(c) 2003 Arnold Krille") );
 	aboutData.addAuthor( "Stefan Westerfeld", I18N_NOOP( "Author and aRts maintainer" ), "stefan@space.twc.de" );
 	aboutData.addAuthor( "Arnold Krille", I18N_NOOP( "Some improvements" ), "arnold@arnoldarts.de" );
 
diff --git a/juk/main.cpp b/juk/main.cpp
index 3aaa5556..99f3ca61 100644
--- a/juk/main.cpp
+++ b/juk/main.cpp
@@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("juk", I18N_NOOP("JuK"),
-                         "2.3.5", description, KAboutData::License_GPL,
+    TDEAboutData aboutData("juk", I18N_NOOP("JuK"),
+                         "2.3.5", description, TDEAboutData::License_GPL,
                          "© 2002 - 2007, Scott Wheeler", 0,
                          "http://developer.kde.org/~wheeler/juk.html");
 
diff --git a/juk/tagguessertest.cpp b/juk/tagguessertest.cpp
index 7b92ee49..0a7c09bb 100644
--- a/juk/tagguessertest.cpp
+++ b/juk/tagguessertest.cpp
@@ -64,7 +64,7 @@ void check( const TQString &filename, const TQString &title,
 
 int main( int argc, char **argv )
 {
-    KAboutData aboutData("tagguessertest", "tagguessertest", "0.1");
+    TDEAboutData aboutData("tagguessertest", "tagguessertest", "0.1");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDEApplication app;
     check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats [Live].mp3",
diff --git a/kaboodle/kaboodle_factory.cpp b/kaboodle/kaboodle_factory.cpp
index 537bdf5c..818145d6 100644
--- a/kaboodle/kaboodle_factory.cpp
+++ b/kaboodle/kaboodle_factory.cpp
@@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 K_EXPORT_COMPONENT_FACTORY( libkaboodlepart, Kaboodle::KaboodleFactory)
 
-KInstance *Kaboodle::KaboodleFactory::s_instance = 0;
-KAboutData *Kaboodle::KaboodleFactory::s_aboutData = 0;
+TDEInstance *Kaboodle::KaboodleFactory::s_instance = 0;
+TDEAboutData *Kaboodle::KaboodleFactory::s_aboutData = 0;
 
 Kaboodle::KaboodleFactory::KaboodleFactory() : KParts::Factory()
 {
@@ -54,21 +54,21 @@ KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent
 	}
 }
 
-KInstance *Kaboodle::KaboodleFactory::instance()
+TDEInstance *Kaboodle::KaboodleFactory::instance()
 {
 	if(!s_instance)
-		s_instance = new KInstance(aboutData());
+		s_instance = new TDEInstance(aboutData());
 
 	return s_instance;
 }
 
-const KAboutData *Kaboodle::KaboodleFactory::aboutData()
+const TDEAboutData *Kaboodle::KaboodleFactory::aboutData()
 {
 	if(!s_aboutData)
 	{
-		s_aboutData = new KAboutData("kaboodle", I18N_NOOP("Kaboodle"), "1.7",
+		s_aboutData = new TDEAboutData("kaboodle", I18N_NOOP("Kaboodle"), "1.7",
 		                             I18N_NOOP("The Lean TDE Media Player"),
-		                             KAboutData::License_BSD,
+		                             TDEAboutData::License_BSD,
 		                             "(c) 2001-2003 Kaboodle developers", 0,
 		                             "http://www.freekde.org/neil/kaboodle/");
 		s_aboutData->addCredit("Carsten Pfeiffer", I18N_NOOP("Maintainer"), "pfeiffer@kde.org");
diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h
index 5ee0a1dc..7a85afb8 100644
--- a/kaboodle/kaboodle_factory.h
+++ b/kaboodle/kaboodle_factory.h
@@ -43,12 +43,12 @@ public:
 
 	virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
 
-	static const KAboutData *aboutData();
-	static KInstance *instance();
+	static const TDEAboutData *aboutData();
+	static TDEInstance *instance();
 	
 private:
-	static KInstance *s_instance;
-	static KAboutData *s_aboutData;
+	static TDEInstance *s_instance;
+	static TDEAboutData *s_aboutData;
 };
 
 }
diff --git a/kaudiocreator/main.cpp b/kaudiocreator/main.cpp
index 16fb3631..8bd6c94b 100644
--- a/kaudiocreator/main.cpp
+++ b/kaudiocreator/main.cpp
@@ -31,8 +31,8 @@ static const KCmdLineOptions options[] = {
 
 
 int main(int argc, char *argv[]){
-  KAboutData aboutData("kaudiocreator", I18N_NOOP("KAudioCreator"), "1.13",
-    I18N_NOOP("CD ripper and audio encoder frontend"), KAboutData::License_LGPL, "(c) 2003-2005, Benjamin Meyer",
+  TDEAboutData aboutData("kaudiocreator", I18N_NOOP("KAudioCreator"), "1.13",
+    I18N_NOOP("CD ripper and audio encoder frontend"), TDEAboutData::License_LGPL, "(c) 2003-2005, Benjamin Meyer",
     0, "http://www.icefox.net/");
     aboutData.addAuthor("Benjamin Meyer", I18N_NOOP("Original author"), "ben+kaudiocreator@meyerhome.net", "http://www.icefox.net/");
 
diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index 9df0f635..fbe758ba 100644
--- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -82,9 +82,9 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
     connect( kcfg_replaceOutput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
     connect( example, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
 
-    KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmaudiocd"), I18N_NOOP("TDE Audio CD IO Slave"),
-                   0, 0, KAboutData::License_GPL,
+    TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcmaudiocd"), I18N_NOOP("TDE Audio CD IO Slave"),
+                   0, 0, TDEAboutData::License_GPL,
                    I18N_NOOP("(c) 2000 - 2005 Audio CD developers"));
 
     about->addAuthor("Benjamin C. Meyer", I18N_NOOP("Current Maintainer"), "ben@meyerhome.net");
diff --git a/kmid/history.txt b/kmid/history.txt
index 34593448..568c4957 100644
--- a/kmid/history.txt
+++ b/kmid/history.txt
@@ -552,7 +552,7 @@ Sunday 5-3-2000
 Sunday 2-4-2000
 - Now Libkmid links with tdecore and qt in order to use a KConfig object to
 read the default settings as saved by the user with the midi kcontrol module.
-- It creates a "dummy" KInstance in case of the application being a non-KDE
+- It creates a "dummy" TDEInstance in case of the application being a non-KDE
 application.
 - Fixed compilation of KMid, as 1) someone renamed klinedit.h to klineedit.h
 and 2) now we have to include qiconset.h when creating an action with pictures
diff --git a/kmid/kmid_part.cpp b/kmid/kmid_part.cpp
index 5eafbe62..11e2d405 100644
--- a/kmid/kmid_part.cpp
+++ b/kmid/kmid_part.cpp
@@ -19,7 +19,7 @@ K_EXPORT_COMPONENT_FACTORY( libkmidpart, KMidFactory )
  * We need one static instance of the factory for our C 'main'
  * function
  */
-KInstance *KMidFactory::s_instance = 0L;
+TDEInstance *KMidFactory::s_instance = 0L;
 
 KMidFactory::KMidFactory()
 {
@@ -45,10 +45,10 @@ KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *
   return obj;
 }
 
-KAboutData *KMidFactory::aboutData()
+TDEAboutData *KMidFactory::aboutData()
 {
-    KAboutData *aboutdata = new KAboutData("kmid", "KMid", "2.0",
-        I18N_NOOP("MIDI/Karaoke file player"), KAboutData::License_GPL,
+    TDEAboutData *aboutdata = new TDEAboutData("kmid", "KMid", "2.0",
+        I18N_NOOP("MIDI/Karaoke file player"), TDEAboutData::License_GPL,
         I18N_NOOP("(c) 1997,98,99,2000, Antonio Larrosa Jimenez"),"",
         "http://perso.wanadoo.es/antlarr/kmid.html");
     aboutdata->addAuthor("Antonio Larrosa Jimenez",
@@ -57,10 +57,10 @@ KAboutData *KMidFactory::aboutData()
     return aboutdata;
 }
 
-KInstance *KMidFactory::instance()
+TDEInstance *KMidFactory::instance()
 {
   if ( !s_instance )
-    s_instance = new KInstance( aboutData() );
+    s_instance = new TDEInstance( aboutData() );
 
   return s_instance;
 }
diff --git a/kmid/kmid_part.h b/kmid/kmid_part.h
index c6dc170a..7e26ae14 100644
--- a/kmid/kmid_part.h
+++ b/kmid/kmid_part.h
@@ -4,8 +4,8 @@
 #include <kparts/browserextension.h>
 #include <kparts/factory.h>
 #include <tdelibs_export.h>
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class KMidBrowserExtension;
 class kmidClient;
 
@@ -22,11 +22,11 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
                 const char* classname = TQOBJECT_OBJECT_NAME_STRING,
                 const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
-    static KAboutData *aboutData();
+    static TDEAboutData *aboutData();
   private:
-    static KInstance *s_instance;
+    static TDEInstance *s_instance;
 };
 
 class KMidPart: public KParts::ReadOnlyPart
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index d20afddc..be672b2c 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -155,7 +155,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
    : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, parent, name ),
      m_mixerWidget(0), m_errorLabel(0), m_pref(0),
      m_aboutData( "kmix", I18N_NOOP("KMix Panel Applet"),
-                         APP_VERSION, "Mini Sound Mixer Applet", KAboutData::License_GPL,
+                         APP_VERSION, "Mini Sound Mixer Applet", TDEAboutData::License_GPL,
                          I18N_NOOP( "(c) 1996-2000 Christian Esken\n(c) 2000-2003 Christian Esken, Stefan Schimanski") )
 {
     setBackgroundOrigin(AncestorOrigin);
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index 376b3290..5874a484 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -126,7 +126,7 @@ private:
    TQString _mixerId;
    TQString _mixerName;
 
-   KAboutData m_aboutData;
+   TDEAboutData m_aboutData;
 };
 
 
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index b602b5b3..60c27c48 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
    KLocale::setMainCatalogue("kmix");
-   KAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"),
-			 APP_VERSION, description, KAboutData::License_GPL,
+   TDEAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"),
+			 APP_VERSION, description, TDEAboutData::License_GPL,
 			 "(c) 2000 by Stefan Schimanski");
 
    aboutData.addAuthor("Stefan Schimanski", 0, "1Stein@gmx.de");
diff --git a/kmix/main.cpp b/kmix/main.cpp
index b1a3cab6..e81fa21b 100644
--- a/kmix/main.cpp
+++ b/kmix/main.cpp
@@ -39,8 +39,8 @@ static KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-   KAboutData aboutData( "kmix", I18N_NOOP("KMix"),
-                         APP_VERSION, description, KAboutData::License_GPL,
+   TDEAboutData aboutData( "kmix", I18N_NOOP("KMix"),
+                         APP_VERSION, description, TDEAboutData::License_GPL,
                          I18N_NOOP("(c) 1996-2000 Christian Esken\n(c) 2000-2003 Christian Esken, Stefan Schimanski\n(c) 2002-2005 Christian Esken, Helio Chissini de Castro"));
 
    aboutData.addAuthor("Christian Esken", "Current maintainer", "esken@kde.org");
diff --git a/krec/main.cpp b/krec/main.cpp
index 1a841fe2..f59b22ab 100644
--- a/krec/main.cpp
+++ b/krec/main.cpp
@@ -44,8 +44,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
 {
 	//cout<<endl<<"Starting kRec..."<<endl;
 
-	KAboutData aboutData( "krec", I18N_NOOP("KRec"),
-		"0.5.1", description, KAboutData::License_GPL,
+	TDEAboutData aboutData( "krec", I18N_NOOP("KRec"),
+		"0.5.1", description, TDEAboutData::License_GPL,
 		"(c) 2002, 2003 Arnold Krille" );
 	aboutData.addAuthor("Arnold Krille", I18N_NOOP( "Creator \nLook at the website www.arnoldarts.de \nfor other good stuff." ), "arnold@arnoldarts.de");
 	aboutData.addCredit( "Matthias Kretz", I18N_NOOP( "Helped where he was asked" ), "kretz@kde.org" );
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 6c26e1d3..cc9bc389 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -1605,9 +1605,9 @@ static const KCmdLineOptions options[] =
  */
 int main( int argc, char *argv[] )
 {
-    KAboutData aboutData("kscd", I18N_NOOP("KsCD"),
+    TDEAboutData aboutData("kscd", I18N_NOOP("KsCD"),
                             KSCDVERSION, description,
-                            KAboutData::License_GPL,
+                            TDEAboutData::License_GPL,
                             "(c) 2001, Dirk Försterling\n(c) 2003, Aaron J. Seigo");
     aboutData.addAuthor("Aaron J. Seigo", I18N_NOOP("Current maintainer"), "aseigo@kde.org");
     aboutData.addAuthor("Alexander Kern",I18N_NOOP("Workman library update, CDTEXT, CDDA"), "kernalex@kde.org");
diff --git a/kscd/kscdmagic/main.cpp b/kscd/kscdmagic/main.cpp
index 1c9a7eae..77a2e77c 100644
--- a/kscd/kscdmagic/main.cpp
+++ b/kscd/kscdmagic/main.cpp
@@ -188,9 +188,9 @@ main(int argc, char **argv)
   opterr = 0;
 
   /*
-  KAboutData aboutData( "kscdmagic", I18N_NOOP("kscdmagic"),
+  TDEAboutData aboutData( "kscdmagic", I18N_NOOP("kscdmagic"),
 			KSCDMAGICVERSION, I18N_NOOP("sound visualisation"), 
-			KAboutData::License_GPL,
+			TDEAboutData::License_GPL,
 			"(c) 2000, Dirk Försterling");
   aboutData.addAuthor("Paul Harrison",0, "pfh@yoyo.cc.monash.edu.au");
   aboutData.addAuthor("Dirk Försterling",0, "milliByte@gmx.net");
diff --git a/noatun/app/main.cpp b/noatun/app/main.cpp
index 3aae6274..f78dc506 100644
--- a/noatun/app/main.cpp
+++ b/noatun/app/main.cpp
@@ -16,8 +16,8 @@ static KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
-	KAboutData aboutData("noatun", I18N_NOOP("Noatun"),
-	                     version, description, KAboutData::License_BSD,
+	TDEAboutData aboutData("noatun", I18N_NOOP("Noatun"),
+	                     version, description, TDEAboutData::License_BSD,
 	                     I18N_NOOP("(c) 2000-2004, The Noatun Developers"),
 	                     0, "http://noatun.kde.org");
 	aboutData.addAuthor("Charles Samuels", I18N_NOOP("Noatun Developer"),