Merge branch 'Applications/16.04'

[dolphin.git] / src / dolphinpart_ext.h

diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h
index 5272df69d2e11a717bb3d2c749ad3250e95f08b0..0b7018dbb2d3025a2a40c1cc7be05885a44391c3 100644 (file)
--- a/src/dolphinpart_ext.h
+++ b/src/dolphinpart_ext.h
@@ -22,8 +22,9 @@
 
 #include <kparts/browserextension.h>
 #include <kparts/fileinfoextension.h>
 
 #include <kparts/browserextension.h>
 #include <kparts/fileinfoextension.h>

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

 
 class DolphinPart;
 
 
 class DolphinPart;
 


@@ -32,14 +33,14 @@ class DolphinPartBrowserExtension : public KParts::BrowserExtension
     Q_OBJECT
 public:
     DolphinPartBrowserExtension( DolphinPart* part );
     Q_OBJECT
 public:
     DolphinPartBrowserExtension( DolphinPart* part );

-    virtual void restoreState(QDataStream &stream);
-    virtual void saveState(QDataStream &stream);
+    virtual void restoreState(QDataStream &stream) Q_DECL_OVERRIDE;
+    virtual void saveState(QDataStream &stream) Q_DECL_OVERRIDE;

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

-    void pasteTo(const KUrl&);
+    void pasteTo(const QUrl &);

     void reparseConfiguration();
 
 private:
     void reparseConfiguration();
 
 private:


@@ -53,10 +54,10 @@ class DolphinPartFileInfoExtension : public KParts::FileInfoExtension
 public:
     DolphinPartFileInfoExtension(DolphinPart* part);
 
 public:
     DolphinPartFileInfoExtension(DolphinPart* part);
 

-    virtual QueryModes supportedQueryModes() const;
-    virtual bool hasSelection() const;
+    virtual QueryModes supportedQueryModes() const Q_DECL_OVERRIDE;
+    virtual bool hasSelection() const Q_DECL_OVERRIDE;

 
 

-    virtual KFileItemList queryFor(QueryMode mode) const;
+    virtual KFileItemList queryFor(QueryMode mode) const Q_DECL_OVERRIDE;

 
 private:
     DolphinPart* m_part;
 
 private:
     DolphinPart* m_part;


@@ -68,10 +69,10 @@ class DolphinPartListingFilterExtension : public KParts::ListingFilterExtension
 
 public:
     DolphinPartListingFilterExtension(DolphinPart* part);
 
 public:
     DolphinPartListingFilterExtension(DolphinPart* part);

-    virtual FilterModes supportedFilterModes() const;
-    virtual bool supportsMultipleFilters(FilterMode mode) const;
-    virtual QVariant filter(FilterMode mode) const;
-    virtual void setFilter(FilterMode mode, const QVariant& filter);
+    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;

 
 private:
     DolphinPart* m_part;
 
 private:
     DolphinPart* m_part;


@@ -83,7 +84,7 @@ class DolphinPartListingNotificationExtension : public KParts::ListingNotificati
 
 public:
     DolphinPartListingNotificationExtension(DolphinPart* part);
 
 public:
     DolphinPartListingNotificationExtension(DolphinPart* part);

-    virtual NotificationEventTypes supportedNotificationEventTypes() const;
+    virtual NotificationEventTypes supportedNotificationEventTypes() const Q_DECL_OVERRIDE;

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