diff options
author | Kevin Funk <kfunk@kde.org> | 2018-01-31 14:34:16 +0100 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2018-02-05 13:14:46 +0000 |
commit | b4807a11e816feaa3b541b4e4b02f77c1fafbf48 (patch) | |
tree | 8bbbb202dfd8e283b7bdfeadd1396757669e7f04 /src/plugins/position/positionpoll | |
parent | 4ecd38a9371ceb79abe162c39de6082e112f1053 (diff) | |
download | qtlocation-b4807a11e816feaa3b541b4e4b02f77c1fafbf48.tar.gz |
Replace Q_DECL_OVERRIDE with override
Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/position/positionpoll')
-rw-r--r-- | src/plugins/position/positionpoll/qgeoareamonitor_polling.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h index c40d424b..11161869 100644 --- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h +++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h @@ -57,20 +57,20 @@ public : explicit QGeoAreaMonitorPolling(QObject *parent = 0); ~QGeoAreaMonitorPolling(); - void setPositionInfoSource(QGeoPositionInfoSource *source) Q_DECL_OVERRIDE; - QGeoPositionInfoSource* positionInfoSource() const Q_DECL_OVERRIDE; + void setPositionInfoSource(QGeoPositionInfoSource *source) override; + QGeoPositionInfoSource* positionInfoSource() const override; - Error error() const Q_DECL_OVERRIDE; + Error error() const override; - bool startMonitoring(const QGeoAreaMonitorInfo &monitor) Q_DECL_OVERRIDE; + bool startMonitoring(const QGeoAreaMonitorInfo &monitor) override; bool requestUpdate(const QGeoAreaMonitorInfo &monitor, - const char *signal) Q_DECL_OVERRIDE; - bool stopMonitoring(const QGeoAreaMonitorInfo &monitor) Q_DECL_OVERRIDE; + const char *signal) override; + bool stopMonitoring(const QGeoAreaMonitorInfo &monitor) override; - QList<QGeoAreaMonitorInfo> activeMonitors() const Q_DECL_OVERRIDE; - QList<QGeoAreaMonitorInfo> activeMonitors(const QGeoShape ®ion) const Q_DECL_OVERRIDE; + QList<QGeoAreaMonitorInfo> activeMonitors() const override; + QList<QGeoAreaMonitorInfo> activeMonitors(const QGeoShape ®ion) const override; - QGeoAreaMonitorSource::AreaMonitorFeatures supportedAreaMonitorFeatures() const Q_DECL_OVERRIDE; + QGeoAreaMonitorSource::AreaMonitorFeatures supportedAreaMonitorFeatures() const override; inline bool isValid() { return positionInfoSource(); } @@ -85,8 +85,8 @@ private: QGeoAreaMonitorPollingPrivate* d; QGeoAreaMonitorSource::Error lastError; - void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; - void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &signal) override; + void disconnectNotify(const QMetaMethod &signal) override; int idForSignal(const char *signal); }; |