[kdebase/apps/dolphin/CMakeLists.txt] Fixed compilation without Nepomuk

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 988019de1bf9d7e16b01b9519d82e28ef5f833ec..c418f4540d086a4ae45536625c18301215bb0925 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -28,7 +28,7 @@
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
-    m_lastId(0), m_closedBySessionManager(false)
+    m_lastId(0)
 {
     new ApplicationAdaptor(this);
     QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
@@ -72,68 +72,36 @@ void DolphinApplication::refreshMainWindows()
 int DolphinApplication::newInstance()
 {
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-    static bool first = true;
 
-    switch (args->count()) {
-    case 0:
-        if( !first || !isSessionRestored()) {
-            openWindow(KUrl());
-        }
-        break;
-
-    case 1:
-        openWindow(args->url(0));
-        break;
-
-    case 2:
-        openSplitWindow(args->url(0),args->url(1));
-        break;
+    QList<KUrl> urls;
+    const int argsCount = args->count();
+    for (int i = 0; i < argsCount; ++i) {
+        urls.append(args->url(i));
+    }
 
-    default:
-        for (int i = 0; i < args->count(); ++i) {
-            openWindow(args->url(i));
+    DolphinMainWindow* win = createMainWindow();
+    if (urls.count() > 0) {
+        if (args->isSet("select")) {
+            win->openFiles(urls);
+        } else {
+            win->openDirectories(urls);
         }
     }
+    win->show();
 
-    first = false;
     args->clear();
     return 0;
 }
 
-bool DolphinApplication::closedBySessionManager() const
-{
-    return m_closedBySessionManager;
-}
-
-void DolphinApplication::commitData(QSessionManager& sessionManager) {
-    m_closedBySessionManager = true;
-    KUniqueApplication::commitData(sessionManager);
-    m_closedBySessionManager = false;
-}
-
-int DolphinApplication::openWindow(const KUrl& url)
-{
-    DolphinMainWindow* win = createMainWindow();
-    if ((win->activeViewContainer() != 0) && url.isValid()) {
-        win->activeViewContainer()->setUrl(url);
-    }
-    win->show();
-    return win->getId();
-}
-
-int DolphinApplication::openSplitWindow(const KUrl& leftUrl, const KUrl& rightUrl)
+int DolphinApplication::openWindow(const QString& urlString)
 {
     DolphinMainWindow* win = createMainWindow();
-    if ((win->activeViewContainer() != 0) && leftUrl.isValid()) {
-        win->activeViewContainer()->setUrl(leftUrl);
-    }
-    win->toggleSplitView();
-    if ((win->activeViewContainer() != 0) && rightUrl.isValid()){
-      win->activeViewContainer()->setUrl(rightUrl);
+    const KUrl url(urlString);
+    if (!url.isEmpty()) {
+        win->openDirectories(QList<KUrl>() << url);
     }
     win->show();
     return win->getId();
 }
 
-
 #include "dolphinapplication.moc"