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

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

1 files changed, 49 insertions, 0 deletions

diff --git a/src/dolphinrecenttabsmenu.h b/src/dolphinrecenttabsmenu.h
new file mode 100644
index 000000000..34d41530b
--- /dev/null
+++ b/src/dolphinrecenttabsmenu.h
@@ -0,0 +1,49 @@
+/***************************************************************************
+ * Copyright (C) 2014 by Emmanuel Pescosta <[email protected]> *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
+ ***************************************************************************/
+
+#ifndef DOLPHIN_RECENT_TABS_MENU_H
+#define DOLPHIN_RECENT_TABS_MENU_H
+
+#include <KActionMenu>
+#include <KUrl>
+
+class DolphinTabPage;
+class QAction;
+
+class DolphinRecentTabsMenu : public KActionMenu
+{
+    Q_OBJECT
+
+public:
+    explicit DolphinRecentTabsMenu(QObject* parent);
+
+public slots:
+    void rememberClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
+
+signals:
+    void restoreClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
+
+private slots:
+    void handleAction(QAction* action);
+
+private:
+    QAction* m_clearListAction;
+};
+
+#endif
\ No newline at end of file