Merge branch 'Applications/17.12'

[dolphin.git] / src / dolphinpart_ext.h

diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h
index 6adf64972e620fe29a80a6120fa6e4c4088f7f29..590fc169cdd0a3cb1f282326af2829b89bd0a12b 100644 (file)
--- a/src/dolphinpart_ext.h
+++ b/src/dolphinpart_ext.h
@@ -22,7 +22,8 @@
 
 #include <kparts/browserextension.h>
 #include <kparts/fileinfoextension.h>
-#include <kparts/listingextension.h>
+#include <kparts/listingfilterextension.h>
+#include <kparts/listingnotificationextension.h>
 #include <QUrl>
 
 class DolphinPart;
@@ -32,8 +33,8 @@ class DolphinPartBrowserExtension : public KParts::BrowserExtension
     Q_OBJECT
 public:
     DolphinPartBrowserExtension( DolphinPart* part );
-    virtual void restoreState(QDataStream &stream) Q_DECL_OVERRIDE;
-    virtual void saveState(QDataStream &stream) Q_DECL_OVERRIDE;
+    void restoreState(QDataStream &stream) override;
+    void saveState(QDataStream &stream) override;
 
 public Q_SLOTS:
     void cut();
@@ -53,10 +54,10 @@ class DolphinPartFileInfoExtension : public KParts::FileInfoExtension
 public:
     DolphinPartFileInfoExtension(DolphinPart* part);
 
-    virtual QueryModes supportedQueryModes() const Q_DECL_OVERRIDE;
-    virtual bool hasSelection() const Q_DECL_OVERRIDE;
+    QueryModes supportedQueryModes() const override;
+    bool hasSelection() const override;
 
-    virtual KFileItemList queryFor(QueryMode mode) const Q_DECL_OVERRIDE;
+    KFileItemList queryFor(QueryMode mode) const override;
 
 private:
     DolphinPart* m_part;
@@ -68,10 +69,10 @@ class DolphinPartListingFilterExtension : public KParts::ListingFilterExtension
 
 public:
     DolphinPartListingFilterExtension(DolphinPart* part);
-    virtual FilterModes supportedFilterModes() const Q_DECL_OVERRIDE;
-    virtual bool supportsMultipleFilters(FilterMode mode) const Q_DECL_OVERRIDE;
-    virtual QVariant filter(FilterMode mode) const Q_DECL_OVERRIDE;
-    virtual void setFilter(FilterMode mode, const QVariant& filter) Q_DECL_OVERRIDE;
+    FilterModes supportedFilterModes() const override;
+    bool supportsMultipleFilters(FilterMode mode) const override;
+    QVariant filter(FilterMode mode) const override;
+    void setFilter(FilterMode mode, const QVariant& filter) override;
 
 private:
     DolphinPart* m_part;
@@ -83,7 +84,7 @@ class DolphinPartListingNotificationExtension : public KParts::ListingNotificati
 
 public:
     DolphinPartListingNotificationExtension(DolphinPart* part);
-    virtual NotificationEventTypes supportedNotificationEventTypes() const Q_DECL_OVERRIDE;
+    NotificationEventTypes supportedNotificationEventTypes() const override;
 
 public Q_SLOTS:
     void slotNewItems(const KFileItemList&);