summaryrefslogtreecommitdiffstats
path: root/kexi/main/startup
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-19 18:46:28 -0600
committerTimothy Pearson <[email protected]>2013-01-19 18:46:28 -0600
commit68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (patch)
tree2960e9f2a6227456ee4d6f1b135f6daa30929eac /kexi/main/startup
parent7e1f33d9f50dcae3eeed6143c602303ac360ba8d (diff)
downloadkoffice-68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2.tar.gz
koffice-68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kexi/main/startup')
-rw-r--r--kexi/main/startup/KexiStartup.cpp4
-rw-r--r--kexi/main/startup/KexiStartup.h4
2 files changed, 4 insertions, 4 deletions
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;
};