From 31844f5e7358fff86f7892f901ef371966cd3777 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:27 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kmymoney2/kmymoneytest.cpp | 4 ++-- kmymoney2/main.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kmymoney2/kmymoneytest.cpp b/kmymoney2/kmymoneytest.cpp index c4a997f..84a7f32 100644 --- a/kmymoney2/kmymoneytest.cpp +++ b/kmymoney2/kmymoneytest.cpp @@ -119,8 +119,8 @@ int main(int testargc, char** testargv) }; // we seem to need a KApplication object to use KGlobal::locale() - KCmdLineArgs::init(testargc, testargv, testargv[0], "UNIT TESTS", "", "0.1"); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(testargc, testargv, testargv[0], "UNIT TESTS", "", "0.1"); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::disableAutoDcopRegistration(); KApplication app(false, false); diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp index 90f02d0..26a89a2 100644 --- a/kmymoney2/main.cpp +++ b/kmymoney2/main.cpp @@ -72,7 +72,7 @@ bool timersOn = false; KMyMoney2App* kmymoney2; -static KCmdLineArgs* args = 0; +static TDECmdLineArgs* args = 0; static void _cleanup(void) { @@ -116,8 +116,8 @@ int main(int argc, char *argv[]) aboutData.addCredit("Laurent Montel", I18N_NOOP("Patches"), "montel@kde.org"); aboutData.addCredit("Wolfgang Rohdewald", I18N_NOOP("Patches"), "woro@users.sourceforge.net"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. // create the singletons before we start memory checking // to avoid false error reports @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) KStartupLogo* splash = new KStartupLogo(); a->processEvents(); - args = KCmdLineArgs::parsedArgs(); + args = TDECmdLineArgs::parsedArgs(); // setup the MyMoneyMoney locale settings according to the KDE settings MyMoneyMoney::setThousandSeparator(*(KGlobal::locale()->monetaryThousandsSeparator().latin1()));