Rename KApplication to TDEApplication to avoid conflicts with KDE4

16 files changed, 24 insertions, 24 deletions

diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index f41d8111..814e14bd 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -912,7 +912,7 @@ XML Export TODO:
   (templates/XSLT could be also supported)
 
 General TODO:
-- handle KApplication::shutDown()
+- handle TDEApplication::shutDown()
 
 TODO:
 - on opening detect whether a table exists (empty table view should not be displayed)
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 87adfb20..412d3665 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -122,7 +122,7 @@ FormManager::FormManager(TQObject *parent, int options, const char *name)
 #endif
 
 	connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
-	slotSettingsChanged(KApplication::SETTINGS_SHORTCUTS);
+	slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
 
 //moved to createWidgetLibrary()	m_lib = new WidgetLibrary(this, supportedFactoryGroups);
 	m_propSet = new WidgetPropertySet(this);
@@ -1459,7 +1459,7 @@ FormManager::showFormUICode()
 void
 FormManager::slotSettingsChanged(int category)
 {
-	if (category==KApplication::SETTINGS_SHORTCUTS) {
+	if (category==TDEApplication::SETTINGS_SHORTCUTS) {
 		m_contextMenuKey = KGlobalSettings::contextMenuKey();
 	}
 }
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index 5c79f55f..629a1026 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
     about.addCredit( "Kristof Borrey ", "Icons", 0, "kristof.borrey@skynet.be" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDEApplication app;
 
    KGlobal::iconLoader()->addAppDir("kexi");
 
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index 81e4f41e..8b832061 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -87,12 +87,12 @@ namespace KexiUtils
 	}
 
 	/*! Sets "wait" cursor with 1 second delay (or 0 seconds if noDelay is true).
-	 Does nothing if the application has no GUI enabled. (see KApplication::guiEnabled()) */
+	 Does nothing if the application has no GUI enabled. (see TDEApplication::guiEnabled()) */
 	KEXIUTILS_EXPORT void setWaitCursor(bool noDelay = false);
 
 	/*! Remove "wait" cursor previously set with \a setWaitCursor(), 
 	 even if it's not yet visible.
-	 Does nothing if the application has no GUI enabled. (see KApplication::guiEnabled()) */
+	 Does nothing if the application has no GUI enabled. (see TDEApplication::guiEnabled()) */
 	KEXIUTILS_EXPORT void removeWaitCursor();
 
 	/*! Helper class. Allocate it in your code block as follows:
@@ -101,7 +101,7 @@ namespace KexiUtils
 	 </code>
 	 .. and wait cursor will be visible (with one second delay) until you're in this block, without 
 	 a need to call removeWaitCursor() before exiting the block.
-	 Does nothing if the application has no GUI enabled. (see KApplication::guiEnabled()) */
+	 Does nothing if the application has no GUI enabled. (see TDEApplication::guiEnabled()) */
 	class KEXIUTILS_EXPORT WaitCursor
 	{
 		public:
@@ -116,7 +116,7 @@ namespace KexiUtils
 	 .. and the wait cursor will be hidden unless you leave this block, without 
 	 a need to call setWaitCursor() before exiting the block. After leaving the codee block,
 	 the cursor will be visible again, if it was visible before creating the WaitCursorRemover object.
-	 Does nothing if the application has no GUI enabled. (see KApplication::guiEnabled()) */
+	 Does nothing if the application has no GUI enabled. (see TDEApplication::guiEnabled()) */
 	class KEXIUTILS_EXPORT WaitCursorRemover
 	{
 		public:
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index f6be589a..96bd81be 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -151,7 +151,7 @@ int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata)
 	bool GUIenabled = true;
 	TQWidget *dummyWidget = 0; //needed to have icon for dialogs before KexiMainWindowImpl is created
 //! @todo switch GUIenabled off when needed
-	KApplication* app = new KApplication(true, GUIenabled);
+	TDEApplication* app = new TDEApplication(true, GUIenabled);
 
 #ifdef KEXI_STANDALONE
 	KGlobal::locale()->removeCatalogue("kexi");
@@ -3957,13 +3957,13 @@ void KexiMainWindowImpl::slotStartFeedbackAgent()
 {
 #ifndef KEXI_NO_FEEDBACK_AGENT
 #ifdef FEEDBACK_CLASS
-	const KAboutData* about = KApplication::kApplication()->aboutData();
+	const KAboutData* about = TDEApplication::kApplication()->aboutData();
 	FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(),
 		about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages );
 
 	if ( wizard->exec() )
 	{
-		KApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org",
+		TDEApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org",
 			TQString(), TQString(),
 			about->appName() + TQCString( " [feedback]" ),
 			wizard->feedbackDocument().toString( 2 ).local8Bit() );
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 270e9272..f477d2fb 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -52,7 +52,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		KexiMainWindowImpl();
 		virtual ~KexiMainWindowImpl();
 
-		/*! Used by the main kexi routine. Creates a new Kexi main window and a new KApplication object.
+		/*! 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);
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 3592557c..6fdc5966 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -600,7 +600,7 @@ bool ImportWizard::fileBasedDstSelected() const
 
 void ImportWizard::progressUpdated(int percent) {
 	m_progressBar->setProgress(percent);
-	KApplication::kApplication()->processEvents();
+	TDEApplication::kApplication()->processEvents();
 }
 
 //===========================================================
diff --git a/kexi/migration/keximigratetest.cpp b/kexi/migration/keximigratetest.cpp
index bb67d985..e81e8d80 100644
--- a/kexi/migration/keximigratetest.cpp
+++ b/kexi/migration/keximigratetest.cpp
@@ -38,7 +38,7 @@ using namespace KexiMigration;
 
 int main(int argc, char *argv[])
 {
-	KApplication app(argc, argv, "Kexi Migrate Test");
+	TDEApplication app(argc, argv, "Kexi Migrate Test");
 
 	ImportWizard* iw = new ImportWizard();
 	iw->setGeometry(300,300,300,250);
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index 34435fba..2a1cc900 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -42,7 +42,7 @@ int main( int argc, char** argv )
 
 		TDECmdLineArgs::init(argc, argv, &about);
 		TDECmdLineArgs::addCmdLineOptions( options );
-		KApplication app;
+		TDEApplication app;
 
 		//create an new "Console"-runner
 		KUnitTest::Runner * runner = KUnitTest::Runner::self(); 
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index 8fad0230..3c9eb147 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -43,7 +43,7 @@ int main( int argc, char** argv )
 		TDECmdLineArgs::init(argc, argv, &about);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		//create new kapplication
-		KApplication app;
+		TDEApplication app;
 		//create new kunitrunnergui
 		KUnitTest::RunnerGUI runner(0);
 		//show the ui
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;
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index a766c597..fa474bfc 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -185,7 +185,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	d = new KexiTableViewPrivate(this);
 
 	connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
-	slotSettingsChanged(KApplication::SETTINGS_SHORTCUTS);
+	slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
 
 	m_data = new KexiTableViewData(); //to prevent crash because m_data==0
 	m_owner = true;                   //-this will be deleted if needed
@@ -2593,7 +2593,7 @@ KexiTableItem *KexiTableView::highlightedItem() const
 
 void KexiTableView::slotSettingsChanged(int category)
 {
-	if (category==KApplication::SETTINGS_SHORTCUTS) {
+	if (category==TDEApplication::SETTINGS_SHORTCUTS) {
 		d->contextMenuKey = KGlobalSettings::contextMenuKey();
 	}
 }