Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/dolphinmainwindow.h

1 files changed, 12 insertions, 10 deletions

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 1192f6e46..4fe13d29f 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -28,7 +28,7 @@
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
-#include <KActionMenu>
+#include <KIcon>
 
 #include <QList>
 #include <QWeakPointer>
@@ -156,6 +156,11 @@ signals:
      */
     void settingsChanged();
 
+    /**
+     * Is emitted when a tab has been closed.
+     */
+    void rememberClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
+
 protected:
     /** @see QWidget::showEvent() */
     virtual void showEvent(QShowEvent* event);
@@ -192,9 +197,6 @@ private slots:
      */
     void slotUndoAvailable(bool available);
 
-    /** Invoked when an action in the recent tabs menu is clicked. */
-    void restoreClosedTab(QAction* action);
-
     /** Sets the text of the 'Undo' menu action to \a text. */
     void slotUndoTextChanged(const QString& text);
 
@@ -473,6 +475,12 @@ private slots:
      */
     void slotPlaceActivated(const KUrl& url);
 
+    /**
+     * Is called when the user wants to reopen a previously closed \a tab from
+     * the recent tabs menu.
+     */
+    void restoreClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
+
 private:
     /**
      * Activates the given view, which means that
@@ -504,11 +512,6 @@ private:
     bool addActionToMenu(QAction* action, KMenu* menu);
 
     /**
-     * Adds the tab[\a index] to the closed tab menu's list of actions.
-     */
-    void rememberClosedTab(int index);
-
-    /**
      * Connects the signals from the created DolphinView with
      * the DolphinViewContainer \a container with the corresponding slots of
      * the DolphinMainWindow. This method must be invoked each
@@ -572,7 +575,6 @@ private:
     };
 
     KNewFileMenu* m_newFileMenu;
-    KActionMenu* m_recentTabsMenu;
     KTabBar* m_tabBar;
     DolphinViewContainer* m_activeViewContainer;
     QVBoxLayout* m_centralWidgetLayout;