Rename KInstance and KAboutData to avoid conflicts with KDE4

2 files changed, 10 insertions, 10 deletions

diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 79f1b05f..64f9e800 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -51,7 +51,7 @@
 	if(actionCollection()->action( name )) \
 		actionCollection()->action( name )->setEnabled( enable )
 
-KInstance *KFDFactory::m_instance = 0L;
+TDEInstance *KFDFactory::m_instance = 0L;
 
 KFDFactory::KFDFactory()
 : KParts::Factory(0, "libkformdesigner_kdev_part")
@@ -77,18 +77,18 @@ KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
 	return part;
 }
 
-KInstance*
+TDEInstance*
 KFDFactory::instance()
 {
 	if (!m_instance)
-		m_instance = new KInstance(aboutData());
+		m_instance = new TDEInstance(aboutData());
 	return m_instance;
 }
 
-KAboutData*
+TDEAboutData*
 KFDFactory::aboutData()
 {
-	KAboutData *about = new KAboutData("kformdesigner_kdev_part", I18N_NOOP("Form Designer Part"), "0.3");
+	TDEAboutData *about = new TDEAboutData("kformdesigner_kdev_part", I18N_NOOP("Form Designer Part"), "0.3");
 	return about;
 }
 
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h
index 57f75c12..f9899043 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h
@@ -28,8 +28,8 @@
 
 #include "form.h"
 
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class TQWorkspace;
 class TQCloseEvent;
 
@@ -48,11 +48,11 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
-		static KInstance *instance();
-		static KAboutData *aboutData();
+		static TDEInstance *instance();
+		static TDEAboutData *aboutData();
 
 	private:
-		static KInstance *m_instance;
+		static TDEInstance *m_instance;
 };
 
 class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer