From kde-commits Fri Jul 31 22:24:43 2015 From: Sergio Martins Date: Fri, 31 Jul 2015 22:24:43 +0000 To: kde-commits Subject: [kdepim] korganizer: korganizer: Use Q_DECL_OVERRIDE Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=143838149312951 Git commit 09da10f0c93429c06ee8d1dc1957d235fc69bf9d by Sergio Martins. Committed on 31/07/2015 at 22:24. Pushed by smartins into branch 'master'. korganizer: Use Q_DECL_OVERRIDE M +1 -1 korganizer/akonadicollectionview.cpp M +6 -6 korganizer/views/collectionview/quickview.cpp http://commits.kde.org/kdepim/09da10f0c93429c06ee8d1dc1957d235fc69bf9d diff --git a/korganizer/akonadicollectionview.cpp b/korganizer/akonadicolle= ctionview.cpp index a549f20..7667476 100644 --- a/korganizer/akonadicollectionview.cpp +++ b/korganizer/akonadicollectionview.cpp @@ -288,7 +288,7 @@ public: return score; } = - bool lessThan(const QModelIndex &left, const QModelIndex &right) const + bool lessThan(const QModelIndex &left, const QModelIndex &right) const= Q_DECL_OVERRIDE { const int leftScore =3D score(left); const int rightScore =3D score(right); diff --git a/korganizer/views/collectionview/quickview.cpp b/korganizer/vie= ws/collectionview/quickview.cpp index eeae127..2bf9ba9 100644 --- a/korganizer/views/collectionview/quickview.cpp +++ b/korganizer/views/collectionview/quickview.cpp @@ -46,23 +46,23 @@ class FreebusyViewCalendar : public EventViews::ViewCal= endar { public: virtual ~FreebusyViewCalendar() {}; - virtual bool isValid(const KCalCore::Incidence::Ptr &incidence) const + bool isValid(const KCalCore::Incidence::Ptr &incidence) const Q_DECL_O= VERRIDE { return isValid(incidence->uid()); } = - virtual bool isValid(const QString &incidenceIdentifier) const + bool isValid(const QString &incidenceIdentifier) const Q_DECL_OVERRIDE { return incidenceIdentifier.startsWith(QStringLiteral("fb-")); } = - virtual QString displayName(const KCalCore::Incidence::Ptr &incidence)= const + QString displayName(const KCalCore::Incidence::Ptr &incidence) const Q= _DECL_OVERRIDE { Q_UNUSED(incidence); return i18n("Free/Busy calendar from %1", name); } = - virtual QColor resourceColor(const KCalCore::Incidence::Ptr &incidence= ) const + QColor resourceColor(const KCalCore::Incidence::Ptr &incidence) const = Q_DECL_OVERRIDE { bool ok =3D false; int status =3D incidence->customProperty(QStringLiteral("FREEBUSY"= ).toLatin1(), QStringLiteral("STATUS").toLatin1()).toInt(&ok); @@ -84,12 +84,12 @@ public: } } = - virtual QString iconForIncidence(const KCalCore::Incidence::Ptr &incid= ence) const + QString iconForIncidence(const KCalCore::Incidence::Ptr &incidence) co= nst Q_DECL_OVERRIDE { return QString(); } = - virtual KCalCore::Calendar::Ptr getCalendar() const + KCalCore::Calendar::Ptr getCalendar() const Q_DECL_OVERRIDE { return mCalendar; }