Rename KApplication to TDEApplication to avoid conflicts with KDE4

5 files changed, 6 insertions, 6 deletions

diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp
index 3a9148fb..4dbcb5a6 100644
--- a/kexi/tests/gui/finddialog/main.cpp
+++ b/kexi/tests/gui/finddialog/main.cpp
@@ -28,7 +28,7 @@ int main( int argc, char ** argv )
 {
   KAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", KAboutData::License_LGPL );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   KexiFindDialog dlg(true, 0, "dialog");
 
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index 7bb6a059..a87c49db 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -51,7 +51,7 @@ bool db_name_required = true;
 KexiDB::ConnectionData conn_data;
 TQGuardedPtr<KexiDB::Connection> conn;
 TQGuardedPtr<KexiDB::Driver> driver;
-KApplication *app = 0;
+TDEApplication *app = 0;
 KInstance *instance = 0;
 
 static KCmdLineOptions options[] =
@@ -157,7 +157,7 @@ int main(int argc, char** argv)
 	}
 	
 	if (gui) {
-		app = new KApplication(true, true);
+		app = new TDEApplication(true, true);
 		instance = app;
 		KGlobal::iconLoader()->addAppDir("kexi");
 	}
diff --git a/kexi/tests/startup/main.cpp b/kexi/tests/startup/main.cpp
index 3d97ac32..d7429cf4 100644
--- a/kexi/tests/startup/main.cpp
+++ b/kexi/tests/startup/main.cpp
@@ -33,7 +33,7 @@
 
 int main(int argc, char* argv[])
 {
-	KApplication app(argc, argv, "startup");
+	TDEApplication app(argc, argv, "startup");
 	
 //	Widget w;
 //	app.setMainWidget(&w);
diff --git a/kexi/tests/tableview/main.cpp b/kexi/tests/tableview/main.cpp
index 90a51b5f..88121b57 100644
--- a/kexi/tests/tableview/main.cpp
+++ b/kexi/tests/tableview/main.cpp
@@ -31,7 +31,7 @@
 
 int main(int argc, char* argv[])
 {
-	KApplication app(argc, argv, "tv_test");
+	TDEApplication app(argc, argv, "tv_test");
 	KGlobal::iconLoader()->addAppDir("kexi");
 
 	KexiTableView tv;
diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp
index 32d1cdb7..eeb87d31 100644
--- a/kexi/tests/widgets/kexidbdrivercombotest.cpp
+++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp
@@ -46,7 +46,7 @@ int main(int argc, char** argv)
 {
   // Initialise the program
   TDECmdLineArgs::init(argc, argv, "kexidbcomboboxtest", "", "", "", true);
-  KApplication* app = new KApplication(true, true);
+  TDEApplication* app = new TDEApplication(true, true);
 
   // Look for installed database drivers
   KexiDB::DriverManager manager;