Fix a crash and extract unrelated changes

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 79084ae7dc101df57deeec138469a454e7c2f1ab..29ab6326dac20128fc7aa9bdff59b7f74ff52f16 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -92,7 +92,24 @@ public:
      */
     KNewFileMenu* newFileMenu() const;
 
-    void setTabsToHomeIfMountPathOpen(const QString& mountPath);
+    /**
+     * Switch the window's view containers' locations to display the home path
+     * for any which are currently displaying a location corresponding to or
+     * within mountPath.
+     *
+     * This typically done after unmounting a disk at mountPath to ensure that
+     * the window is not displaying an invalid location.
+     */
+    void setViewsToHomeIfMountPathOpen(const QString& mountPath);
+
+    /**
+     * Sets any of the window's view containers which are currently displaying
+     * invalid locations to the home path
+     */
+    void setViewsWithInvalidPathsToHome();
+
+    bool isFoldersPanelEnabled() const;
+    bool isInformationPanelEnabled() const;
 
 public slots:
     /**
@@ -592,12 +609,6 @@ private:
     /** Adds "What's This?" texts to many widgets and StandardActions. */
     void setupWhatsThis();
 
-    /**
-     * Returns the KIO::StatJob::mostLocalUrl() for the active container URL
-     * if it's a local file. Otherwise returns the user's home path.
-     */
-    QString activeContainerLocalPath();
-
     /** Returns preferred search tool as configured in "More Search Tools" menu. */
     QPointer<QAction> preferredSearchTool();
 
@@ -638,6 +649,9 @@ private:
     KToolBarPopupAction* m_backAction;
     KToolBarPopupAction* m_forwardAction;
 
+    /** Makes sure that only one object is ever connected to the history. */
+    QMetaObject::Connection m_updateHistoryConnection;
+
     QMenu m_searchTools;
 
 };