Rename KInstance and KAboutData to avoid conflicts with KDE4

29 files changed, 59 insertions, 59 deletions

diff --git a/blinken/src/main.cpp b/blinken/src/main.cpp
index 42104631..ff84f46c 100644
--- a/blinken/src/main.cpp
+++ b/blinken/src/main.cpp
@@ -18,7 +18,7 @@
 
 int main(int argc, char *argv[])
 {
-	KAboutData about("blinken", I18N_NOOP("blinKen"), "0.1.1", I18N_NOOP("A memory enhancement game"), KAboutData::License_GPL, "© 2005 Albert Astals Cid\n© 2005 Danny Allen");
+	TDEAboutData about("blinken", I18N_NOOP("blinKen"), "0.1.1", I18N_NOOP("A memory enhancement game"), TDEAboutData::License_GPL, "© 2005 Albert Astals Cid\n© 2005 Danny Allen");
 	about.addAuthor("Albert Astals Cid", I18N_NOOP("Coding"), "tsdgeos@terra.es");
 	about.addAuthor("Danny Allen", I18N_NOOP("Design, Graphics and Sounds"), "danny@dannyallen.co.uk");
 	about.addCredit("Steve Jordi", I18N_NOOP("GPL'ed his 'Steve' font so that we could use it"), "steve@sjordi.com");
diff --git a/kalzium/src/main.cpp b/kalzium/src/main.cpp
index 96056429..23299c46 100644
--- a/kalzium/src/main.cpp
+++ b/kalzium/src/main.cpp
@@ -49,8 +49,8 @@ int main(int argc, char **argv)
     caml_startup(argv);
 #endif
 
-    KAboutData about("kalzium", I18N_NOOP("Kalzium"), version, description,
-                     KAboutData::License_GPL, "(C) 2002-2005 Carsten Niehaus", 0, "http://edu.kde.org/kalzium");
+    TDEAboutData about("kalzium", I18N_NOOP("Kalzium"), version, description,
+                     TDEAboutData::License_GPL, "(C) 2002-2005 Carsten Niehaus", 0, "http://edu.kde.org/kalzium");
     about.addAuthor( "Carsten Niehaus", 0, "cniehaus@kde.org" );
     about.addCredit( "Pino Toscano", I18N_NOOP("Code contributions" ));
     about.addCredit( "Martin Pfeiffer", I18N_NOOP("Tooltip, some other small things" ));
diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp
index c2ba7220..07fdd0ff 100644
--- a/kanagram/src/main.cpp
+++ b/kanagram/src/main.cpp
@@ -29,7 +29,7 @@
 
 int main(int argc, char *argv[])
 {
-	KAboutData about("kanagram", I18N_NOOP("Kanagram"), "0.1", I18N_NOOP("An anagram game"), KAboutData::License_GPL, "© 2005 Joshua Keel\n© 2005 Danny Allen");
+	TDEAboutData about("kanagram", I18N_NOOP("Kanagram"), "0.1", I18N_NOOP("An anagram game"), TDEAboutData::License_GPL, "© 2005 Joshua Keel\n© 2005 Danny Allen");
 	about.addAuthor("Joshua Keel", I18N_NOOP("Coding"), "joshuakeel@gmail.com");
 	about.addAuthor("Danny Allen", I18N_NOOP("Design, Graphics and many Vocabularies"), "danny@dannyallen.co.uk");
 	about.addCredit("Artemiy Pavlov", I18N_NOOP("Sound effects"), 0, "http://artemiolabs.com");
diff --git a/kbruch/src/kbruch.cpp b/kbruch/src/kbruch.cpp
index 85d083d0..dd942676 100644
--- a/kbruch/src/kbruch.cpp
+++ b/kbruch/src/kbruch.cpp
@@ -36,11 +36,11 @@ int main(int argc, char * argv[])
 
 	/* fill the about data; the common KDE about dialog will show it to the
 	 * user */
-	KAboutData aboutData( "kbruch",
+	TDEAboutData aboutData( "kbruch",
 		description,
 		KBRUCH_VERSION,
 		I18N_NOOP("Learn calculating with fractions"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
     	"(c) 2002-2005, Sebastian Stein", 0, "http://edu.kde.org/kbruch/",
 		"seb.kde@hpfsc.de");
 	aboutData.addAuthor("Sebastian Stein",0, "seb.kde@hpfsc.de");
diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp
index bc9e5485..1d3631cc 100644
--- a/keduca/keduca/keduca_part.cpp
+++ b/keduca/keduca/keduca_part.cpp
@@ -54,11 +54,11 @@ KEducaPart::~KEducaPart()
 {
 }
 
-KAboutData* KEducaPart::createAboutData()
+TDEAboutData* KEducaPart::createAboutData()
 {
-	KAboutData *data = new KAboutData( "keduca", I18N_NOOP( "KEducaPart" ),
+	TDEAboutData *data = new TDEAboutData( "keduca", I18N_NOOP( "KEducaPart" ),
 	                                   "0.2", I18N_NOOP( "KEduca KParts Component" ),
-	                                   KAboutData::License_GPL,
+	                                   TDEAboutData::License_GPL,
 	                                   "(c) 2004, Henrique Pinto <henrique.pinto@kdemail.net>"
 	                                 );
 	return data;
diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h
index ea56c38e..b11a7f1c 100644
--- a/keduca/keduca/keduca_part.h
+++ b/keduca/keduca/keduca_part.h
@@ -27,7 +27,7 @@
 #include <kparts/part.h>
 
 class KEducaView;
-class KAboutData;
+class TDEAboutData;
 
 /**
  * KPart component for KEduca
@@ -52,7 +52,7 @@ class KEducaPart : public KParts::ReadOnlyPart
 		/*
 		 * Returns information about this part.
 		 */
-		static KAboutData* createAboutData();
+		static TDEAboutData* createAboutData();
 
 	protected:
 		/*
diff --git a/keduca/keduca/main.cpp b/keduca/keduca/main.cpp
index 63ec70b9..717529d0 100644
--- a/keduca/keduca/main.cpp
+++ b/keduca/keduca/main.cpp
@@ -33,8 +33,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
-                          version, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
+                          version, description, TDEAboutData::License_GPL,
                           "(c) 2001, Javier Campos", 0, "http://keduca.sourceforge.net", "submit@bugs.kde.org");
     aboutData.addAuthor("Javier Campos",I18N_NOOP( "Original Author" ), "javi@asyris.org");
     aboutData.addAuthor("Klas Kalass",I18N_NOOP( "Maintainer 2002-2004" ), "klas@kde.org");
diff --git a/keduca/keducabuilder/main.cpp b/keduca/keducabuilder/main.cpp
index eef58a77..21f459f1 100644
--- a/keduca/keducabuilder/main.cpp
+++ b/keduca/keducabuilder/main.cpp
@@ -34,8 +34,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
-                          version, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
+                          version, description, TDEAboutData::License_GPL,
                           "(c) 2001, Javier Campos", 0, "http://keduca.sourceforge.net", "submit@bugs.kde.org");
     aboutData.addAuthor("Javier Campos",I18N_NOOP("Original Author"), "javi@asyris.org");
     aboutData.addAuthor("Klas Kalass",I18N_NOOP("Maintainer 2002-2004"), "klas@kde.org");
diff --git a/kgeography/src/main.cpp b/kgeography/src/main.cpp
index 5a6d867b..48b21c3b 100644
--- a/kgeography/src/main.cpp
+++ b/kgeography/src/main.cpp
@@ -16,7 +16,7 @@
 
 int main(int argc, char *argv[])
 {
-	KAboutData about("kgeography", I18N_NOOP("KGeography"), "0.4.4", I18N_NOOP("A geography learning program"), KAboutData::License_GPL, "© 2004-2005 Albert Astals Cid", 0, "http://kgeography.berlios.de");
+	TDEAboutData about("kgeography", I18N_NOOP("KGeography"), "0.4.4", I18N_NOOP("A geography learning program"), TDEAboutData::License_GPL, "© 2004-2005 Albert Astals Cid", 0, "http://kgeography.berlios.de");
 	about.addAuthor("Albert Astals Cid", I18N_NOOP("Programmer and designer"), "tsdgeos@terra.es");
 	about.addCredit("Danny Allen", I18N_NOOP("Small refinements"), "danny@dannyallen.co.uk");
 	about.addCredit("Giuseppe Caruso", I18N_NOOP("Italy flags and Italy by provinces map"), "caruso@pietrobo.com");
diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp
index 5da07791..dcfae7f2 100644
--- a/khangman/khangman/main.cpp
+++ b/khangman/khangman/main.cpp
@@ -41,8 +41,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
-                              KHM_VERSION, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
+                              KHM_VERSION, description, TDEAboutData::License_GPL,
                               "(c) 2001-2006, Anne-Marie Mahfouf", 0,
 "http://edu.kde.org/khangman");
     aboutData.addAuthor("Primoz Anzur", I18N_NOOP("Previous maintainer"), "zerokode@gmx.net");
diff --git a/kig/ChangeLog b/kig/ChangeLog
index ec8d6042..86c22fcf 100644
--- a/kig/ChangeLog
+++ b/kig/ChangeLog
@@ -385,7 +385,7 @@
 	* Add all the constructible regular polygons actions to
 	kigpartui.rc.
 
-	* Remove the call to KAboutData::setTranslator in kig/aboutdata.h,
+	* Remove the call to TDEAboutData::setTranslator in kig/aboutdata.h,
 	since Scripty generate automatically the two strings.
 
 2004-10-24  Dominique Devriese  <devriese@kde.org>
@@ -893,7 +893,7 @@
 
 	* Improve Kig embedded in Konqueror experience: make translations
 	and icons work by using the correct instanceName(), and using the
-	iconLoader we get from our KInstance instead of from KGlobal ( so
+	iconLoader we get from our TDEInstance instead of from KGlobal ( so
 	that the kig specific dirs are checked for icons as well ).
 
 2004-04-10  Dominique Devriese  <devriese@kde.org>
diff --git a/kig/kig/aboutdata.h b/kig/kig/aboutdata.h
index 9a70ad4c..950e5797 100644
--- a/kig/kig/aboutdata.h
+++ b/kig/kig/aboutdata.h
@@ -20,13 +20,13 @@
 
 #include "config.h"
 
-inline KAboutData* kigAboutData( const char* name, const char* iname )
+inline TDEAboutData* kigAboutData( const char* name, const char* iname )
 {
   const char* version = "v" KIGVERSION;
   const char* description = I18N_NOOP( "TDE Interactive Geometry" );
 
-  KAboutData* tmp = new KAboutData( name, iname, version,
-				   description, KAboutData::License_GPL,
+  TDEAboutData* tmp = new TDEAboutData( name, iname, version,
+				   description, TDEAboutData::License_GPL,
 				   I18N_NOOP( "(C) 2002-2005, The Kig developers" ),
 				   0, "http://edu.kde.org/kig" );
   tmp->addAuthor("Dominique Devriese",
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 497516e2..8ba6820c 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -77,7 +77,7 @@ static const TQString typesFile = "macros.kigt";
 typedef KParts::GenericFactory<KigPart> KigPartFactory;
 K_EXPORT_COMPONENT_FACTORY ( libkigpart, KigPartFactory )
 
-KAboutData* KigPart::createAboutData()
+TDEAboutData* KigPart::createAboutData()
 {
   return kigAboutData( "kig", I18N_NOOP( "KigPart" ) );
 }
diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h
index 9a26651d..641d93aa 100644
--- a/kig/kig/kig_part.h
+++ b/kig/kig/kig_part.h
@@ -28,7 +28,7 @@
 
 #include "../objects/common.h"
 
-class KAboutData;
+class TDEAboutData;
 class KActionMenu;
 class KCommandHistory;
 class KPrinter;
@@ -166,7 +166,7 @@ protected:
   bool internalSaveAs();
 
 public:
-  static KAboutData* createAboutData();
+  static TDEAboutData* createAboutData();
 protected:
   void setupActions();
   void setupTypes();
diff --git a/kig/kig/main.cpp b/kig/kig/main.cpp
index 8924a07d..a49f1f3f 100644
--- a/kig/kig/main.cpp
+++ b/kig/kig/main.cpp
@@ -103,7 +103,7 @@ static int convertToNative( const KURL& file, const TQCString& outfile )
 
 int main(int argc, char **argv)
 {
-  KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
+  TDEAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
 
   TDECmdLineArgs::init(argc, argv, about);
   TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kiten/main.cpp b/kiten/main.cpp
index af73bbd3..c4bd017b 100644
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@@ -40,8 +40,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
 	tqInstallMsgHandler(noMessageOutput);
-	KAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
-	  "1.2", I18N_NOOP("Japanese Reference Tool"), KAboutData::License_GPL,
+	TDEAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
+	  "1.2", I18N_NOOP("Japanese Reference Tool"), TDEAboutData::License_GPL,
 	  "(c) 2001-2004, Jason Katz-Brown", 0, "http://www.katzbrown.com/kiten");
 
 	aboutData.addAuthor("Jason Katz-Brown", I18N_NOOP("Original author"), "jason@katzbrown.com");
diff --git a/klatin/klatin/main.cpp b/klatin/klatin/main.cpp
index cc256152..34fa84dc 100644
--- a/klatin/klatin/main.cpp
+++ b/klatin/klatin/main.cpp
@@ -32,8 +32,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
 
-	KAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
-	"0.9", description, KAboutData::License_GPL,
+	TDEAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
+	"0.9", description, TDEAboutData::License_GPL,
 	"(C) 2001-2004, George Wright", 0, "http://edu.kde.org/klatin", "submit@bugs.kde.org");
 
 	aboutData.addAuthor("George Wright",I18N_NOOP("Author and Maintainer"), "gwright@kde.org");
diff --git a/klettres/klettres/main.cpp b/klettres/klettres/main.cpp
index 837fe00d..6f728051 100644
--- a/klettres/klettres/main.cpp
+++ b/klettres/klettres/main.cpp
@@ -45,8 +45,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description,
-                     KAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
+    TDEAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description,
+                     TDEAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
     about.addAuthor( "Anne-Marie Mahfouf", 0, "annma AT kde.org");
     about.addCredit("Ludovic Grossard",
                     I18N_NOOP("French sounds"), "grossard AT kde.org");
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index eb45c929..5d69f929 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -766,12 +766,12 @@ void MainDlg::resetZoom()
 }
 
 // It's usually safe to leave the factory code alone.. with the
-// notable exception of the KAboutData data
+// notable exception of the TDEAboutData data
 #include <kaboutdata.h>
 #include <klocale.h>
 
-KInstance*  KmPlotPartFactory::s_instance = 0L;
-KAboutData* KmPlotPartFactory::s_about = 0L;
+TDEInstance*  KmPlotPartFactory::s_instance = 0L;
+TDEAboutData* KmPlotPartFactory::s_about = 0L;
 
 KmPlotPartFactory::KmPlotPartFactory()
 		: KParts::Factory()
@@ -795,12 +795,12 @@ KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *parentWidget, const
 	return obj;
 }
 
-KInstance* KmPlotPartFactory::instance()
+TDEInstance* KmPlotPartFactory::instance()
 {
 	if( !s_instance )
 	{
-		s_about = new KAboutData("kmplot",I18N_NOOP( "KmPlotPart" ), "1");
-		s_instance = new KInstance(s_about);
+		s_about = new TDEAboutData("kmplot",I18N_NOOP( "KmPlotPart" ), "1");
+		s_instance = new TDEInstance(s_about);
 	}
 	return s_instance;
 }
diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h
index 6611c740..9ab99ba2 100644
--- a/kmplot/kmplot/MainDlg.h
+++ b/kmplot/kmplot/MainDlg.h
@@ -224,11 +224,11 @@ public:
 	virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
 	                                        TQObject *parent, const char *name,
 	                                        const char *classname, const TQStringList &args );
-	static KInstance* instance();
+	static TDEInstance* instance();
 
 private:
-	static KInstance* s_instance;
-	static KAboutData* s_about;
+	static TDEInstance* s_instance;
+	static TDEAboutData* s_about;
 };
 
 class BrowserExtension : public KParts::BrowserExtension
diff --git a/kmplot/kmplot/main.cpp b/kmplot/kmplot/main.cpp
index 5db19c03..25549a79 100644
--- a/kmplot/kmplot/main.cpp
+++ b/kmplot/kmplot/main.cpp
@@ -52,10 +52,10 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-	KAboutData aboutData(
+	TDEAboutData aboutData(
 	    "kmplot",
 	    I18N_NOOP( "KmPlot" ),
-	    KP_VERSION, description, KAboutData::License_GPL,
+	    KP_VERSION, description, TDEAboutData::License_GPL,
 	    "(c) 2000-2002, Klaus-Dieter Möller",
 	    0,
 	    "http://edu.kde.org/kmplot/" );
diff --git a/kpercentage/kpercentage/main.cpp b/kpercentage/kpercentage/main.cpp
index 74e80dfa..7e7f7560 100644
--- a/kpercentage/kpercentage/main.cpp
+++ b/kpercentage/kpercentage/main.cpp
@@ -36,11 +36,11 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char *argv[] )
 {
-    KAboutData aboutData
+    TDEAboutData aboutData
     (
         "kpercentage",
         I18N_NOOP( "KPercentage" ),
-        KPERCENTAGE_VERSION, description, KAboutData::License_GPL,
+        KPERCENTAGE_VERSION, description, TDEAboutData::License_GPL,
         "(c) 2001-2007, Matthias Messmer",
         0, 0,
         "submit@bugs.kde.org"
diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp
index 8bb200e0..5cd48a62 100644
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@@ -51,8 +51,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-	KAboutData aboutData( "kstars", I18N_NOOP("KStars"),
-		KSTARS_VERSION, description, KAboutData::License_GPL,
+	TDEAboutData aboutData( "kstars", I18N_NOOP("KStars"),
+		KSTARS_VERSION, description, TDEAboutData::License_GPL,
 		I18N_NOOP("(c) 2001-2003, The KStars Team"), notice, "http://edu.kde.org/kstars");
 	aboutData.addAuthor("Jason Harris",0, "jharris@30doradus.org", "http://www.30doradus.org");
 	aboutData.addAuthor("Heiko Evermann",0, "heiko@evermann.de", "http://www.evermann.de");
diff --git a/ktouch/src/main.cpp b/ktouch/src/main.cpp
index 9f5fe183..3f43d290 100644
--- a/ktouch/src/main.cpp
+++ b/ktouch/src/main.cpp
@@ -28,11 +28,11 @@ static KCmdLineOptions options[] = {
 
 int main(int argc, char **argv)
 {
-    KAboutData about("ktouch",
+    TDEAboutData about("ktouch",
                      I18N_NOOP("KTouch"),
                      version,
                      description,
-                     KAboutData::License_GPL,
+                     TDEAboutData::License_GPL,
                      "Copyright (C) 2000-2006 by Håvard Frøiland and Andreas Nicolai",
                      0,
                      "http://edu.kde.org/ktouch",
diff --git a/kturtle/src/main.cpp b/kturtle/src/main.cpp
index dd795c6d..5f7d9eb3 100644
--- a/kturtle/src/main.cpp
+++ b/kturtle/src/main.cpp
@@ -45,7 +45,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	KAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, KAboutData::License_GPL, copyright, 0, website);
+	TDEAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, TDEAboutData::License_GPL, copyright, 0, website);
 	about.addAuthor("Cies Breijs",
 	      I18N_NOOP("Main developer and initiator"),
 	                "cies # kde.nl");
diff --git a/kverbos/kverbos/main.cpp b/kverbos/kverbos/main.cpp
index 91dd6c71..dc05e985 100644
--- a/kverbos/kverbos/main.cpp
+++ b/kverbos/kverbos/main.cpp
@@ -35,8 +35,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
 
-	KAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
-		VERSION, description, KAboutData::License_GPL,
+	TDEAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
+		VERSION, description, TDEAboutData::License_GPL,
 		"(c) 2001, Arnold Kraschinski", 0, 0, "arnold.k67@gmx.de");
 	aboutData.addAuthor("Arnold Kraschinski",0, "arnold.k67@gmx.de");
 	aboutData.addCredit("David Vignoni", I18N_NOOP("svg icon"), "david80v@tin.it");
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index d0eba568..612c0bbd 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -40,11 +40,11 @@ static KCmdLineOptions options[] =
 static const char description[] = I18N_NOOP("Vocabulary Trainer");
 static const char version[]     = KVOCTRAIN_VERSION_STRING;
 
-  KAboutData aboutData("kvoctrain",
+  TDEAboutData aboutData("kvoctrain",
                        I18N_NOOP("KVocTrain"),
                        version,
                        description,
-                       KAboutData::License_GPL,
+                       TDEAboutData::License_GPL,
                        I18N_NOOP("© 1999-2002\tEwald Arnold\n"
                        "© 2001-2002\tThe KDE team\n"
                        "© 2004-2007\tPeter Hedlund\n"
diff --git a/kwordquiz/src/main.cpp b/kwordquiz/src/main.cpp
index dc1e8b15..bbfc2f1b 100644
--- a/kwordquiz/src/main.cpp
+++ b/kwordquiz/src/main.cpp
@@ -35,11 +35,11 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  KAboutData aboutData("kwordquiz",
+  TDEAboutData aboutData("kwordquiz",
                        I18N_NOOP("KWordQuiz"),
                        KWTQ_VERSION,
                        description,
-                       KAboutData::License_GPL,
+                       TDEAboutData::License_GPL,
                        "(c) 2003-2005, Peter Hedlund",
                        0,
                        "http://edu.kde.org/kwordquiz",
diff --git a/libtdeedu/extdate/main.cpp b/libtdeedu/extdate/main.cpp
index 31b0f805..ac7e0166 100644
--- a/libtdeedu/extdate/main.cpp
+++ b/libtdeedu/extdate/main.cpp
@@ -13,8 +13,8 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char *argv[] )
 {
-	KAboutData aboutData( "test_extdatepicker", I18N_NOOP("Test ExtDatePicker"),
-				"0.1", description, KAboutData::License_GPL,
+	TDEAboutData aboutData( "test_extdatepicker", I18N_NOOP("Test ExtDatePicker"),
+				"0.1", description, TDEAboutData::License_GPL,
 				I18N_NOOP("(c) 2004, Jason Harris"), notice,
 				"http://30doradus.org");
 	aboutData.addAuthor("Jason Harris", 0,