From ac437bde9b6851a210e83ad7644a0606a5096292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:47:40 -0600 Subject: [PATCH] Rename KCmd to avoid conflicts with KDE4 --- cervisia/cvsservice/cvsaskpass.cpp | 4 ++-- cervisia/main.cpp | 4 ++-- kapptemplate/kapp/main.cpp | 4 ++-- kapptemplate/kpartapp/main.cpp | 4 ++-- kbabel/catalogmanager/main.cpp | 4 ++-- kbabel/kbabel/main.cpp | 4 ++-- kbabel/kbabeldict/main.cpp | 4 ++-- kbugbuster/main.cpp | 4 ++-- kmtrace/kmtrace.cpp | 4 ++-- kompare/main.cpp | 4 ++-- kspy/main.cpp | 4 ++-- kstartperf/kstartperf.cpp | 4 ++-- kuiviewer/main.cpp | 4 ++-- tdecachegrind/tdecachegrind/main.cpp | 4 ++-- tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp | 4 ++-- tdeunittest/example/simple/maingui.cpp | 4 ++-- tdeunittest/guimodrunner.cpp | 4 ++-- umbrello/umbrello/docgenerators/main.cpp | 4 ++-- umbrello/umbrello/main.cpp | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp index 1215a812..bc946125 100644 --- a/cervisia/cvsservice/cvsaskpass.cpp +++ b/cervisia/cvsservice/cvsaskpass.cpp @@ -28,10 +28,10 @@ #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[prompt]", I18N_NOOP("prompt"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/cervisia/main.cpp b/cervisia/main.cpp index 215f1320..749d2a6d 100644 --- a/cervisia/main.cpp +++ b/cervisia/main.cpp @@ -139,12 +139,12 @@ static int ShowAnnotateDialog(const TQString& fileName) extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { - static KCmdLineOptions options[] = { + static TDECmdLineOptions options[] = { { "+[directory]", I18N_NOOP("The sandbox to be loaded"), 0 }, { "resolve ", I18N_NOOP("Show resolve dialog for the given file"), 0 }, { "log ", I18N_NOOP("Show log dialog for the given file"), 0 }, { "annotate ", I18N_NOOP("Show annotation dialog for the given file"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; TDEAboutData about("cervisia", I18N_NOOP("Cervisia"), CERVISIA_VERSION, I18N_NOOP("A CVS frontend"), TDEAboutData::License_GPL, diff --git a/kapptemplate/kapp/main.cpp b/kapptemplate/kapp/main.cpp index 14cabdd4..f873d2a5 100644 --- a/kapptemplate/kapp/main.cpp +++ b/kapptemplate/kapp/main.cpp @@ -12,10 +12,10 @@ static const char description[] = static const char version[] = "v${APP_VERSION}"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/kapptemplate/kpartapp/main.cpp b/kapptemplate/kpartapp/main.cpp index dc584543..370815e7 100644 --- a/kapptemplate/kpartapp/main.cpp +++ b/kapptemplate/kpartapp/main.cpp @@ -11,10 +11,10 @@ static const char description[] = static const char version[] = "v${APP_VERSION}"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index f02b9302..a867c07e 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -173,10 +173,10 @@ void CatalogManagerInterface::updatedFile( TQCString url ) CatalogManagerApp::updatedFile(url); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { {"project ",I18N_NOOP("File to load configuration from"),0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 2ed2cba1..ee8e02a1 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -532,13 +532,13 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec return kb; } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { {"gotomsgid ",I18N_NOOP("Go to entry with msgid "),0}, {"nosplash",I18N_NOOP("Disable splashscreen at startup"),0}, {"project ",I18N_NOOP("File to load configuration from"),0}, {"+[file]",I18N_NOOP("Files to open"),0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index 579b1eb1..6a20d7cc 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -100,10 +100,10 @@ KBabelDictApplication::~KBabelDictApplication() delete(topLevel); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { {"nosplash",I18N_NOOP("Disable splashscreen at startup"),0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/kbugbuster/main.cpp b/kbugbuster/main.cpp index ec30480c..f3791570 100644 --- a/kbugbuster/main.cpp +++ b/kbugbuster/main.cpp @@ -32,14 +32,14 @@ static const char description[] = I18N_NOOP("KBugBuster"); // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { {"d", 0, 0}, {"disconnected", I18N_NOOP("Start in disconnected mode"), 0}, {"pkg", 0, 0}, {"package ", I18N_NOOP("Start with the buglist for "), 0}, {"bug
", I18N_NOOP("Start with bug report
"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp index ae82af4a..97513fca 100644 --- a/kmtrace/kmtrace.cpp +++ b/kmtrace/kmtrace.cpp @@ -558,7 +558,7 @@ void readExcludeFile(const char *name) excludes->sort(); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "x", 0, 0 }, { "exclude ", "File containing symbols to exclude from output", 0}, @@ -573,7 +573,7 @@ static KCmdLineOptions options[] = {"td", 0, 0}, {"treedepth ", "Don't print subtrees that are deeper than ", 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/kompare/main.cpp b/kompare/main.cpp index 5f3cb223..90af6c4e 100644 --- a/kompare/main.cpp +++ b/kompare/main.cpp @@ -34,7 +34,7 @@ static const char description[] = static const char version[] = "3.4"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "c", I18N_NOOP( "This will compare URL1 with URL2" ), 0 }, { "o", I18N_NOOP( "This will open URL1 and expect it to be diff output. URL1 can also be a '-' and then it will read from standard input. Can be used for instance for cvs diff | kompare -o -. Kompare will do a check to see if it can find the original file(s) and then blend the original file(s) into the diffoutput and show that in the viewer. -n disables the check." ), 0 }, @@ -44,7 +44,7 @@ static KCmdLineOptions options[] = { "+[URL1 [URL2]]",0 , 0 }, { "+-", 0, 0 }, // { "", I18N_NOOP( "" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/kspy/main.cpp b/kspy/main.cpp index 6c5f7916..c191c0ee 100644 --- a/kspy/main.cpp +++ b/kspy/main.cpp @@ -26,9 +26,9 @@ static const char description[] = // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { - KCmdLineLastOption + TDECmdLineLastOption // INSERT YOUR COMMANDLINE OPTIONS HERE }; diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp index 91b583da..9938500e 100644 --- a/kstartperf/kstartperf.cpp +++ b/kstartperf/kstartperf.cpp @@ -26,10 +26,10 @@ #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+command", I18N_NOOP("Specifies the command to run"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/kuiviewer/main.cpp b/kuiviewer/main.cpp index e7a0396f..3650a600 100644 --- a/kuiviewer/main.cpp +++ b/kuiviewer/main.cpp @@ -26,7 +26,7 @@ #include #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, { "s",0,0 }, @@ -35,7 +35,7 @@ static KCmdLineOptions options[] = { "screenshotwidth ", I18N_NOOP( "Screenshot width" ), "-1" }, { "h",0,0 }, { "screenshotheight ", I18N_NOOP( "Screenshot height" ), "-1" }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp index edf04f16..3deb3bc3 100644 --- a/tdecachegrind/tdecachegrind/main.cpp +++ b/tdecachegrind/tdecachegrind/main.cpp @@ -33,11 +33,11 @@ #include "tracedata.h" #include "loader.h" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "r ", I18N_NOOP("Run under cachegrind"), 0 }, { "+[trace]", I18N_NOOP("Show information of this trace"), 0 }, - KCmdLineLastOption // End of options. + TDECmdLineLastOption // End of options. }; int main( int argc, char ** argv ) diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp index fa4b264c..55d727c6 100644 --- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp +++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp @@ -260,7 +260,7 @@ void SvnHelper::finished() { kapp->quit(); } -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "u", I18N_NOOP("Update given URL"), 0 }, { "c", I18N_NOOP("Commit given URL"), 0 }, { "C", I18N_NOOP("Checkout in given directory"), 0 }, @@ -271,7 +271,7 @@ static KCmdLineOptions options[] = { { "m", I18N_NOOP("Merge changes between two branches"), 0 }, { "D", I18N_NOOP("Show locally made changements with diff"), 0 }, {"!+URL", I18N_NOOP("URL to update/commit/add/delete from Subversion"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { diff --git a/tdeunittest/example/simple/maingui.cpp b/tdeunittest/example/simple/maingui.cpp index 419aacd9..530ae0d9 100644 --- a/tdeunittest/example/simple/maingui.cpp +++ b/tdeunittest/example/simple/maingui.cpp @@ -35,10 +35,10 @@ static const char description[] = static const char version[] = "0.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { // { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char** argv ) diff --git a/tdeunittest/guimodrunner.cpp b/tdeunittest/guimodrunner.cpp index 91757a5e..0f6febbd 100644 --- a/tdeunittest/guimodrunner.cpp +++ b/tdeunittest/guimodrunner.cpp @@ -38,12 +38,12 @@ static const char description[] = static const char version[] = "0.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { {"query [regexp]", I18N_NOOP("Only run modules which filename match the regexp."), "^tdeunittest_.*\\.la$"}, {"folder [folder]", I18N_NOOP("Only run tests modules which are found in the folder. Use the query option to select modules."), "."}, { "enable-dbgcap", I18N_NOOP("Enables debug capturing. You typically use this option when you use the GUI."), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/umbrello/umbrello/docgenerators/main.cpp b/umbrello/umbrello/docgenerators/main.cpp index ea8576da..c57520bd 100644 --- a/umbrello/umbrello/docgenerators/main.cpp +++ b/umbrello/umbrello/docgenerators/main.cpp @@ -42,12 +42,12 @@ static const char description[] = // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[File]", I18N_NOOP("File to transform"), 0 }, { "xslt ", I18N_NOOP("The XSLT file to use"), 0}, // INSERT YOUR COMMANDLINE OPTIONS HERE - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp index 9298869d..e35d9ff7 100644 --- a/umbrello/umbrello/main.cpp +++ b/umbrello/umbrello/main.cpp @@ -35,14 +35,14 @@ static const char description[] = /** * @todo Add options to use the documentation generators from command line. */ -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[File]", I18N_NOOP("File to open"), 0 }, { "export ", I18N_NOOP("export diagrams to extension and exit"), 0}, { "directory ", I18N_NOOP("the local directory to save the exported diagrams in"), I18N_NOOP("the directory of the file")}, { "use-folders", I18N_NOOP("keep the tree structure used to store the views in the document in the target directory"), 0}, // INSERT YOUR COMMANDLINE OPTIONS HERE - KCmdLineLastOption + TDECmdLineLastOption }; /**