X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7e03c99ebbba7fd4c6b15dc885460e4dbf18f7b4..b7ad5fb99d32d43fe4e083a8ffc2ebfbd046d2db:/src/dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 85383a309..7003e9474 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -31,12 +31,11 @@
 #include <QUrl>
 
 #include <QList>
-#include <QWeakPointer>
+#include <QPointer>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class DolphinViewActionHandler;
-class DolphinApplication;
 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
@@ -58,7 +57,6 @@ class DolphinMainWindow: public KXmlGuiWindow
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")
     Q_PROPERTY(int id READ getId SCRIPTABLE true)
-    friend class DolphinApplication;
 
 public:
     DolphinMainWindow();
@@ -73,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
@@ -312,9 +311,6 @@ private slots:
      */
     void slotSelectionChanged(const KFileItemList& selection);
 
-    /** Emits the signal requestItemInfo(). */
-    void slotRequestItemInfo(const KFileItem&);
-
     /**
      * Updates the state of the 'Back' and 'Forward' menu
      * actions corresponding to the current history.
@@ -338,11 +334,6 @@ private slots:
      */
     void openNewTab(const QUrl& url);
 
-    /**
-     * Opens a new tab showing the URL \a url and activates the tab.
-     */
-    void openNewActivatedTab(const QUrl& url);
-
     /**
      * Opens the selected folder in a new tab.
      */
@@ -498,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;