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

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index fd231cf0b7f3005c5119bcffe4952301e59c9f30..36a16e518d511caf5ac55f286a77ce5a82a44fe1 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -24,12 +24,11 @@
 
 #include <config-baloo.h>
 
-#include <KFileItemDelegate>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
-#include <KIcon>
-#include <KUrl>
+#include <QIcon>
+#include <QUrl>
 
 #include <QList>
 #include <QWeakPointer>
@@ -77,14 +76,14 @@ public:
      * Opens each directory in \p dirs in a separate tab. If the "split view"
      * option is enabled, 2 directories are collected within one tab.
      */
-    void openDirectories(const QList<KUrl>& dirs);
+    void openDirectories(const QList<QUrl> &dirs);
 
     /**
      * Opens the directory which contains the files \p files
      * and selects all files (implements the --select option
      * of Dolphin).
      */
-    void openFiles(const QList<KUrl>& files);
+    void openFiles(const QList<QUrl>& files);
 
     /**
      * Returns the 'Create New...' sub menu which also can be shared
@@ -110,14 +109,14 @@ public slots:
      * Inform all affected dolphin components (panels, views) of an URL
      * change.
      */
-    void changeUrl(const KUrl& url);
+    void changeUrl(const QUrl& url);
 
     /**
      * The current directory of the Terminal Panel has changed, probably because
      * the user entered a 'cd' command. This slot calls changeUrl(url) and makes
      * sure that the panel keeps the keyboard focus.
      */
-    void slotTerminalDirectoryChanged(const KUrl& url);
+    void slotTerminalDirectoryChanged(const QUrl& url);
 
     /** Stores all settings and quits Dolphin. */
     void quit();
@@ -133,7 +132,7 @@ signals:
      * Is sent if the url of the currently active view has
      * been changed.
      */
-    void urlChanged(const KUrl& url);
+    void urlChanged(const QUrl& url);
 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the panel.
@@ -335,16 +334,14 @@ private slots:
     void openNewActivatedTab();
 
     /**
-     * Opens a new tab in the background showing the URL \a primaryUrl and the
-     * optional URL \a secondaryUrl.
+     * Opens a new tab in the background showing the URL \a url.
      */
-    void openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl());
+    void openNewTab(const QUrl& url);
 
     /**
-     * Opens a new tab showing the  URL \a primaryUrl and the optional URL
-     * \a secondaryUrl and activates the tab.
+     * Opens a new tab showing the URL \a url and activates the tab.
      */
-    void openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl());
+    void openNewActivatedTab(const QUrl& url);
 
     /**
      * Opens the selected folder in a new tab.
@@ -366,7 +363,7 @@ private slots:
      * If the URL can be listed, open it in the current view, otherwise
      * run it through KRun.
      */
-    void handleUrl(const KUrl& url);
+    void handleUrl(const QUrl& url);
 
     /**
      * handleUrl() can trigger a stat job to see if the url can actually
@@ -391,7 +388,7 @@ private slots:
      */
     void openContextMenu(const QPoint& pos,
                          const KFileItem& item,
-                         const KUrl& url,
+                         const QUrl& url,
                          const QList<QAction*>& customActions);
 
     void updateControlMenu();
@@ -409,7 +406,7 @@ private slots:
      * Reloads the view if \a url is the current URL already, and changes the
      * current URL otherwise.
      */
-    void slotPlaceActivated(const KUrl& url);
+    void slotPlaceActivated(const QUrl& url);
 
     /**
      * Is called if the another view has been activated by changing the current
@@ -433,7 +430,7 @@ private slots:
      * Sets the window caption to url.fileName() if this is non-empty,
      * "/" if the URL is "file:///", and url.protocol() otherwise.
      */
-    void setUrlAsCaption(const KUrl& url);
+    void setUrlAsCaption(const QUrl& url);
 
 private:
     void setupActions();
@@ -450,7 +447,7 @@ private:
      * case if it has not added already to the toolbar.
      * @return True if the action has been added to the menu.
      */
-    bool addActionToMenu(QAction* action, KMenu* menu);
+    bool addActionToMenu(QAction* action, QMenu* menu);
 
     /**
      * Connects the signals from the created DolphinView with