From dff37d34bfe7faea4801d273ea569eccf7e75c53 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:24 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 0e291ee..81b73e8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -70,11 +70,11 @@ class Application : public KUniqueApplication int main(int argc, char *argv[]) { - // KCmdLineArgs::init will modify argv[0] so we remember it: + // TDECmdLineArgs::init will modify argv[0] so we remember it: const char *argv0 = (argc >= 1 ? argv[0] : ""); - KCmdLineArgs::init(argc, argv, Global::about()); - KCmdLineArgs::addCmdLineOptions(basket_options); + TDECmdLineArgs::init(argc, argv, Global::about()); + TDECmdLineArgs::addCmdLineOptions(basket_options); KUniqueApplication::addCmdLineOptions(); //KUniqueApplication app; @@ -86,12 +86,12 @@ int main(int argc, char *argv[]) MainWindow* win = new MainWindow(); Global::bnpView->handleCommandLine(); app.setMainWidget(win); -// if (!(Settings::useSystray() && KCmdLineArgs::parsedArgs() && KCmdLineArgs::parsedArgs()->isSet("start-hidden"))) +// if (!(Settings::useSystray() && TDECmdLineArgs::parsedArgs() && TDECmdLineArgs::parsedArgs()->isSet("start-hidden"))) // win->show(); if (Settings::useSystray()) { // The user wanted to not show the window (but it is already hidden by default, so we do nothing): - if (KCmdLineArgs::parsedArgs() && KCmdLineArgs::parsedArgs()->isSet("start-hidden")) + if (TDECmdLineArgs::parsedArgs() && TDECmdLineArgs::parsedArgs()->isSet("start-hidden")) ; // When the application is restored by KDE session, restore its state: else if (app.isRestored()) -- cgit v1.2.1