From kde-commits Fri Jul 31 23:22:48 2015 From: Sergio Martins Date: Fri, 31 Jul 2015 23:22:48 +0000 To: kde-commits Subject: [akonadi-calendar] /: Use Q_DECL_OVERRIDE Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=143838499913760 Git commit 08e4d47daf664e7225df928bd41fef4d625dc3c8 by Sergio Martins. Committed on 31/07/2015 at 23:21. Pushed by smartins into branch 'master'. Use Q_DECL_OVERRIDE M +3 -3 autotests/etmcalendartest.h M +1 -1 src/etmcalendar_p.h M +1 -1 src/freebusymanager_p.h http://commits.kde.org/akonadi-calendar/08e4d47daf664e7225df928bd41fef4d625= dc3c8 diff --git a/autotests/etmcalendartest.h b/autotests/etmcalendartest.h index cb70f3d..90f8f3a 100644 --- a/autotests/etmcalendartest.h +++ b/autotests/etmcalendartest.h @@ -54,9 +54,9 @@ private Q_SLOTS: void testFilterInvitationsChanged(); = public Q_SLOTS: - void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &incidence)= ; /**Q_DECL_OVERRIDE*/ - void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &incidenc= e); /**Q_DECL_OVERRIDE*/ - void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidenc= e); /**Q_DECL_OVERRIDE*/ + void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &incidence)= Q_DECL_OVERRIDE; + void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &incidenc= e) Q_DECL_OVERRIDE; + void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidenc= e) Q_DECL_OVERRIDE; void handleCollectionsAdded(const Akonadi::Collection::List &collectio= nList); = private: diff --git a/src/etmcalendar_p.h b/src/etmcalendar_p.h index 9cf3744..b321373 100644 --- a/src/etmcalendar_p.h +++ b/src/etmcalendar_p.h @@ -70,7 +70,7 @@ public: { } = - QVariant data(const QModelIndex &index, int role) const + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE { if (role =3D=3D Qt::CheckStateRole) { // Don't show the checkbox if the collection can't contain inc= idences diff --git a/src/freebusymanager_p.h b/src/freebusymanager_p.h index 5087f61..7bb69b5 100644 --- a/src/freebusymanager_p.h +++ b/src/freebusymanager_p.h @@ -133,7 +133,7 @@ class FbCheckerJob : public KJob Q_OBJECT public: explicit FbCheckerJob(const QList &urlsToCheck, QObject *parent = =3D Q_NULLPTR); - virtual void start(); + void start() Q_DECL_OVERRIDE; = QUrl validUrl() const; =20