Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / kitemviews / kstandarditemmodel.h

diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h
index 34032bf07319fde4814612e3f0a976664dee623b..288b5b84f7097ec42216c897c88289bf25cdf1d0 100644 (file)
--- a/src/kitemviews/kstandarditemmodel.h
+++ b/src/kitemviews/kstandarditemmodel.h
@@ -20,7 +20,7 @@
 #ifndef KSTANDARDITEMMODEL_H
 #define KSTANDARDITEMMODEL_H
 
-#include <libdolphin_export.h>
+#include "dolphin_export.h"
 #include <kitemviews/kitemmodelbase.h>
 #include <QHash>
 #include <QList>
@@ -35,13 +35,13 @@ class KStandardItem;
  *
  * @see KStandardItem
  */
-class LIBDOLPHINPRIVATE_EXPORT KStandardItemModel : public KItemModelBase
+class DOLPHIN_EXPORT KStandardItemModel : public KItemModelBase
 {
     Q_OBJECT
 
 public:
-    explicit KStandardItemModel(QObject* parent = 0);
-    virtual ~KStandardItemModel();
+    explicit KStandardItemModel(QObject* parent = nullptr);
+    ~KStandardItemModel() override;
 
     /**
      * Inserts the item \a item at the index \a index. If the index
@@ -69,15 +69,16 @@ public:
      */
     void appendItem(KStandardItem* item);
 
-    virtual int count() const;
-    virtual QHash<QByteArray, QVariant> data(int index) const;
-    virtual bool setData(int index, const QHash<QByteArray, QVariant>& values);
-    virtual QMimeData* createMimeData(const QSet<int>& indexes) const;
-    virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const;
-    virtual bool supportsDropping(int index) const;
-    virtual QString roleDescription(const QByteArray& role) const;
-    virtual QList<QPair<int, QVariant> > groups() const;
+    int count() const override;
+    QHash<QByteArray, QVariant> data(int index) const override;
+    bool setData(int index, const QHash<QByteArray, QVariant>& values) override;
+    QMimeData* createMimeData(const KItemSet& indexes) const override;
+    int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const override;
+    bool supportsDropping(int index) const override;
+    QString roleDescription(const QByteArray& role) const override;
+    QList<QPair<int, QVariant> > groups() const override;
 
+    virtual void clear();
 protected:
     /**
      * Is invoked after an item has been inserted and before the signal