Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

10 files changed, 21 insertions, 21 deletions

diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index e297ee52..aaaf589e 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -321,8 +321,8 @@ void Kexi::initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData)
 #ifdef CUSTOM_VERSION
 # include "../custom_startup.h"
 #endif
-	KCmdLineArgs::init( argc, argv, about );
-	KCmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::init( argc, argv, about );
+	TDECmdLineArgs::addCmdLineOptions( options );
 }
 
 void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text) 
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index f4866f29..5c79f55f 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -43,8 +43,8 @@ int main(int argc, char **argv)
     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);
     about.addCredit( "Kristof Borrey ", "Icons", 0, "kristof.borrey@skynet.be" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KApplication app;
 
    KGlobal::iconLoader()->addAppDir("kexi");
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
 	else
 	{
 	// no session.. just start up normally
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	if (args->count() >= 1)
 	{
             for (int i = 0; i < args->count(); i++)
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index c0f95391..6ba6624b 100644
--- a/kexi/kexidb/simplecommandlineapp.cpp
+++ b/kexi/kexidb/simplecommandlineapp.cpp
@@ -90,7 +90,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 {
 	TQFileInfo fi(argv[0]);
 	TQCString appName( fi.baseName().latin1() );
-	KCmdLineArgs::init(argc, argv, 
+	TDECmdLineArgs::init(argc, argv, 
 		new KAboutData( appName, programName,
 			version, shortDescription, licenseType, copyrightStatement, text, 
 			homePageAddress, bugsEmailAddress));
@@ -123,9 +123,9 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 	allOptionsPtr->name = 0; //end
 	allOptionsPtr->description = 0;
 	allOptionsPtr->def = 0;
-	KCmdLineArgs::addCmdLineOptions( d->allOptions );
+	TDECmdLineArgs::addCmdLineOptions( d->allOptions );
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	d->connData.driverName = args->getOption("driver");
 	d->connData.userName = args->getOption("user");
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 17afbc7d..07cb7185 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -206,7 +206,7 @@ KexiStartupHandler::~KexiStartupHandler()
 	delete d;
 }
 
-bool KexiStartupHandler::getAutoopenObjects(KCmdLineArgs *args, const TQCString &action_name)
+bool KexiStartupHandler::getAutoopenObjects(TDECmdLineArgs *args, const TQCString &action_name)
 {
 	QCStringList list = args->getOptionList(action_name);
 	QCStringList::ConstIterator it;
@@ -268,7 +268,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 {
 	m_action = DoNothing;
 //	d->showConnectionDetailsExecuted = false;
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs(0);
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(0);
 	if (!args)
 		return true;
 
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index 37a2011d..6f59dedc 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -30,7 +30,7 @@
 
 class KexiProjectData;
 class KexiProjectData;
-class KCmdLineArgs;
+class TDECmdLineArgs;
 class KexiStartupHandlerPrivate;
 namespace KexiDB {
 	class ConnectionData;
@@ -123,7 +123,7 @@ class KEXIMAIN_EXPORT KexiStartupHandler
 //		void slotShowConnectionDetails();
 
 	protected:
-		bool getAutoopenObjects(KCmdLineArgs *args, const TQCString &action_name);
+		bool getAutoopenObjects(TDECmdLineArgs *args, const TQCString &action_name);
 
 		KexiStartupHandlerPrivate *d;
 };
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index cc64aa8d..34435fba 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -40,8 +40,8 @@ int main( int argc, char** argv )
 						 KAboutData::License_LGPL,
 						"(C) 2005 Sebastian Sauer", 0, 0, "mail@dipe.org");
 
-		KCmdLineArgs::init(argc, argv, &about);
-		KCmdLineArgs::addCmdLineOptions( options );
+		TDECmdLineArgs::init(argc, argv, &about);
+		TDECmdLineArgs::addCmdLineOptions( options );
 		KApplication app;
 
 		//create an new "Console"-runner
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index cddb4596..8fad0230 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -40,8 +40,8 @@ int main( int argc, char** argv )
 	KAboutData::License_LGPL, "(C) 2005 Tobi Krebs", 0, 0,
 	"Tobi.Krebs@gmail.com");
 
-		KCmdLineArgs::init(argc, argv, &about);
-		KCmdLineArgs::addCmdLineOptions( options );
+		TDECmdLineArgs::init(argc, argv, &about);
+		TDECmdLineArgs::addCmdLineOptions( options );
 		//create new kapplication
 		KApplication app;
 		//create new kunitrunnergui
diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp
index 7da98bf4..3a9148fb 100644
--- a/kexi/tests/gui/finddialog/main.cpp
+++ b/kexi/tests/gui/finddialog/main.cpp
@@ -27,7 +27,7 @@
 int main( int argc, char ** argv )
 {
   KAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", KAboutData::License_LGPL );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
   KApplication app;
 
   KexiFindDialog dlg(true, 0, "dialog");
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index 9eaff2ab..7bb6a059 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -115,7 +115,7 @@ int main(int argc, char** argv)
 	TQFileInfo info=TQFileInfo(argv[0]);
 	prgname = info.baseName().latin1();
 	
-	KCmdLineArgs::init(argc, argv, 
+	TDECmdLineArgs::init(argc, argv, 
 		new KAboutData( prgname, "KexiDBTest",
 			"0.1.2", "", KAboutData::License_GPL,
 			"(c) 2003-2006, Kexi Team\n"
@@ -125,9 +125,9 @@ int main(int argc, char** argv)
 			"submit@bugs.kde.org"
 		)
 	);
-	KCmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::addCmdLineOptions( options );
 	
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	QCStringList tests;
 	tests << "cursors" << "schema" << "dbcreation" << "tables" 
 		<< "tableview" << "parser" << "dr_prop";
diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp
index 1ada79b1..32d1cdb7 100644
--- a/kexi/tests/widgets/kexidbdrivercombotest.cpp
+++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp
@@ -45,7 +45,7 @@
 int main(int argc, char** argv)
 {
   // Initialise the program
-  KCmdLineArgs::init(argc, argv, "kexidbcomboboxtest", "", "", "", true);
+  TDECmdLineArgs::init(argc, argv, "kexidbcomboboxtest", "", "", "", true);
   KApplication* app = new KApplication(true, true);
 
   // Look for installed database drivers