From 15b0b3db29636a94f98f5c7cd6d7a33c15bd6421 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Wed, 30 Nov 2016 13:15:38 +0300 Subject: xcb: Replace Q_DECL_OVERRIDE by override We can use 'override' directly since Qt 5.7. Also remove redundant 'virtual' keywords. Change-Id: Ia40be0e1e60e51f9d043ab575fd6b9305ea620b0 Reviewed-by: Shawn Rutledge --- src/plugins/platforms/xcb/qxcbsessionmanager.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/plugins/platforms/xcb/qxcbsessionmanager.h') diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.h b/src/plugins/platforms/xcb/qxcbsessionmanager.h index a184282034..0ad9445361 100644 --- a/src/plugins/platforms/xcb/qxcbsessionmanager.h +++ b/src/plugins/platforms/xcb/qxcbsessionmanager.h @@ -69,17 +69,17 @@ public: void setSessionId(const QString &id) { m_sessionId = id; } void setSessionKey(const QString &key) { m_sessionKey = key; } - bool allowsInteraction() Q_DECL_OVERRIDE; - bool allowsErrorInteraction() Q_DECL_OVERRIDE; - void release() Q_DECL_OVERRIDE; + bool allowsInteraction() override; + bool allowsErrorInteraction() override; + void release() override; - void cancel() Q_DECL_OVERRIDE; + void cancel() override; - void setManagerProperty(const QString &name, const QString &value) Q_DECL_OVERRIDE; - void setManagerProperty(const QString &name, const QStringList &value) Q_DECL_OVERRIDE; + void setManagerProperty(const QString &name, const QString &value) override; + void setManagerProperty(const QString &name, const QStringList &value) override; - bool isPhase2() const Q_DECL_OVERRIDE; - void requestPhase2() Q_DECL_OVERRIDE; + bool isPhase2() const override; + void requestPhase2() override; void exitEventLoop(); -- cgit v1.2.3