Rename KInstance and KAboutData to avoid conflicts with KDE4

3 files changed, 12 insertions, 12 deletions

diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 02996580..eeeec6dc 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -81,7 +81,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager
 		KFormDesignerPart *m_part;
 };
 
-KInstance *KFDFactory::m_instance = 0L;
+TDEInstance *KFDFactory::m_instance = 0L;
 
 KFDFactory::KFDFactory()
 {}
@@ -106,18 +106,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_part", I18N_NOOP("Form Designer Part"), "0.3");
+	TDEAboutData *about = new TDEAboutData("kformdesigner_part", I18N_NOOP("Form Designer Part"), "0.3");
 	return about;
 }
 
diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h
index 8ba652fd..b0d358ed 100644
--- a/kexi/formeditor/test/kfd_part.h
+++ b/kexi/formeditor/test/kfd_part.h
@@ -28,8 +28,8 @@
 
 #include "form.h"
 
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class TQWorkspace;
 class TQCloseEvent;
 
@@ -47,11 +47,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 KFormDesignerPart: public KParts::ReadWritePart
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index 629a1026..dcda9cc9 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -37,8 +37,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("kformdesigner", I18N_NOOP("KFormDesigner"), version, description,
-                     KAboutData::License_LGPL, "(C) 2003-2005 Kexi Team", 0, 0);
+    TDEAboutData about("kformdesigner", I18N_NOOP("KFormDesigner"), version, description,
+                     TDEAboutData::License_LGPL, "(C) 2003-2005 Kexi Team", 0, 0);
     about.addCredit( "Lucijan Busch", "Original author", 0, "lucijan@kde.org" );
     about.addAuthor( "Cedric Pasteur", 0, "cedric.pasteur@free.fr");
     about.addCredit( "Jarosław Staniek", "Win32 version, some icons, many fixes, ideas and bug reports", "js@iidea.pl", 0);