Rename KInstance and KAboutData to avoid conflicts with KDE4

5 files changed, 9 insertions, 9 deletions

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 );