Port Dolphin away from KApplication, KCmdLineArgs and K4AboutData

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 218698bef153411e41627b7265b8f2aad8883899..0ee6e5c2cc376f64f17aaefce6047091fbf444be 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,7 +21,6 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 

-#include "dolphinapplication.h"

 #include "dolphindockwidget.h"
 #include "dolphincontextmenu.h"
 #include "dolphinnewfilemenu.h"
 #include "dolphindockwidget.h"
 #include "dolphincontextmenu.h"
 #include "dolphinnewfilemenu.h"


@@ -69,6 +68,7 @@
 #include <KToolInvocation>
 #include <KUrlComboBox>
 
 #include <KToolInvocation>
 #include <KUrlComboBox>
 

+#include <QApplication>

 #include <QMenuBar>
 #include <QClipboard>
 #include <QToolButton>
 #include <QMenuBar>
 #include <QClipboard>
 #include <QToolButton>


@@ -353,8 +353,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
     // Find out if Dolphin is closed directly by the user or
     // by the session manager because the session is closed
     bool closedByUser = true;
     // Find out if Dolphin is closed directly by the user or
     // by the session manager because the session is closed
     bool closedByUser = true;

-    DolphinApplication *application = qobject_cast<DolphinApplication*>(qApp);
-    if (application && application->sessionSaving()) {
+    if (qApp->isSessionRestored()) {

         closedByUser = false;
     }
 
         closedByUser = false;
     }