Merge branch 'master' into frameworks

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 7c3bff47fdd288c9e56f9e58461385659fdc80fd..4816837fc5d8a143b266d34b925aa46528761864 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -29,6 +29,7 @@
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <KIcon>
+#include <KUrl>
 
 #include <QList>
 #include <QWeakPointer>
@@ -38,6 +39,7 @@ typedef KIO::FileUndoManager::CommandType CommandType;
 class DolphinViewActionHandler;
 class DolphinApplication;
 class DolphinSettingsDialog;
+class DolphinTabBar;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class DolphinTabPage;
@@ -46,11 +48,10 @@ class KFileItem;
 class KFileItemList;
 class KJob;
 class KNewFileMenu;
-class KTabBar;
-class KUrl;
 class QSplitter;
 class QToolButton;
 class QVBoxLayout;
+class QIcon;
 
 /**
  * @short Main window for Dolphin.
@@ -358,6 +359,12 @@ private slots:
      */
     void openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl());
 
+    /**
+     * Opens a new tab showing the url from tab at the given \a index and
+     * activates the tab.
+     */
+    void openNewActivatedTab(int index);
+
     void activateNextTab();
 
     void activatePrevTab();
@@ -393,10 +400,10 @@ private slots:
     void closeTab(int index);
 
     /**
-     * Opens a context menu for the tab with the index \a index
-     * on the position \a pos.
+     * Opens the tab with the index \a index in a new Dolphin instance and closes
+     * this tab.
      */
-    void openTabContextMenu(int index, const QPoint& pos);
+    void detachTab(int index);
 
     /**
      * Is connected to the QTabBar signal tabMoved(int from, int to).
@@ -405,12 +412,6 @@ private slots:
      */
     void slotTabMoved(int from, int to);
 
-    /**
-     * Is connected to the KTabBar signal testCanDecode() and adjusts
-     * the output parameter \a accept.
-     */
-    void slotTestCanDecode(const QDragMoveEvent* event, bool& accept);
-
     /**
      * If the URL can be listed, open it in the current view, otherwise
      * run it through KRun.
@@ -529,7 +530,7 @@ private:
      * as the action for toggling the dock visibility is done by Qt which
      * is no KAction instance.
      */
-    void createPanelAction(const KIcon& icon,
+    void createPanelAction(const QIcon &icon,
                            const QKeySequence& shortcut,
                            QAction* dockAction,
                            const QString& actionName);
@@ -549,7 +550,7 @@ private:
     };
 
     KNewFileMenu* m_newFileMenu;
-    KTabBar* m_tabBar;
+    DolphinTabBar* m_tabBar;
     DolphinViewContainer* m_activeViewContainer;
     QVBoxLayout* m_centralWidgetLayout;
     int m_id;