X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4b758c386fb3957160af334230bacd96ed810d2c..0a6257bce3de877e4ae869f974df645c428d32c9:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 9d4c003af..0505037ce 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -24,11 +24,11 @@ #include -#include #include #include #include -#include +#include +#include #include #include @@ -41,13 +41,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. @@ -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 KUrl& 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 KUrl& url); /** * Opens the selected folder in a new tab. @@ -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 @@ -476,7 +473,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);