Interface modifications to KCmdLineArgs, KAboutData and KComponentData; BIC, SIC. Most of the depending code has been auto-converted to new API.

svn path=/trunk/KDE/kdebase/apps/; revision=682259

2 files changed, 17 insertions, 21 deletions

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 3a7c9b11b..2a766afd4 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -60,7 +60,7 @@ DolphinPart::~DolphinPart()
 
 KAboutData* DolphinPart::createAboutData()
 {
-    return new KAboutData("dolphinpart", I18N_NOOP( "Dolphin Part" ), "0.1");
+    return new KAboutData("dolphinpart", 0, ki18n( "Dolphin Part" ), "0.1");
 }
 
 bool DolphinPart::openUrl(const KUrl& url)
diff --git a/src/main.cpp b/src/main.cpp
index 98a6a87f1..50ba137d2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,34 +24,30 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
-static KCmdLineOptions options[] =
-    {
-        { "+[Url]", I18N_NOOP("Document to open"), 0
-        },
-        KCmdLineLastOption
-    };
-
 int main(int argc, char **argv)
 {
-    KAboutData about("dolphin",
-                     I18N_NOOP("Dolphin"),
+    KAboutData about("dolphin", 0,
+                     ki18n("Dolphin"),
                      "0.9.0",
-                     I18N_NOOP("File Manager"),
+                     ki18n("File Manager"),
                      KAboutData::License_GPL,
-                     "(C) 2006 Peter Penz");
+                     ki18n("(C) 2006 Peter Penz"));
     about.setHomepage("http://enzosworld.gmxhome.de");
     about.setBugAddress("[email protected]");
-    about.addAuthor("Peter Penz", I18N_NOOP("Maintainer and developer"), "[email protected]");
-    about.addAuthor("Cvetoslav Ludmiloff", I18N_NOOP("Developer"), "[email protected]");
-    about.addAuthor("Stefan Monov", I18N_NOOP("Developer"), "[email protected]");
-    about.addAuthor("Michael Austin", I18N_NOOP("Documentation"), "[email protected]");
-    about.addAuthor("Orville Bennett", I18N_NOOP("Documentation"), "[email protected]");
-    about.addCredit("Aaron J. Seigo", I18N_NOOP("... for the great support and the amazing patches"));
-    about.addCredit("Patrice Tremblay and Gregor Kalisnik", I18N_NOOP("... for their patches"));
-    about.addCredit("Ain, Itai, Ivan, Stephane, Patrice, Piotr and Stefano",
-                    I18N_NOOP("... for their translations"));
+    about.addAuthor(ki18n("Peter Penz"), ki18n("Maintainer and developer"), "[email protected]");
+    about.addAuthor(ki18n("Cvetoslav Ludmiloff"), ki18n("Developer"), "[email protected]");
+    about.addAuthor(ki18n("Stefan Monov"), ki18n("Developer"), "[email protected]");
+    about.addAuthor(ki18n("Michael Austin"), ki18n("Documentation"), "[email protected]");
+    about.addAuthor(ki18n("Orville Bennett"), ki18n("Documentation"), "[email protected]");
+    about.addCredit(ki18n("Aaron J. Seigo"), ki18n("... for the great support and the amazing patches"));
+    about.addCredit(ki18n("Patrice Tremblay and Gregor Kalisnik"), ki18n("... for their patches"));
+    about.addCredit(ki18n("Ain, Itai, Ivan, Stephane, Patrice, Piotr and Stefano"),
+                    ki18n("... for their translations"));
 
     KCmdLineArgs::init(argc, argv, &about);
+
+    KCmdLineOptions options;
+    options.add("+[Url]", ki18n("Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     if (!DolphinApplication::start()) {