From ca1ec6eeaaf5744fae891a5b0696591bbaece795 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:49 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kommander/editor/main.cpp | 4 ++-- kommander/editor/mainwindow.cpp | 2 +- kommander/executor/main.cpp | 6 +++--- kommander/pluginmanager/main.cpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kommander') diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp index 641baac6..013e3b65 100644 --- a/kommander/editor/main.cpp +++ b/kommander/editor/main.cpp @@ -49,8 +49,8 @@ int main( int argc, char *argv[] ) aboutData.addAuthor("Marc Britton", I18N_NOOP("Original author"), "consume@optusnet.com.au"); aboutData.setTranslator (I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"), I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails")); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KommanderWidget::inEditor = true; diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 599807c3..8769f54d 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -1523,7 +1523,7 @@ void MainWindow::readConfig() actionRecent->loadEntries(config, "Recent Files"); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); for(int i = 0; i < args->count(); i++) { TQFileInfo fi(args->url(i).path()); diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp index 183118e8..a389ac57 100644 --- a/kommander/executor/main.cpp +++ b/kommander/executor/main.cpp @@ -61,9 +61,9 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org"); aboutData.addAuthor("Michal Rudolf", I18N_NOOP("Previous maintainer"), "mrudolf@tdewebdev.org"); aboutData.addAuthor("Marc Britton", I18N_NOOP("Original author"), "consume@optusnet.com.au"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("c")) KLocale::setMainCatalogue(args->getOption("c")); diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp index b1dbe8dd..d58c1af1 100644 --- a/kommander/pluginmanager/main.cpp +++ b/kommander/pluginmanager/main.cpp @@ -62,10 +62,10 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Marc Britton", "Original author", "consume@optusnet.com.au"); aboutData.addAuthor("Eric Laffoon", "Project manager", "eric@tdewebdev.org"); aboutData.addAuthor("Michal Rudolf", "Current maintainer", "mrudolf@tdewebdev.org"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); // Add our own options. + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KApplication app; if (!args->getOption("add").isNull() || !args->getOption("remove").isNull() || args->isSet("check") || args->isSet("list")) -- cgit v1.2.3