diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:47:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:47:16 -0600 |
commit | 02fa17d6dd9d871f40038cd9ac615e9e1154724b (patch) | |
tree | af4cf59b73c929b15d4d147921dec9fd41727608 /korganizer | |
parent | 28bf0c14b571dd696a51e62aa4b18c06d20816af (diff) | |
download | tdepim-02fa17d6dd9d871f40038cd9ac615e9e1154724b.tar.gz tdepim-02fa17d6dd9d871f40038cd9ac615e9e1154724b.zip |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'korganizer')
-rw-r--r-- | korganizer/korgac/korgacmain.cpp | 2 | ||||
-rw-r--r-- | korganizer/korganizer_options.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index 0db40fed1..b4c6a69c7 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -54,7 +54,7 @@ class MyApp : public KUniqueApplication static const char korgacVersion[] = "0.9"; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { 0, 0, 0 } }; diff --git a/korganizer/korganizer_options.h b/korganizer/korganizer_options.h index 52511ac9c..b29366165 100644 --- a/korganizer/korganizer_options.h +++ b/korganizer/korganizer_options.h @@ -29,7 +29,7 @@ #include <kcmdlineargs.h> #include <klocale.h> -static const KCmdLineOptions korganizer_options[] = +static const TDECmdLineOptions korganizer_options[] = { { "i", 0, 0 }, { "import", I18N_NOOP("Import the given calendars as new resources into the default calendar"), 0 }, @@ -38,7 +38,7 @@ static const KCmdLineOptions korganizer_options[] = { "o", 0, 0 }, { "open", I18N_NOOP("Open the given calendars in a new window"), 0 }, { "+[calendars]", I18N_NOOP("Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user will be asked whether to import, merge or open in a separate window."), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; #endif /* KORGANIZER_OPTIONS_H */ |