diff options
author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:30 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:30 -0600 |
commit | ffde8b0e0c2a5a34986334d5e35f4b26c66a40a9 (patch) | |
tree | caf8626048525cd4dec763d75a3b1c37a56ae2e8 | |
parent | 86a09b27ea00b8af1bac96e5849b2d20c14c7f36 (diff) | |
download | konversation-ffde8b0e0c2a5a34986334d5e35f4b26c66a40a9.tar.gz konversation-ffde8b0e0c2a5a34986334d5e35f4b26c66a40a9.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r-- | konversation/src/konversationapplication.cpp | 2 | ||||
-rw-r--r-- | konversation/src/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp index c1a489f..c8763a7 100644 --- a/konversation/src/konversationapplication.cpp +++ b/konversation/src/konversationapplication.cpp @@ -73,7 +73,7 @@ KonversationApplication::~KonversationApplication() int KonversationApplication::newInstance() { - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TQCString url; if (args->count() > 0) url = args->arg(0); diff --git a/konversation/src/main.cpp b/konversation/src/main.cpp index 2deede7..ef70143 100644 --- a/konversation/src/main.cpp +++ b/konversation/src/main.cpp @@ -91,8 +91,8 @@ int main(int argc, char* argv[]) aboutData.addCredit("Stanislav Nikolov",I18N_NOOP("Bug fixes"),"[email protected]"); aboutData.addCredit("Juan Carlos Torres",I18N_NOOP("Auto-join context menu"),"[email protected]"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) return 0; |