From e57b0bd3983c7f1fa1743585d9df68cf5fc8c710 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:39:43 -0600 Subject: [PATCH] Rename KCmd to avoid conflicts with KDE4 --- src/askpass/tdesvn-askpass.cpp | 4 ++-- src/main.cpp | 4 ++-- src/tdesvnd/main.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/askpass/tdesvn-askpass.cpp b/src/askpass/tdesvn-askpass.cpp index 358e7ee..b6985a3 100644 --- a/src/askpass/tdesvn-askpass.cpp +++ b/src/askpass/tdesvn-askpass.cpp @@ -25,10 +25,10 @@ #include #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[prompt]", I18N_NOOP("prompt"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char** argv) diff --git a/src/main.cpp b/src/main.cpp index 9692e0a..b96a933 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,7 @@ static const char description[] = static const char version[] = VERSION; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "r startrev[:endrev]",I18N_NOOP("Execute single subversion command on specific revision(-range)"),0}, {"R",I18N_NOOP("Ask for revision when executing single command"),0}, @@ -42,7 +42,7 @@ static KCmdLineOptions options[] = {"l ",I18N_NOOP("Limit log output to "),0}, { "+exec ",I18N_NOOP("Execute subversion command (\"exec help\" for more information)"),0}, { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/src/tdesvnd/main.cpp b/src/tdesvnd/main.cpp index 0f97859..5557db9 100644 --- a/src/tdesvnd/main.cpp +++ b/src/tdesvnd/main.cpp @@ -33,9 +33,9 @@ static const char description[] = static const char version[] = "0.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { - KCmdLineLastOption + TDECmdLineLastOption }; int main (int argc, char *argv[])