From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 19:55:40 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 karbon/karbon_aboutdata.h  |  6 +++---
 karbon/karbon_factory.cc   | 10 +++++-----
 karbon/karbon_factory.h    | 12 ++++++------
 karbon/widgets/vtoolbox.cc |  2 +-
 karbon/widgets/vtoolbox.h  |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'karbon')

diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h
index 8d8e5217..c293baaf 100644
--- a/karbon/karbon_aboutdata.h
+++ b/karbon/karbon_aboutdata.h
@@ -10,14 +10,14 @@ static const char* version=VERSION;
 
 // This is all implemented here so that the executable and the part can share it
 // without sharing an object file.
-KAboutData * newKarbonAboutData()
+TDEAboutData * newKarbonAboutData()
 {
-	KAboutData * aboutData = new KAboutData(
+	TDEAboutData * aboutData = new TDEAboutData(
 		"karbon",
 		I18N_NOOP( "Karbon14" ),
 		version,
 		description,
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		I18N_NOOP( "(c) 2001-2006, The Karbon Developers" ),
 		I18N_NOOP( "You are invited to participate in any way." ),
 		"http://www.koffice.org/karbon/");
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 90c8c29a..6206926a 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -38,8 +38,8 @@
 
 KarbonResourceServer* KarbonFactory::s_rserver = 0;
 
-KInstance* KarbonFactory::s_instance = 0L;
-KAboutData* KarbonFactory::s_aboutData = 0L;
+TDEInstance* KarbonFactory::s_instance = 0L;
+TDEAboutData* KarbonFactory::s_aboutData = 0L;
 
 KarbonFactory::KarbonFactory( TQObject* parent, const char* name )
 		: KoFactory( parent, name )
@@ -95,7 +95,7 @@ KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
 	return part;
 }
 
-KAboutData*
+TDEAboutData*
 KarbonFactory::aboutData()
 {
 	if( !s_aboutData )
@@ -103,12 +103,12 @@ KarbonFactory::aboutData()
 	return s_aboutData;
 }
 
-KInstance*
+TDEInstance*
 KarbonFactory::instance()
 {
 	if( !s_instance )
 	{
-		s_instance = new KInstance( aboutData() );
+		s_instance = new TDEInstance( aboutData() );
 		// Add any application-specific resource directories here
 
 		s_instance->dirs()->addResourceType( "kis_brushes",
diff --git a/karbon/karbon_factory.h b/karbon/karbon_factory.h
index fb7c09c6..a30bd608 100644
--- a/karbon/karbon_factory.h
+++ b/karbon/karbon_factory.h
@@ -22,8 +22,8 @@
 
 #include <KoFactory.h>
 #include <koffice_export.h>
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 
 class KarbonResourceServer;
 
@@ -41,14 +41,14 @@ public:
 											const char* widgetName = 0L, TQObject* parent = 0L, const char* name = 0L,
 											const char* classname = "KoDocument", const TQStringList& args = TQStringList() );
 
-	static KInstance* instance();
-	static KAboutData* aboutData();
+	static TDEInstance* instance();
+	static TDEAboutData* aboutData();
 
 	static KarbonResourceServer *rServer();
 
 private:
-	static KInstance*	s_instance;
-	static KAboutData*	s_aboutData;
+	static TDEInstance*	s_instance;
+	static TDEAboutData*	s_aboutData;
 	static KarbonResourceServer* s_rserver;
 };
 
diff --git a/karbon/widgets/vtoolbox.cc b/karbon/widgets/vtoolbox.cc
index 6146ae93..d3f12b7e 100644
--- a/karbon/widgets/vtoolbox.cc
+++ b/karbon/widgets/vtoolbox.cc
@@ -21,7 +21,7 @@
 #include "vtoolbox.h"
 #include "vtool.h"
 
-VToolBox::VToolBox( KMainWindow *mainWin, const char* name, KInstance* instance ) : KoToolBox( mainWin, name, instance, 5 )
+VToolBox::VToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance ) : KoToolBox( mainWin, name, instance, 5 )
 {
 }
 
diff --git a/karbon/widgets/vtoolbox.h b/karbon/widgets/vtoolbox.h
index b31a4cbb..857b72e7 100644
--- a/karbon/widgets/vtoolbox.h
+++ b/karbon/widgets/vtoolbox.h
@@ -31,7 +31,7 @@ class VToolBox : public KoToolBox
   
 
 public:
-	VToolBox( KMainWindow *mainWin, const char* name, KInstance* instance );
+	VToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance );
 	virtual ~VToolBox() {}
 
 	void registerTool( VTool * );
-- 
cgit v1.2.1