Rename KInstance and KAboutData to avoid conflicts with KDE4

25 files changed, 60 insertions, 60 deletions

diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index aaaf589ed..dbaddb117 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -313,9 +313,9 @@ ObjectStatus::operator KexiDB::MessageHandler*()
 	return msgHandler;
 }
 
-void Kexi::initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData)
+void Kexi::initCmdLineArgs(int argc, char *argv[], TDEAboutData* aboutData)
 {
-	KAboutData *about = aboutData;
+	TDEAboutData *about = aboutData;
 	if (!about)
 		about = Kexi::createAboutData();
 #ifdef CUSTOM_VERSION
diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h
index 5a6804a53..921db42be 100644
--- a/kexi/core/kexi.h
+++ b/kexi/core/kexi.h
@@ -36,7 +36,7 @@
 
 namespace Kexi
 {
-	KEXICORE_EXPORT void initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData = 0);
+	KEXICORE_EXPORT void initCmdLineArgs(int argc, char *argv[], TDEAboutData* aboutData = 0);
 
 	/*! Modes of view for the dialogs. Used mostly for parts and KexiDialogBase. */
 	enum ViewMode { 
diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp
index 51265bdbb..e41cf0ff2 100644
--- a/kexi/core/kexiaboutdata.cpp
+++ b/kexi/core/kexiaboutdata.cpp
@@ -38,15 +38,15 @@ static const char *description =
 
 using namespace Kexi;
 
-KAboutData* Kexi::createAboutData()
+TDEAboutData* Kexi::createAboutData()
 {
-	KAboutData *aboutData=new KAboutData( "kexi", KEXI_APP_NAME,
+	TDEAboutData *aboutData=new TDEAboutData( "kexi", KEXI_APP_NAME,
 		KEXI_VERSION_STRING 
 #ifndef CUSTOM_VERSION
 		" (KOffice " KOFFICE_VERSION_STRING ")"
 #endif
 		, description, 
-		KAboutData::License_LGPL_V2,
+		TDEAboutData::License_LGPL_V2,
 		I18N_NOOP(	"(c) 2002-2007, Kexi Team\n"
 					"(c) 2003-2007, OpenOffice Polska LLC\n"),
 		I18N_NOOP(	"This software is developed by Kexi Team - an international group\n"
diff --git a/kexi/core/kexiaboutdata.h b/kexi/core/kexiaboutdata.h
index 948906c56..06e3497d6 100644
--- a/kexi/core/kexiaboutdata.h
+++ b/kexi/core/kexiaboutdata.h
@@ -26,7 +26,7 @@
 
 namespace Kexi {
 
-KEXICORE_EXPORT KAboutData* createAboutData();
+KEXICORE_EXPORT TDEAboutData* createAboutData();
 
 }
 
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 67e81a5da..d9b5d884f 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -134,7 +134,7 @@ TQSize KexiDialogBase::sizeHint() const
 }
 
 /*
-KInstance *KexiDialogBase::instance() {
+TDEInstance *KexiDialogBase::instance() {
 	return m_instance;
 }*/
 
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index 814e14bd6..453787827 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -175,7 +175,7 @@ TOP REQUESTED FEATURES LIST @ PL EXPO 2004:
 - scripting
 
 === Kexi Parts TODO ===
-- kexipart.h: add KexiPart::AboutData : public KAboutData
+- kexipart.h: add KexiPart::AboutData : public TDEAboutData
   and 
   #define KEXIPART_EXPORT_COMPONENT_FACTORY( libname, partClass, aboutData ) \
     K_EXPORT_COMPONENT_FACTORY( libname, KGenericFactory<partClass>(aboutData) )
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 79f1b05ff..64f9e800d 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 57f75c124..f98990438 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
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 029965801..eeeec6dc4 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 8ba652fd3..b0d358ed9 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 629a10261..dcda9cc94 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);
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 677709e40..b57132977 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -91,9 +91,9 @@ bool DriverManagerInternal::lookupDrivers()
 	if (tqApp) {
 		connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
 	}
-//TODO: for QT-only version check for KInstance wrapper
-//		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without KInstance (KGlobal::instance()==0)!" << endl;
-//		setError("Driver Manager cannot work without KInstance (KGlobal::instance()==0)!");
+//TODO: for QT-only version check for TDEInstance wrapper
+//		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (KGlobal::instance()==0)!" << endl;
+//		setError("Driver Manager cannot work without TDEInstance (KGlobal::instance()==0)!");
 
 	lookupDriversNeeded = false;
 	clearError();
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index 6ba6624b3..5b3732a5f 100644
--- a/kexi/kexidb/simplecommandlineapp.cpp
+++ b/kexi/kexidb/simplecommandlineapp.cpp
@@ -72,7 +72,7 @@ public:
 
 	KexiDB::DriverManager manager;
 	KCmdLineOptions *allOptions;
-	KInstance* instance;
+	TDEInstance* instance;
 	ConnectionData connData;
 	TQGuardedPtr<Connection> conn;
 };
@@ -91,7 +91,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 	TQFileInfo fi(argv[0]);
 	TQCString appName( fi.baseName().latin1() );
 	TDECmdLineArgs::init(argc, argv, 
-		new KAboutData( appName, programName,
+		new TDEAboutData( appName, programName,
 			version, shortDescription, licenseType, copyrightStatement, text, 
 			homePageAddress, bugsEmailAddress));
 
@@ -102,7 +102,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 	for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, userOptionsCount++)
 		;
 
-	d->instance = new KInstance(appName);
+	d->instance = new TDEInstance(appName);
 
 	// join the predefined options and user options
 	d->allOptions = new KCmdLineOptions[predefinedOptionsCount + userOptionsCount + 1];
@@ -212,7 +212,7 @@ bool SimpleCommandLineApp::closeDatabase()
 	return true;
 }
 
-KInstance* SimpleCommandLineApp::instance() const
+TDEInstance* SimpleCommandLineApp::instance() const
 {
 	return d->instance;
 }
diff --git a/kexi/kexidb/simplecommandlineapp.h b/kexi/kexidb/simplecommandlineapp.h
index c14a35ea1..64cc13828 100644
--- a/kexi/kexidb/simplecommandlineapp.h
+++ b/kexi/kexidb/simplecommandlineapp.h
@@ -30,7 +30,7 @@ struct KCmdLineOptions;
 namespace KexiDB
 {
 	//! @short A skeleton for creating a simple command line database application.
-	/*! This class creates a KInstance object and automatically handles the following 
+	/*! This class creates a TDEInstance object and automatically handles the following 
 	 command line options:
 	 - --driver \<name\> (Database driver name) or -drv
 	 - --user \<name\> (Database user name) or -u
@@ -49,14 +49,14 @@ namespace KexiDB
 			SimpleCommandLineApp(
 				int argc, char** argv, KCmdLineOptions *options, const char *programName, 
 				const char *version, const char *shortDescription=0, 
-				int licenseType=KAboutData::License_Unknown, 
+				int licenseType=TDEAboutData::License_Unknown, 
 				const char *copyrightStatement=0, const char *text=0, 
 				const char *homePageAddress=0, const char *bugsEmailAddress="submit@bugs.kde.org");
 
 		~SimpleCommandLineApp();
 
 		//! \return program instance
-		KInstance* instance() const;
+		TDEInstance* instance() const;
 
 		/*! Opens database \a databaseName for connection data 
 		 specified via the command line. \return true in success.
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 96bd81be1..d5d77cd96 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -144,7 +144,7 @@
 //-------------------------------------------------
 
 //static
-int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata)
+int KexiMainWindowImpl::create(int argc, char *argv[], TDEAboutData* aboutdata)
 {
 	Kexi::initCmdLineArgs( argc, argv, aboutdata );
 
@@ -3957,7 +3957,7 @@ void KexiMainWindowImpl::slotStartFeedbackAgent()
 {
 #ifndef KEXI_NO_FEEDBACK_AGENT
 #ifdef FEEDBACK_CLASS
-	const KAboutData* about = TDEApplication::kApplication()->aboutData();
+	const TDEAboutData* about = TDEApplication::kApplication()->aboutData();
 	FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(),
 		about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages );
 
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index f477d2fbd..0e81a91bb 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -55,7 +55,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		/*! Used by the main kexi routine. Creates a new Kexi main window and a new TDEApplication object.
 		 kdemain() has to destroy the latter on exit.
 		 \return result 1 on error and 0 on success (the result can be used as a result of kdemain()) */
-		static int create(int argc, char *argv[], KAboutData* aboutdata = 0);
+		static int create(int argc, char *argv[], TDEAboutData* aboutdata = 0);
 
 		//! \return KexiMainWindowImpl singleton (if it is instantiated)
 		static KexiMainWindowImpl* self() { return dynamic_cast<KexiMainWindowImpl*>(tqApp->mainWidget()); }
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 91bd6bfcf..688bc7d93 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -142,7 +142,7 @@ TQString captionForDialogType(int type)
 }
 
 /*================================================================*/
-/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, KInstance* global,
+/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, TDEInstance* global,
 	const TQCString &format, const TQString &nativePattern,
 	const TQString &nativeName, const DialogType &dialogType,
 	const TQCString& templateType) :
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 945f084cd..6d0bbc785 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -94,9 +94,9 @@ bool MigrateManagerInternal::lookupDrivers()
 	if (tqApp) {
 		connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
 	}
-//TODO: for QT-only version check for KInstance wrapper
-//		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without KInstance (KGlobal::instance()==0)!" << endl;
-//		setError("Driver Manager cannot work without KInstance (KGlobal::instance()==0)!");
+//TODO: for QT-only version check for TDEInstance wrapper
+//		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (KGlobal::instance()==0)!" << endl;
+//		setError("Driver Manager cannot work without TDEInstance (KGlobal::instance()==0)!");
 
 	lookupDriversNeeded = false;
 	clearError();
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index 2a1cc9004..33e53eb84 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -33,11 +33,11 @@ static KCmdLineOptions options[] =
 int main( int argc, char** argv )
 {
 	try {
-		KAboutData about("KoMacroTester",
+		TDEAboutData about("KoMacroTester",
 						 I18N_NOOP("KoMacroTester"),
 						 version,
 						 description,
-						 KAboutData::License_LGPL,
+						 TDEAboutData::License_LGPL,
 						"(C) 2005 Sebastian Sauer", 0, 0, "mail@dipe.org");
 
 		TDECmdLineArgs::init(argc, argv, &about);
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index 3c9eb1475..95c019f85 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -36,8 +36,8 @@ static const KCmdLineOptions options[] =
 int main( int argc, char** argv )
 {
 	try {
-		KAboutData const about("KomacroTests", I18N_NOOP("KomacroTests"), version, description,
-	KAboutData::License_LGPL, "(C) 2005 Tobi Krebs", 0, 0,
+		TDEAboutData const about("KomacroTests", I18N_NOOP("KomacroTests"), version, description,
+	TDEAboutData::License_LGPL, "(C) 2005 Tobi Krebs", 0, 0,
 	"Tobi.Krebs@gmail.com");
 
 		TDECmdLineArgs::init(argc, argv, &about);
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp
index 7e8af75bb..39e8e684b 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -690,7 +690,7 @@ int main(int argc, char *argv[])
 	newArgv[0] = tqstrdup(argv[0]);
 	newArgv[1] = tqstrdup( "--skip-startup-dialog" );
 
-	KAboutData* aboutdata = Kexi::createAboutData();
+	TDEAboutData* aboutdata = Kexi::createAboutData();
 	aboutdata->setProgramName( "Kexi Alter Table Test" );
 	int result = KexiMainWindowImpl::create(newArgc, newArgv, aboutdata);
 	if (!tqApp)
diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp
index 4dbcb5a6a..838fd5eac 100644
--- a/kexi/tests/gui/finddialog/main.cpp
+++ b/kexi/tests/gui/finddialog/main.cpp
@@ -26,7 +26,7 @@
 
 int main( int argc, char ** argv )
 {
-  KAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", KAboutData::License_LGPL );
+  TDEAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", TDEAboutData::License_LGPL );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index a87c49dbb..95e2c0b3e 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -52,7 +52,7 @@ KexiDB::ConnectionData conn_data;
 TQGuardedPtr<KexiDB::Connection> conn;
 TQGuardedPtr<KexiDB::Driver> driver;
 TDEApplication *app = 0;
-KInstance *instance = 0;
+TDEInstance *instance = 0;
 
 static KCmdLineOptions options[] =
 {
@@ -116,8 +116,8 @@ int main(int argc, char** argv)
 	prgname = info.baseName().latin1();
 	
 	TDECmdLineArgs::init(argc, argv, 
-		new KAboutData( prgname, "KexiDBTest",
-			"0.1.2", "", KAboutData::License_GPL,
+		new TDEAboutData( prgname, "KexiDBTest",
+			"0.1.2", "", TDEAboutData::License_GPL,
 			"(c) 2003-2006, Kexi Team\n"
 			"(c) 2003-2006, OpenOffice Polska Ltd.\n",
 			"",
@@ -162,7 +162,7 @@ int main(int argc, char** argv)
 		KGlobal::iconLoader()->addAppDir("kexi");
 	}
 	else {
-		instance = new KInstance(prgname);
+		instance = new TDEInstance(prgname);
 	}
 
 	drv_name = args->arg(0);
diff --git a/kexi/tests/newapi/mysqlcursor.cpp b/kexi/tests/newapi/mysqlcursor.cpp
index 091cc8a1b..426c65aa1 100644
--- a/kexi/tests/newapi/mysqlcursor.cpp
+++ b/kexi/tests/newapi/mysqlcursor.cpp
@@ -9,7 +9,7 @@
 
 int main(int argc, char * argv[])
 {
-	KInstance instance("newapi");
+	TDEInstance instance("newapi");
 	KexiDB::DriverManager manager;
 	TQStringList names = manager.driverNames();
 	kdDebug() << "DRIVERS: " << endl;
diff --git a/kexi/tests/parser/main.cpp b/kexi/tests/parser/main.cpp
index 803e0193d..1b5f80991 100644
--- a/kexi/tests/parser/main.cpp
+++ b/kexi/tests/parser/main.cpp
@@ -20,7 +20,7 @@ int main(int argc, char **argv)
 	kdDebug() << "main()" << endl;
 	TQFileInfo info=TQFileInfo(argv[0]);
 	prgname = info.baseName().latin1();
-	KInstance instance( prgname );
+	TDEInstance instance( prgname );
 	if (argc<2) {
 		return 1;
 	}