From f7e4bdd856bc418cebaaa7ad09010ab389fc4fbc 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 --- kcron/main.cpp | 2 +- kdat/main.cpp | 4 ++-- kpackage/main.cpp | 6 +++--- ksysv/main.cpp | 2 +- kuser/main.cpp | 2 +- secpolicy/main.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kcron/main.cpp b/kcron/main.cpp index ce2bbcf..ba299c7 100644 --- a/kcron/main.cpp +++ b/kcron/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) aboutData.addAuthor("James Ots", 0, "code@jamesots.com"); aboutData.addAuthor("Alberto G. Hierro", 0, "alberto.hierro@kdemail.net"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication app; diff --git a/kdat/main.cpp b/kdat/main.cpp index 34704da..7a70f8d 100644 --- a/kdat/main.cpp +++ b/kdat/main.cpp @@ -72,9 +72,9 @@ int main( int argc, char** argv ) #endif /* DEBUG */ /* 2002-01-28 LEW */ - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); aboutData.addAuthor( "Lawrence Widman", 0, "kdat@cardiothink.com"); -// KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. +// TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; app.setMainWidget( KDatMainWindow::getInstance() ); diff --git a/kpackage/main.cpp b/kpackage/main.cpp index 6581df4..52731d2 100644 --- a/kpackage/main.cpp +++ b/kpackage/main.cpp @@ -84,9 +84,9 @@ int main(int argc, char **argv) VERSION, description, KAboutData::License_GPL, // VERSION, description, 0, "(c) 1999-2001, Toivo Pedaste"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); aboutData.addAuthor( "Toivo Pedaste",0, "toivo@ucs.uwa.edu.au"); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; kpkg = 0; @@ -97,7 +97,7 @@ int main(int argc, char **argv) path = "PATH=" + path + ":/sbin:/usr/sbin:/usr/local/bin"; putenv(strdup(path.data())); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString remoteHost = args->getOption("remote"); if (remoteHost.isEmpty() || remoteHost == "localhost") { diff --git a/ksysv/main.cpp b/ksysv/main.cpp index 170a514..f42ee15 100644 --- a/ksysv/main.cpp +++ b/ksysv/main.cpp @@ -65,7 +65,7 @@ int main( int argc, char **argv ) { about.addAuthor ("Peter Putzer", I18N_NOOP("Main developer"), "putzer@kde.org"); ksv::about = &about; - KCmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::init(argc, argv, &about); KUniqueApplication::addCmdLineOptions (); if (!KUniqueApplication::start()) { diff --git a/kuser/main.cpp b/kuser/main.cpp index 364f8a9..7f00a7c 100644 --- a/kuser/main.cpp +++ b/kuser/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char **argv) "dyp@perchine.com", "http://www.perchine.com/dyp/"); aboutData.addAuthor("Szombathelyi György", I18N_NOOP("kuser author"), "gyurco@freemail.hu"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); mainWidget *mw = 0; KApplication a; diff --git a/secpolicy/main.cpp b/secpolicy/main.cpp index 6060405..459e337 100644 --- a/secpolicy/main.cpp +++ b/secpolicy/main.cpp @@ -37,7 +37,7 @@ static const char version[] = "v0.0.1"; int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, "secpolicy", description, version); + TDECmdLineArgs::init(argc, argv, "secpolicy", description, version); if (!KUniqueApplication::start()) exit(0);