Rename KInstance and KAboutData to avoid conflicts with KDE4

5 files changed, 15 insertions, 15 deletions

diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 9f9d775e..3dca1b12 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -659,8 +659,8 @@ KDirLVI::~KDirLVI()
 }
 
 // part stuff
-KInstance*  KompareNavTreePartFactory::s_instance = 0L;
-KAboutData* KompareNavTreePartFactory::s_about = 0L;
+TDEInstance*  KompareNavTreePartFactory::s_instance = 0L;
+TDEAboutData* KompareNavTreePartFactory::s_about = 0L;
 
 KompareNavTreePartFactory::KompareNavTreePartFactory()
     : KParts::Factory()
@@ -687,14 +687,14 @@ KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidge
 	return obj;
 }
 
-KInstance* KompareNavTreePartFactory::instance()
+TDEInstance* KompareNavTreePartFactory::instance()
 {
 	if( !s_instance )
 	{
-		s_about = new KAboutData("komparenavtreepart", I18N_NOOP("KompareNavTreePart"), "1.1");
+		s_about = new TDEAboutData("komparenavtreepart", I18N_NOOP("KompareNavTreePart"), "1.1");
 		s_about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org");
 		s_about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" );
-		s_instance = new KInstance(s_about);
+		s_instance = new TDEInstance(s_about);
 	}
 	return s_instance;
 }
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h
index 4172a8ed..0f670295 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.h
+++ b/kompare/komparenavtreepart/komparenavtreepart.h
@@ -170,8 +170,8 @@ private:
 };
 
 // part stuff
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KompareNavTreePartFactory : public KParts::Factory
 {
@@ -183,11 +183,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;
 };
 
 #endif
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index a00a7cb8..0c565820 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -476,9 +476,9 @@ void KomparePart::saveDiff()
 	delete dlg;
 }
 
-KAboutData *KomparePart::createAboutData()
+TDEAboutData *KomparePart::createAboutData()
 {
-    KAboutData *about = new KAboutData("kompare", I18N_NOOP("KomparePart"), "3.2");
+    TDEAboutData *about = new TDEAboutData("kompare", I18N_NOOP("KomparePart"), "3.2");
     about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org");
     about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" );
     return about;
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index a3de09f2..c2ed918e 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -87,7 +87,7 @@ public:
 	// Do we really want to expose this ???
 	const Diff2::KompareModelList* model() const { return m_modelList; };
 
-	static KAboutData *createAboutData();
+	static TDEAboutData *createAboutData();
 
 public:
 	// Reimplemented from the KompareInterface
diff --git a/kompare/main.cpp b/kompare/main.cpp
index 659f91f7..84a21fab 100644
--- a/kompare/main.cpp
+++ b/kompare/main.cpp
@@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-	KAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description,
-	                      KAboutData::License_GPL,
+	TDEAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description,
+	                      TDEAboutData::License_GPL,
 	                      I18N_NOOP("(c) 2001-2004, John Firebaugh and Otto Bruggeman"), 0, "http://bruggie.dnsalias.org/kompare/" );
 	aboutData.addAuthor( "John Firebaugh", I18N_NOOP("Author"), "jfirebaugh@kde.org" );
 	aboutData.addAuthor( "Otto Bruggeman", I18N_NOOP("Author"), "otto.bruggeman@home.nl" );