kdelibs4support--

src/main.cpp

@@ -18,10 +18,13 @@
  ****************************************************************************/
 
 #include <QDebug>
-#include <kapplication.h>
-#include <K4AboutData>
-#include <kcmdlineargs.h>
+
+#include <KAboutData>
+
 #include <klocale.h>
+#include <QApplication>
+#include <KLocalizedString>
+#include <QCommandLineParser>
 #include "kgoldrunner.h"
 
 static const char description[] =
@@ -31,7 +34,7 @@ static const char description[] =
 static const char version[] = "4.10";
 
 static bool gameDataOK();
-static void addCredits (K4AboutData & about);
+static void addCredits (KAboutData & about);
 
 int main (int argc, char **argv)
 {
@@ -41,16 +44,22 @@ int main (int argc, char **argv)
  	return 2;
     }
 
-    K4AboutData about ("kgoldrunner", 0, ki18n ("KGoldrunner"),
-                     version, ki18n (description),
-                     K4AboutData::License_GPL,
-                     ki18n ("(C) 2003 Ian Wadham and Marco Krüger"),
-                     KLocalizedString(), "http://games.kde.org/kgoldrunner" );
+    KAboutData about ("kgoldrunner", i18n ("KGoldrunner"),
+                     version, i18n (description),
+                     KAboutLicense::GPL,
+                     i18n ("(C) 2003 Ian Wadham and Marco Krüger"),
+                      "http://games.kde.org/kgoldrunner" );
     addCredits (about);
 
-    KCmdLineArgs::init (argc, argv, &about);
+    QApplication app(argc, argv);
+    QCommandLineParser parser;
+    KAboutData::setApplicationData(about);
+    parser.addVersionOption();
+    parser.addHelpOption();
+    about.setupCommandLine(&parser);
+    parser.process(app);
+    about.processCommandLine(&parser);
 
-    KApplication app;
     // See if we are starting with session management.
     if (app.isSessionRestored()) {
         // New RESTORE (KGrController);
@@ -67,34 +76,34 @@ int main (int argc, char **argv)
     return app.exec();
 }
 
-void addCredits (K4AboutData & about)
+void addCredits (KAboutData & about)
 {
-    about.addAuthor (ki18n ("Ian Wadham"), ki18n ("Current author"),
+    about.addAuthor (i18n ("Ian Wadham"), i18n ("Current author"),
                             "iandw.au@gmail.com");
-    about.addAuthor (ki18n ("Marco Krüger"), ki18n ("Original author"),
+    about.addAuthor (i18n ("Marco Krüger"), i18n ("Original author"),
                             "grisuji@gmx.de");
-    about.addCredit (ki18n ("Mauricio Piacentini"),
-                     ki18n ("Port to KDE4, Qt4 and KGameCanvas classes"), 
+    about.addCredit (i18n ("Mauricio Piacentini"),
+                     i18n ("Port to KDE4, Qt4 and KGameCanvas classes"), 
                             "mauricio@tabuleiro.com");
-    about.addCredit (ki18n ("Maurizio Monge"),
-                     ki18n ("KGameCanvas classes for KDE4"), 
+    about.addCredit (i18n ("Maurizio Monge"),
+                     i18n ("KGameCanvas classes for KDE4"), 
                             "maurizio.monge@gmail.com");
-    about.addCredit (ki18n ("Mauricio Piacentini"),
-                     ki18n ("Artwork for runners and default theme"), 
+    about.addCredit (i18n ("Mauricio Piacentini"),
+                     i18n ("Artwork for runners and default theme"), 
                             "mauricio@tabuleiro.com");
-    about.addCredit (ki18n ("Johann Ollivier Lapeyre"),
-                     ki18n ("Artwork for bars and ladders"), 
+    about.addCredit (i18n ("Johann Ollivier Lapeyre"),
+                     i18n ("Artwork for bars and ladders"), 
                             "johann.ollivierlapeyre@gmail.com");
-    about.addCredit (ki18n ("Eugene Trounev"),
-                     ki18n ("Artwork for background of Geek City theme"), 
+    about.addCredit (i18n ("Eugene Trounev"),
+                     i18n ("Artwork for background of Geek City theme"), 
                             "irs_me@hotmail.com");
-    about.addCredit (ki18n ("Luciano Montanaro"),
-                     ki18n ("Nostalgia themes, improvements to runners, "
+    about.addCredit (i18n ("Luciano Montanaro"),
+                     i18n ("Nostalgia themes, improvements to runners, "
                             "multiple-backgrounds feature, fade-in/fade-out "
                             "feature and several other ideas"), 
                             "mikelima@cirulla.net");
-    about.addCredit (ki18n ("Eugene Trounev"),
-                     ki18n ("Artwork for the Treasure of Egypt theme"), 
+    about.addCredit (i18n ("Eugene Trounev"),
+                     i18n ("Artwork for the Treasure of Egypt theme"), 
                             "irs_me@hotmail.com");
 }