X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fc600ed2554fb767865b297039a94e5fc653f6b9..a07d63d419469592b2600e668795cea2f9bee403:/src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 631897337..bcd19d4d2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,28 +22,31 @@
 
 #include "dolphinmainwindow.h"
 
-#include <KAboutData>
+#include <k4aboutdata.h>
 #include <KCmdLineArgs>
-#include <KLocale>
+#include <KLocalizedString>
 #include <kmainwindow.h>
+#include <kdeversion.h>
 #include <KDebug>
 
-extern "C"
-KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
-    KAboutData about("dolphin", 0,
+    K4AboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "2.0.95",
+                     "4.60",
                      ki18nc("@title", "File Manager"),
-                     KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006-2012 Peter Penz"));
+                     K4AboutData::License_GPL,
+                     ki18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
     about.setHomepage("http://dolphin.kde.org");
-    about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
-                    ki18nc("@info:credit", "Maintainer and developer"),
-                    "peter.penz19@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),
+                    ki18nc("@info:credit", "Maintainer (since 2014) and developer"),
+                    "emmanuelpescosta099@gmail.com");
     about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
-                    ki18nc("@info:credit", "Developer"),
+                    ki18nc("@info:credit", "Maintainer (2012-2014) and developer"),
                     "frank78ac@googlemail.com");
+    about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
+                    ki18nc("@info:credit", "Maintainer and developer (2006-2012)"),
+                    "peter.penz19@gmail.com");
     about.addAuthor(ki18nc("@info:credit", "Sebastian Trüg"),
                     ki18nc("@info:credit", "Developer"),
                     "trueg@kde.org"),
@@ -82,13 +85,13 @@ KDE_EXPORT int kdemain(int argc, char **argv)
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
-    DolphinApplication app;
-    KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
-
-    if (app.isSessionRestored()) {
-        app.restoreSession();
+    {
+        DolphinApplication app;
+        if (app.isSessionRestored()) {
+            app.restoreSession();
+        }
+        app.exec(); // krazy:exclude=crashy
     }
-    app.exec(); // krazy:exclude=crashy
 
     return 0;
 }