Git commit f5297bcdcebaeddb4b9b5b771fb0f2a8f61858db by Sergio Martins. Committed on 31/07/2015 at 23:15. Pushed by smartins into branch 'master'. Use Q_DECL_OVERRIDE M +1 -1 src/alarm.h M +2 -2 src/calendar.h M +4 -4 src/filestorage.h M +5 -5 src/icaltimezones.h M +1 -1 src/recurrence.h http://commits.kde.org/kcalcore/f5297bcdcebaeddb4b9b5b771fb0f2a8f61858db diff --git a/src/alarm.h b/src/alarm.h index 07316c5..e3a896f 100644 --- a/src/alarm.h +++ b/src/alarm.h @@ -658,7 +658,7 @@ protected: @copydoc CustomProperties::customPropertyUpdated() */ - virtual void customPropertyUpdated(); + void customPropertyUpdated() Q_DECL_OVERRIDE; = /** @copydoc diff --git a/src/calendar.h b/src/calendar.h index acc4084..fc5a002 100644 --- a/src/calendar.h +++ b/src/calendar.h @@ -1375,7 +1375,7 @@ protected: @param uid is the UID for the Incidence that has been updated. @param recurrenceId is possible recurrenceid of incidence. */ - void incidenceUpdated(const QString &uid, const KDateTime &recurrenceI= d); + void incidenceUpdated(const QString &uid, const KDateTime &recurrenceI= d) Q_DECL_OVERRIDE; = /** Let Calendar subclasses set the time specification. @@ -1412,7 +1412,7 @@ protected: @copydoc CustomProperties::customPropertyUpdated() */ - virtual void customPropertyUpdated(); + void customPropertyUpdated() Q_DECL_OVERRIDE; = /** Let Calendar subclasses notify that they enabled an Observer. diff --git a/src/filestorage.h b/src/filestorage.h index d4dc9da..8a2bed4 100644 --- a/src/filestorage.h +++ b/src/filestorage.h @@ -105,22 +105,22 @@ public: /** @copydoc CalStorage::open() */ - bool open(); + bool open() Q_DECL_OVERRIDE; = /** @copydoc CalStorage::load() */ - bool load(); + bool load() Q_DECL_OVERRIDE; = /** @copydoc CalStorage::save() */ - bool save(); + bool save() Q_DECL_OVERRIDE; = /** @copydoc CalStorage::close() */ - bool close(); + bool close() Q_DECL_OVERRIDE; = private: //@cond PRIVATE diff --git a/src/icaltimezones.h b/src/icaltimezones.h index 746726a..853f3b2 100644 --- a/src/icaltimezones.h +++ b/src/icaltimezones.h @@ -332,14 +332,14 @@ public: * * @return new copy */ - virtual KTimeZoneBackend *clone() const; + KTimeZoneBackend *clone() const Q_DECL_OVERRIDE; = /** * Returns the class name of the data represented by this instance. * * @return "ICalTimeZone" */ - virtual QByteArray type() const; + QByteArray type() const Q_DECL_OVERRIDE; = /** * Implements ICalTimeZone::hasTransitions(). @@ -349,7 +349,7 @@ public: * @param caller calling ICalTimeZone object * @return @c true */ - virtual bool hasTransitions(const KTimeZone *caller) const; + bool hasTransitions(const KTimeZone *caller) const Q_DECL_OVERRIDE; = protected: /** @@ -611,7 +611,7 @@ public: * * @return copy of this instance */ - virtual KTimeZoneData *clone() const; + KTimeZoneData *clone() const Q_DECL_OVERRIDE; = /** * Returns the name of the city for this time zone, if any. There is n= o fixed @@ -656,7 +656,7 @@ public: * * @return @c true */ - virtual bool hasTransitions() const; + bool hasTransitions() const Q_DECL_OVERRIDE; = protected: /** diff --git a/src/recurrence.h b/src/recurrence.h index 31ce8a9..b130472 100644 --- a/src/recurrence.h +++ b/src/recurrence.h @@ -638,7 +638,7 @@ public: */ void removeObserver(RecurrenceObserver *observer); = - void recurrenceChanged(RecurrenceRule *); + void recurrenceChanged(RecurrenceRule *) Q_DECL_OVERRIDE; = protected: RecurrenceRule *setNewRecurrenceType(RecurrenceRule::PeriodType type, = int freq);