X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/59d01e8accbfb7f31fb5ea5ef4c94e57d427994a..e8d8a8c35bb413eb9b3d92733563bc177c505975:/src/dolphinpart.h diff --git a/src/dolphinpart.h b/src/dolphinpart.h index 9ab1e80ce..864c08344 100644 --- a/src/dolphinpart.h +++ b/src/dolphinpart.h @@ -21,9 +21,8 @@ #define DOLPHINPART_H #include -#include -#include +#include class DolphinNewFileMenu; class DolphinViewActionHandler; @@ -31,9 +30,7 @@ class QActionGroup; class KFileItemList; class KFileItem; class DolphinPartBrowserExtension; -class DolphinSortFilterProxyModel; class DolphinRemoteEncoding; -class DolphinModel; class KDirLister; class DolphinView; class KAboutData; @@ -53,11 +50,11 @@ class DolphinPart : public KParts::ReadOnlyPart Q_PROPERTY( QString nameFilter READ nameFilter WRITE setNameFilter ) // Used by konqueror to implement the --select command-line option - Q_PROPERTY( KUrl::List filesToSelect READ filesToSelect WRITE setFilesToSelect ) + Q_PROPERTY( QList filesToSelect READ filesToSelect WRITE setFilesToSelect ) public: explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args); - ~DolphinPart(); + ~DolphinPart() override; static KAboutData* createAboutData(); @@ -65,7 +62,7 @@ public: * Standard KParts::ReadOnlyPart openUrl method. * Called by Konqueror to view a directory in DolphinPart. */ - virtual bool openUrl(const QUrl& url) Q_DECL_OVERRIDE; + bool openUrl(const QUrl& url) override; /// see the supportsUndo property bool supportsUndo() const { return true; } @@ -101,7 +98,7 @@ protected: /** * We reimplement openUrl so no need to implement openFile. */ - virtual bool openFile() { return true; } + bool openFile() override { return true; } Q_SIGNALS: /** @@ -134,7 +131,7 @@ private Q_SLOTS: /** * Creates a new window showing the content of \a url. */ - void createNewWindow(const KUrl& url); + void createNewWindow(const QUrl &url); /** * Opens the context menu on the current mouse position. * @pos Position in screen coordinates. @@ -146,7 +143,7 @@ private Q_SLOTS: */ void slotOpenContextMenu(const QPoint& pos, const KFileItem& item, - const KUrl& url, + const QUrl& url, const QList& customActions); /** @@ -155,7 +152,7 @@ private Q_SLOTS: * Testcase 1: fish://localhost * Testcase 2: showing a directory that is being renamed by another window (#180156) */ - void slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl); + void slotDirectoryRedirection(const QUrl& oldUrl, const QUrl& newUrl); /** * Updates the state of the 'Edit' menu actions and emits @@ -223,10 +220,10 @@ private Q_SLOTS: /** * Called by konqueror --select */ - void setFilesToSelect(const KUrl::List& files); - KUrl::List filesToSelect() const { return KUrl::List(); } // silence moc + void setFilesToSelect(const QList &files); + QList filesToSelect() const { return QList(); } // silence moc - virtual bool eventFilter(QObject*, QEvent*); + bool eventFilter(QObject*, QEvent*) override; private: void createActions();