diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:25 -0600 |
| commit | 4fbd41233e72a159f3ba8805f91c0b820873e37f (patch) | |
| tree | 215e48365139af5779893bf0458d79a57ab079fb | |
| parent | 0914721520cdaa41bf023732ddd39c728409856c (diff) | |
| download | digikam-4fbd4123.tar.gz digikam-4fbd4123.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
| -rw-r--r-- | digikam/digikam/main.cpp | 6 | ||||
| -rw-r--r-- | digikam/showfoto/main.cpp | 6 | ||||
| -rw-r--r-- | digikam/themedesigner/main.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp index 992f702..bd7a5c8 100644 --- a/digikam/digikam/main.cpp +++ b/digikam/digikam/main.cpp @@ -83,8 +83,8 @@ int main(int argc, char *argv[]) Digikam::authorsRegistration(aboutData); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) app.setMainWidget(digikam); digikam->show(); - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if (args && args->isSet("detect-camera")) digikam->autoDetect(); else if (args && args->isSet("download-from")) diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp index 08805c2..1a1df44 100644 --- a/digikam/showfoto/main.cpp +++ b/digikam/showfoto/main.cpp @@ -67,14 +67,14 @@ int main(int argc, char *argv[]) Digikam::authorsRegistration(aboutData); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; KImageIO::registerFormats(); KURL::List urlList; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); for(int i = 0; i < args->count(); i++) { urlList.append(args->url(i)); diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp index ae462e0..f0f7221 100644 --- a/digikam/themedesigner/main.cpp +++ b/digikam/themedesigner/main.cpp @@ -60,8 +60,8 @@ int main(int argc, char** argv) Digikam::authorsRegistration(aboutData); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KGlobal::locale()->setMainCatalogue( "digikam" ); |