diff options
author | Timothy Pearson <[email protected]> | 2013-02-06 19:31:56 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-06 19:31:56 -0600 |
commit | f896e2c464e9373f70a93186a5a2c6aadf386920 (patch) | |
tree | d0db1ccf11fe3d00683799f9f8bcc9769fcbb991 | |
parent | c338cebc995cf56eaba5d46ab974713bd377f535 (diff) | |
download | digikam-f896e2c464e9373f70a93186a5a2c6aadf386920.tar.gz digikam-f896e2c464e9373f70a93186a5a2c6aadf386920.zip |
Rename KCmd to avoid conflicts with KDE4
-rw-r--r-- | digikam/digikam/main.cpp | 4 | ||||
-rw-r--r-- | digikam/showfoto/main.cpp | 4 | ||||
-rw-r--r-- | digikam/themedesigner/main.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp index d7a4e1e2..69a57bbe 100644 --- a/digikam/digikam/main.cpp +++ b/digikam/digikam/main.cpp @@ -57,11 +57,11 @@ #include "digikamapp.h" #include "digikamfirstrun.h" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "detect-camera", I18N_NOOP("Automatically detect and open camera"), 0 }, { "download-from <path>", I18N_NOOP("Open camera dialog at <path>"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp index 1e9de6f8..9627c7c6 100644 --- a/digikam/showfoto/main.cpp +++ b/digikam/showfoto/main.cpp @@ -42,10 +42,10 @@ #include "daboutdata.h" #include "showfoto.h" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[file(s) or folder(s)]", I18N_NOOP("File(s) or folder(s) to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp index 5b24097a..058fe192 100644 --- a/digikam/themedesigner/main.cpp +++ b/digikam/themedesigner/main.cpp @@ -41,10 +41,10 @@ static const char *description = Digikam::themeDesignerDescription(); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP( "Document to open." ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char** argv) |