SVN_SILENT Remove trailing white space.

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a1cce4fa90817e8c8e680cb57b562ea1dcc2471d..3f26bbb579023d8bb1c6007cb93ade908a70cc84 100644 (file)
--- 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>
@@ -72,28 +72,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