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

diff --git a/src/main.cpp b/src/main.cpp
index a1cce4fa9..1e5673a88 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,7 +22,7 @@
 
 #include "dolphinmainwindow.h"
 
-#include <kaboutdata.h>
+#include <KAboutData>
 #include <KCmdLineArgs>
 #include <KLocale>
 #include <kmainwindow.h>
@@ -33,7 +33,7 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "1.6.9",
+                     "1.99",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
                      ki18nc("@info:credit", "(C) 2006-2011 Peter Penz"));
@@ -41,6 +41,12 @@ KDE_EXPORT int kdemain(int argc, char **argv)
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),
                     "peter.penz19@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
+                    ki18nc("@info:credit", "Developer"),
+                    "frank78ac@googlemail.com");
+    about.addAuthor(ki18nc("@info:credit", "Sebastian Trüg"),
+                    ki18nc("@info:credit", "Developer"),
+                    "trueg@kde.org"),
     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");
@@ -72,28 +78,15 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 
     options.add("select", ki18nc("@info:shell", "The files and directories passed as arguments "
                                                 "will be selected."));
+    options.add("split", ki18nc("@info:shell", "Dolphin will get started with a split view."));
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
-    if (!DolphinApplication::start()) {
-        return 0;
-    }
-
     DolphinApplication app;
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {
-        int n = 1;
-        while (KMainWindow::canBeRestored(n)) {
-            const QString className = KXmlGuiWindow::classNameOfToplevel(n);
-            if (className == QLatin1String("DolphinMainWindow")) {
-                DolphinMainWindow* win = app.createMainWindow();
-                win->restore(n);
-            } else {
-                kWarning() << "Unknown class " << className << " in session saved data!";
-            }
-            ++n;
-        }
+        app.restoreSession();
     }
     app.exec(); // krazy:exclude=crashy