X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ad5d3367c7fef4c3c11188a768f21a2ee2b3c025..edced8460b:/src/dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 529319e2a..29ab6326d 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -68,14 +68,9 @@ public:
     DolphinViewContainer* activeViewContainer() const;
 
     /**
-     * Returns view containers for all tabs
-     * @param includeInactive   When true all view containers available in
-     *                          this window are returned. When false the
-     *                          view containers of split views that are not
-     *                          currently active are ignored.
-     *                          Default is true.
+     * Returns view container for all tabs
      */
-    QVector<DolphinViewContainer*> viewContainers(bool includeInactive = true) const;
+    QVector<DolphinViewContainer*> viewContainers() const;
 
     /**
      * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
@@ -310,12 +305,6 @@ private slots:
 
     void showFilterBar();
 
-    /**
-     * Toggle between either using an UrlNavigator in the toolbar or the
-     * ones in the location bar for navigating.
-     */
-    void toggleLocationInToolbar();
-
     /**
      * Toggles between edit and browse mode of the navigation bar.
      */
@@ -660,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;
 
 };