From 4b5c71fdded4cfec525273c795bfb0b79bb8a5dd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:41 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- atlantikdesigner/designer/main.cpp | 2 +- kfile-plugins/lnk/lnkforward.cpp | 8 ++++---- kfile-plugins/lnk/lnkforward.h | 2 +- konq-plugins/fsview/main.cpp | 6 +++--- ksig/main.cpp | 6 +++--- noatun-plugins/nexscope/nex.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/atlantikdesigner/designer/main.cpp b/atlantikdesigner/designer/main.cpp index b7dee10..5dbf334 100644 --- a/atlantikdesigner/designer/main.cpp +++ b/atlantikdesigner/designer/main.cpp @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Jason Katz-Brown", I18N_NOOP("main author"), "jason@katzbrown.com", "http://katzbrown.com/"); aboutData.addAuthor("Rob Kaper", I18N_NOOP("libatlantikui"), "cap@capsi.com", "http://capsi.com/"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication kapplication; diff --git a/kfile-plugins/lnk/lnkforward.cpp b/kfile-plugins/lnk/lnkforward.cpp index e315e71..46fb781 100644 --- a/kfile-plugins/lnk/lnkforward.cpp +++ b/kfile-plugins/lnk/lnkforward.cpp @@ -52,18 +52,18 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, appName, programName, description, version, false); + TDECmdLineArgs::init(argc, argv, appName, programName, description, version, false); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); LNKForwarder app; - return app.run(KCmdLineArgs::parsedArgs()); + return app.run(TDECmdLineArgs::parsedArgs()); } //-------------------------------------------------------------------------------- -int LNKForwarder::run(KCmdLineArgs *args) +int LNKForwarder::run(TDECmdLineArgs *args) { if ( args->count() == 0 ) return 1; diff --git a/kfile-plugins/lnk/lnkforward.h b/kfile-plugins/lnk/lnkforward.h index f65c8b3..c256e35 100644 --- a/kfile-plugins/lnk/lnkforward.h +++ b/kfile-plugins/lnk/lnkforward.h @@ -34,7 +34,7 @@ class LNKForwarder : public KApplication public: - int run(KCmdLineArgs *args); + int run(TDECmdLineArgs *args); protected slots: void delayedQuit(); diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index 5a93886..151fe83 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -27,14 +27,14 @@ int main(int argc, char* argv[]) I18N_NOOP("Filesystem Viewer"), KAboutData::License_GPL, I18N_NOOP("(c) 2002, Josef Weidendorfer")); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication a; KConfigGroup gconfig(KGlobal::config(), TQCString("General")); TQString path = gconfig.readPathEntry("Path", "."); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count()>0) path = args->arg(0); // TreeMap Widget as toplevel window diff --git a/ksig/main.cpp b/ksig/main.cpp index 96aae13..96fa9fb 100644 --- a/ksig/main.cpp +++ b/ksig/main.cpp @@ -41,10 +41,10 @@ int main(int argc, char *argv[]) "(c) 2002, Scott Wheeler", 0, 0, "wheeler@kde.org"); aboutData.addAuthor("Scott Wheeler", 0, "wheeler@kde.org"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if(args->isSet("random") || args->isSet("daily")) { KApplication a(false, false); diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index 76870ff..958ae13 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -576,7 +576,7 @@ int main(int argc, char **argv) aboutData.addAuthor("Charles Samuels", I18N_NOOP("Nex Author"), "charles@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app;