From kde-commits  Fri Jul 31 23:52:14 2015
From: Sergio Martins <iamsergio () gmail ! com>
Date: Fri, 31 Jul 2015 23:52:14 +0000
To: kde-commits
Subject: [akonadi-search] search: Use Q_DECL_OVERRIDE
Message-Id: <E1ZLK62-0003uz-TE () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=143838674414109

Git commit 876518a109c9d19ff8eaf6a3fd306f444f1ba3e7 by Sergio Martins.
Committed on 31/07/2015 at 23:51.
Pushed by smartins into branch 'master'.

Use Q_DECL_OVERRIDE

M  +4    -4    search/email/agepostingsource.h
M  +2    -2    search/email/emailsearchstore.h
M  +1    -1    search/note/notesearchstore.h
M  +4    -4    search/pimsearchstore.h

http://commits.kde.org/akonadi-search/876518a109c9d19ff8eaf6a3fd306f444f1ba=
3e7

diff --git a/search/email/agepostingsource.h b/search/email/agepostingsourc=
e.h
index a2f42ea..1d4b801 100644
--- a/search/email/agepostingsource.h
+++ b/search/email/agepostingsource.h
@@ -36,15 +36,15 @@ class AgePostingSource : public Xapian::ValuePostingSou=
rce
 public:
     AgePostingSource(Xapian::valueno slot_);
 =

-    virtual Xapian::weight get_weight() const;
-    virtual Xapian::PostingSource *clone() const;
+    Xapian::weight get_weight() const Q_DECL_OVERRIDE;
+    Xapian::PostingSource *clone() const Q_DECL_OVERRIDE;
 =

-    virtual std::string name() const
+    std::string name() const Q_DECL_OVERRIDE
     {
         return "AgePostingSource";
     }
 =

-    virtual void init(const Xapian::Database &db_);
+    void init(const Xapian::Database &db_) Q_DECL_OVERRIDE;
 =

 private:
     uint m_currentTime_t;
diff --git a/search/email/emailsearchstore.h b/search/email/emailsearchstor=
e.h
index b9ce876..70d39a0 100644
--- a/search/email/emailsearchstore.h
+++ b/search/email/emailsearchstore.h
@@ -49,8 +49,8 @@ public:
 =

 protected:
     virtual Xapian::Query constructQuery(const QString &property, const QV=
ariant &value,
-                                         Term::Comparator com);
-    virtual Xapian::Query finalizeQuery(const Xapian::Query &query);
+                                         Term::Comparator com) Q_DECL_OVER=
RIDE;
+    Xapian::Query finalizeQuery(const Xapian::Query &query) Q_DECL_OVERRID=
E;
 };
 =

 }
diff --git a/search/note/notesearchstore.h b/search/note/notesearchstore.h
index 460ca1f..fe855de 100644
--- a/search/note/notesearchstore.h
+++ b/search/note/notesearchstore.h
@@ -40,7 +40,7 @@ class NoteSearchStore : public PIMSearchStore
 public:
     NoteSearchStore(QObject *parent =3D 0);
 =

-    virtual QStringList types();
+    QStringList types() Q_DECL_OVERRIDE;
 };
 =

 }
diff --git a/search/pimsearchstore.h b/search/pimsearchstore.h
index 679839b..6f3f1c6 100644
--- a/search/pimsearchstore.h
+++ b/search/pimsearchstore.h
@@ -39,7 +39,7 @@ class PIMSearchStore : public XapianSearchStore
 public:
     PIMSearchStore(QObject *parent =3D 0);
 =

-    virtual QStringList types();
+    QStringList types() Q_DECL_OVERRIDE;
 =

 protected:
     QString findDatabase(const QString &databasePath) const;
@@ -48,14 +48,14 @@ protected:
     {
         return Xapian::Query();
     }
-    virtual QByteArray idPrefix()
+    QByteArray idPrefix() Q_DECL_OVERRIDE
     {
         return QByteArray("akonadi");
     }
 =

     virtual Xapian::Query constructQuery(const QString &property, const QV=
ariant &value,
-                                         Term::Comparator com);
-    virtual QUrl constructUrl(const Xapian::docid &docid);
+                                         Term::Comparator com) Q_DECL_OVER=
RIDE;
+    QUrl constructUrl(const Xapian::docid &docid) Q_DECL_OVERRIDE;
 =

     QHash<QString, QString> m_prefix;
=20