Merge branch 'Applications/16.04'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index e3188aee5625c17c0bf7d1d47a98dd10bd434c81..7003e94744769450656d3bf3ab84152178059074 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -31,7 +31,7 @@
 #include <QUrl>
 
 #include <QList>
-#include <QWeakPointer>
+#include <QPointer>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
@@ -71,17 +71,18 @@ public:
     DolphinViewContainer* activeViewContainer() const;
 
     /**
-     * Opens each directory in \p dirs in a separate tab. If the "split view"
-     * option is enabled, 2 directories are collected within one tab.
+     * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
+     * 2 directories are collected within one tab.
+     * \pre \a dirs must contain at least one url.
      */
-    void openDirectories(const QList<QUrl> &dirs);
+    void openDirectories(const QList<QUrl> &dirs, bool splitView);
 
     /**
-     * Opens the directory which contains the files \p files
-     * and selects all files (implements the --select option
-     * of Dolphin).
+     * Opens the directories which contain the files \p files and selects all files.
+     * If \a splitView is set, 2 directories are collected within one tab.
+     * \pre \a files must contain at least one url.
      */
-    void openFiles(const QList<QUrl>& files);
+    void openFiles(const QList<QUrl>& files, bool splitView);
 
     /**
      * Returns the 'Create New...' sub menu which also can be shared
@@ -119,11 +120,6 @@ public slots:
     /** Stores all settings and quits Dolphin. */
     void quit();
 
-    /**
-     * Opens a new tab showing the URL \a url and activates the tab.
-     */
-    void openNewActivatedTab(const QUrl& url);
-
 signals:
     /**
      * Is sent if the selection of the currently active view has
@@ -493,7 +489,7 @@ private:
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
-    QWeakPointer<DolphinSettingsDialog> m_settingsDialog;
+    QPointer<DolphinSettingsDialog> m_settingsDialog;
 
     // Members for the toolbar menu that is shown when the menubar is hidden:
     QToolButton* m_controlButton;