Merge branch 'master' into frameworks

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 7bce7f13e982c0252836eab28826d868225693b3..fd231cf0b7f3005c5119bcffe4952301e59c9f30 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>
@@ -41,13 +42,12 @@ class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class DolphinTabWidget;
-class KAction;
 class KFileItem;
 class KFileItemList;
 class KJob;
 class KNewFileMenu;
-class KUrl;
 class QToolButton;
+class QIcon;
 
 /**
  * @short Main window for Dolphin.
@@ -429,6 +429,12 @@ private slots:
      */
     void tabCountChanged(int count);
 
+    /**
+     * 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);
+
 private:
     void setupActions();
     void setupDockWidgets();
@@ -464,19 +470,13 @@ private:
 
     bool isKompareInstalled() const;
 
-    /**
-     * 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);
-
     /**
      * Creates an action for showing/hiding a panel, that is accessible
      * in "Configure toolbars..." and "Configure shortcuts...". This is necessary
      * 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);