Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphinpart_ext.h

diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h
index 6adf64972e620fe29a80a6120fa6e4c4088f7f29..f2e96d3d18046a4c3158a347f8bffdd6c3354996 100644 (file)
--- a/src/dolphinpart_ext.h
+++ b/src/dolphinpart_ext.h
@@ -22,7 +22,9 @@
 
 #include <kparts/browserextension.h>
 #include <kparts/fileinfoextension.h>
 
 #include <kparts/browserextension.h>
 #include <kparts/fileinfoextension.h>

-#include <kparts/listingextension.h>
+#include <kparts/listingfilterextension.h>
+#include <kparts/listingnotificationextension.h>
+

 #include <QUrl>
 
 class DolphinPart;
 #include <QUrl>
 
 class DolphinPart;


@@ -31,9 +33,9 @@ class DolphinPartBrowserExtension : public KParts::BrowserExtension
 {
     Q_OBJECT
 public:
 {
     Q_OBJECT
 public:

-    DolphinPartBrowserExtension( DolphinPart* part );
-    virtual void restoreState(QDataStream &stream) Q_DECL_OVERRIDE;
-    virtual void saveState(QDataStream &stream) Q_DECL_OVERRIDE;
+    explicit DolphinPartBrowserExtension( DolphinPart* part );
+    void restoreState(QDataStream &stream) override;
+    void saveState(QDataStream &stream) override;

 
 public Q_SLOTS:
     void cut();
 
 public Q_SLOTS:
     void cut();


@@ -51,12 +53,12 @@ class DolphinPartFileInfoExtension : public KParts::FileInfoExtension
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    DolphinPartFileInfoExtension(DolphinPart* part);
+    explicit 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;
 
 private:
     DolphinPart* m_part;


@@ -67,11 +69,11 @@ class DolphinPartListingFilterExtension : public KParts::ListingFilterExtension
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 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;
+    explicit DolphinPartListingFilterExtension(DolphinPart* part);
+    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;
 
 private:
     DolphinPart* m_part;


@@ -82,8 +84,8 @@ class DolphinPartListingNotificationExtension : public KParts::ListingNotificati
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    DolphinPartListingNotificationExtension(DolphinPart* part);
-    virtual NotificationEventTypes supportedNotificationEventTypes() const Q_DECL_OVERRIDE;
+    explicit DolphinPartListingNotificationExtension(DolphinPart* part);
+    NotificationEventTypes supportedNotificationEventTypes() const override;

 
 public Q_SLOTS:
     void slotNewItems(const KFileItemList&);
 
 public Q_SLOTS:
     void slotNewItems(const KFileItemList&);