diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:44:17 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:44:17 -0600 |
commit | 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (patch) | |
tree | a5eb4cb7c4754e533de65c5adee17d783e426425 /kate | |
parent | 98eb308fc180d9bea71f448b262ab796353ac904 (diff) | |
download | tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.tar.gz tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.zip |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'kate')
-rw-r--r-- | kate/app/katemain.cpp | 4 | ||||
-rw-r--r-- | kate/app/kwritemain.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index fb389131d..59d1e0100 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -35,7 +35,7 @@ #include <stdlib.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "s", 0 , 0 }, { "start <name>", I18N_NOOP("Start Kate with a given session"), 0 }, @@ -52,7 +52,7 @@ static KCmdLineOptions options[] = { "i", 0, 0 }, { "stdin", I18N_NOOP("Read the contents of stdin"), 0 }, { "+[URL]", I18N_NOOP("Document to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 58a6368d1..8da1e7e20 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -526,14 +526,14 @@ void KWrite::restore() } } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "stdin", I18N_NOOP("Read the contents of stdin"), 0}, { "encoding <argument>", I18N_NOOP("Set encoding for the file to open"), 0 }, { "line <argument>", I18N_NOOP("Navigate to this line"), 0 }, { "column <argument>", I18N_NOOP("Navigate to this column"), 0 }, { "+[URL]", I18N_NOOP("Document to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain(int argc, char **argv) |