Replace Q_DECL_OVERRIDE -> override

Change-Id: I0ff4b3434a5d4b26bf68b96db28691186813e10d
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

19 files changed, 195 insertions, 195 deletions

diff --git a/src/remoteobjects/qconnection_local_backend_p.h b/src/remoteobjects/qconnection_local_backend_p.h
index 80ece38..9125a91 100644
--- a/src/remoteobjects/qconnection_local_backend_p.h
+++ b/src/remoteobjects/qconnection_local_backend_p.h
@@ -60,16 +60,16 @@ public:
     explicit LocalClientIo(QObject *parent = nullptr);
     ~LocalClientIo();
 
-    QIODevice *connection() Q_DECL_OVERRIDE;
-    void connectToServer() Q_DECL_OVERRIDE;
-    bool isOpen() Q_DECL_OVERRIDE;
+    QIODevice *connection() override;
+    void connectToServer() override;
+    bool isOpen() override;
 
 public Q_SLOTS:
     void onError(QLocalSocket::LocalSocketError error);
     void onStateChanged(QLocalSocket::LocalSocketState state);
 
 protected:
-    void doClose() Q_DECL_OVERRIDE;
+    void doClose() override;
 private:
     QLocalSocket m_socket;
 };
@@ -80,9 +80,9 @@ class LocalServerIo : public ServerIoDevice
 public:
     explicit LocalServerIo(QLocalSocket *conn, QObject *parent = nullptr);
 
-    QIODevice *connection() const Q_DECL_OVERRIDE;
+    QIODevice *connection() const override;
 protected:
-    void doClose() Q_DECL_OVERRIDE;
+    void doClose() override;
 
 private:
     QLocalSocket *m_connection;
@@ -97,12 +97,12 @@ public:
     explicit LocalServerImpl(QObject *parent);
     ~LocalServerImpl();
 
-    bool hasPendingConnections() const Q_DECL_OVERRIDE;
-    ServerIoDevice *configureNewConnection() Q_DECL_OVERRIDE;
-    QUrl address() const Q_DECL_OVERRIDE;
-    bool listen(const QUrl &address) Q_DECL_OVERRIDE;
-    QAbstractSocket::SocketError serverError() const Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool hasPendingConnections() const override;
+    ServerIoDevice *configureNewConnection() override;
+    QUrl address() const override;
+    bool listen(const QUrl &address) override;
+    QAbstractSocket::SocketError serverError() const override;
+    void close() override;
 
 private:
     QLocalServer m_server;
diff --git a/src/remoteobjects/qconnection_qnx_backend_p.h b/src/remoteobjects/qconnection_qnx_backend_p.h
index cae0608..b1696db 100644
--- a/src/remoteobjects/qconnection_qnx_backend_p.h
+++ b/src/remoteobjects/qconnection_qnx_backend_p.h
@@ -95,16 +95,16 @@ public:
     explicit QnxClientIo(QObject *parent = nullptr);
     ~QnxClientIo();
 
-    QIODevice *connection() Q_DECL_OVERRIDE;
-    void connectToServer() Q_DECL_OVERRIDE;
-    bool isOpen() Q_DECL_OVERRIDE;
+    QIODevice *connection() override;
+    void connectToServer() override;
+    bool isOpen() override;
 
 public Q_SLOTS:
     void onError(QAbstractSocket::SocketError error);
     void onStateChanged(QAbstractSocket::SocketState state);
 
 protected:
-    void doClose() Q_DECL_OVERRIDE;
+    void doClose() override;
 private:
     QQnxNativeIo m_socket;
 };
@@ -114,9 +114,9 @@ class QnxServerIo : public ServerIoDevice
 public:
     explicit QnxServerIo(QIOQnxSource *conn, QObject *parent = nullptr);
 
-    QIODevice *connection() const Q_DECL_OVERRIDE;
+    QIODevice *connection() const override;
 protected:
-    void doClose() Q_DECL_OVERRIDE;
+    void doClose() override;
 
 private:
     //TODO Source or Replica
@@ -131,12 +131,12 @@ public:
     explicit QnxServerImpl(QObject *parent);
     ~QnxServerImpl();
 
-    bool hasPendingConnections() const Q_DECL_OVERRIDE;
-    ServerIoDevice *configureNewConnection() Q_DECL_OVERRIDE;
-    QUrl address() const Q_DECL_OVERRIDE;
-    bool listen(const QUrl &address) Q_DECL_OVERRIDE;
-    QAbstractSocket::SocketError serverError() const Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool hasPendingConnections() const override;
+    ServerIoDevice *configureNewConnection() override;
+    QUrl address() const override;
+    bool listen(const QUrl &address) override;
+    QAbstractSocket::SocketError serverError() const override;
+    void close() override;
 
 private:
     QQnxNativeServer m_server;
diff --git a/src/remoteobjects/qconnection_qnx_global_p.h b/src/remoteobjects/qconnection_qnx_global_p.h
index 7846160..0228dc6 100644
--- a/src/remoteobjects/qconnection_qnx_global_p.h
+++ b/src/remoteobjects/qconnection_qnx_global_p.h
@@ -96,7 +96,7 @@ public:
         if (!name.isEmpty())
             setObjectName(name);
     }
-    void run() Q_DECL_OVERRIDE
+    void run() override
     {
         m_obj->thread_func();
     }
diff --git a/src/remoteobjects/qconnection_qnx_qiodevices.h b/src/remoteobjects/qconnection_qnx_qiodevices.h
index 7e8ba2d..1c486aa 100644
--- a/src/remoteobjects/qconnection_qnx_qiodevices.h
+++ b/src/remoteobjects/qconnection_qnx_qiodevices.h
@@ -75,20 +75,20 @@ public:
     QString serverName() const;
 
     void abort();
-    bool isSequential() const Q_DECL_OVERRIDE;
-    qint64 bytesAvailable() const Q_DECL_OVERRIDE;
-    qint64 bytesToWrite() const Q_DECL_OVERRIDE;
-    bool open(OpenMode openMode = ReadWrite) Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool isSequential() const override;
+    qint64 bytesAvailable() const override;
+    qint64 bytesToWrite() const override;
+    bool open(OpenMode openMode = ReadWrite) override;
+    void close() override;
     QAbstractSocket::SocketError error() const;
     bool flush();
     bool isValid() const;
 
     QAbstractSocket::SocketState state() const;
-    bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE;
+    bool waitForBytesWritten(int msecs = 30000) override;
     bool waitForConnected(int msecs = 30000);
     bool waitForDisconnected(int msecs = 30000);
-    bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE;
+    bool waitForReadyRead(int msecs = 30000) override;
 
 Q_SIGNALS:
     void connected();
@@ -97,8 +97,8 @@ Q_SIGNALS:
     void stateChanged(QAbstractSocket::SocketState socketState);
 
 protected:
-    qint64 readData(char*, qint64) Q_DECL_OVERRIDE;
-    qint64 writeData(const char*, qint64) Q_DECL_OVERRIDE;
+    qint64 readData(char*, qint64) override;
+    qint64 writeData(const char*, qint64) override;
 
 private:
     Q_DISABLE_COPY(QQnxNativeIo)
@@ -114,18 +114,18 @@ public:
     explicit QIOQnxSource(int rcvid, QObject *parent = nullptr);
     ~QIOQnxSource();
 
-    bool isSequential() const Q_DECL_OVERRIDE;
-    qint64 bytesAvailable() const Q_DECL_OVERRIDE;
-    qint64 bytesToWrite() const Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool isSequential() const override;
+    qint64 bytesAvailable() const override;
+    qint64 bytesToWrite() const override;
+    void close() override;
     QAbstractSocket::SocketError error() const;
     bool isValid() const;
 
     QAbstractSocket::SocketState state() const;
-    bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE;
+    bool waitForBytesWritten(int msecs = 30000) override;
     bool waitForConnected(int msecs = 30000);
     bool waitForDisconnected(int msecs = 30000);
-    bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE;
+    bool waitForReadyRead(int msecs = 30000) override;
 
 Q_SIGNALS:
     void disconnected();
@@ -133,9 +133,9 @@ Q_SIGNALS:
     void stateChanged(QAbstractSocket::SocketState socketState);
 
 protected:
-    qint64 readData(char*, qint64) Q_DECL_OVERRIDE;
-    qint64 writeData(const char*, qint64) Q_DECL_OVERRIDE;
-    bool open(OpenMode openMode) Q_DECL_OVERRIDE;
+    qint64 readData(char*, qint64) override;
+    qint64 writeData(const char*, qint64) override;
+    bool open(OpenMode openMode) override;
 
 private Q_SLOTS:
     void onDisconnected();
diff --git a/src/remoteobjects/qconnection_tcpip_backend_p.h b/src/remoteobjects/qconnection_tcpip_backend_p.h
index 25124a9..c929586 100644
--- a/src/remoteobjects/qconnection_tcpip_backend_p.h
+++ b/src/remoteobjects/qconnection_tcpip_backend_p.h
@@ -60,16 +60,16 @@ public:
     explicit TcpClientIo(QObject *parent = nullptr);
     ~TcpClientIo();
 
-    QIODevice *connection() Q_DECL_OVERRIDE;
-    void connectToServer() Q_DECL_OVERRIDE;
-    bool isOpen() Q_DECL_OVERRIDE;
+    QIODevice *connection() override;
+    void connectToServer() override;
+    bool isOpen() override;
 
 public Q_SLOTS:
     void onError(QAbstractSocket::SocketError error);
     void onStateChanged(QAbstractSocket::SocketState state);
 
 protected:
-    void doClose() Q_DECL_OVERRIDE;
+    void doClose() override;
 
 private:
     QTcpSocket m_socket;
@@ -81,9 +81,9 @@ class TcpServerIo : public ServerIoDevice
 public:
     explicit TcpServerIo(QTcpSocket *conn, QObject *parent = nullptr);
 
-    QIODevice *connection() const Q_DECL_OVERRIDE;
+    QIODevice *connection() const override;
 protected:
-    void doClose() Q_DECL_OVERRIDE;
+    void doClose() override;
 
 private:
     QTcpSocket *m_connection;
@@ -98,12 +98,12 @@ public:
     explicit TcpServerImpl(QObject *parent);
     ~TcpServerImpl();
 
-    bool hasPendingConnections() const Q_DECL_OVERRIDE;
-    ServerIoDevice *configureNewConnection() Q_DECL_OVERRIDE;
-    QUrl address() const Q_DECL_OVERRIDE;
-    bool listen(const QUrl &address) Q_DECL_OVERRIDE;
-    QAbstractSocket::SocketError serverError() const Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool hasPendingConnections() const override;
+    ServerIoDevice *configureNewConnection() override;
+    QUrl address() const override;
+    bool listen(const QUrl &address) override;
+    QAbstractSocket::SocketError serverError() const override;
+    void close() override;
 
 private:
     QTcpServer m_server;
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h b/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h
index d5d9b8e..3d82dfd 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h
@@ -137,34 +137,34 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         _methods[5] = qtro_method_index<AdapterType>(&AdapterType::replicaSetData, static_cast<void (QObject::*)(IndexList,QVariant,int)>(0),"replicaSetData(IndexList,QVariant,int)",methodArgCount+4,&methodArgTypes[4]);
     }
 
-    QString name() const Q_DECL_OVERRIDE { return m_name; }
-    QString typeName() const Q_DECL_OVERRIDE { return QStringLiteral("QAbstractItemModelAdapter"); }
-    int propertyCount() const Q_DECL_OVERRIDE { return _properties[0]; }
-    int signalCount() const Q_DECL_OVERRIDE { return _signals[0]; }
-    int methodCount() const Q_DECL_OVERRIDE { return _methods[0]; }
-    int sourcePropertyIndex(int index) const Q_DECL_OVERRIDE
+    QString name() const override { return m_name; }
+    QString typeName() const override { return QStringLiteral("QAbstractItemModelAdapter"); }
+    int propertyCount() const override { return _properties[0]; }
+    int signalCount() const override { return _signals[0]; }
+    int methodCount() const override { return _methods[0]; }
+    int sourcePropertyIndex(int index) const override
     {
         if (index < 0 || index >= _properties[0])
             return -1;
         return _properties[index+1];
     }
-    int sourceSignalIndex(int index) const Q_DECL_OVERRIDE
+    int sourceSignalIndex(int index) const override
     {
         if (index < 0 || index >= _signals[0])
             return -1;
         return _signals[index+1];
     }
-    int sourceMethodIndex(int index) const Q_DECL_OVERRIDE
+    int sourceMethodIndex(int index) const override
     {
         if (index < 0 || index >= _methods[0])
             return -1;
         return _methods[index+1];
     }
-    int signalParameterCount(int index) const Q_DECL_OVERRIDE { return signalArgCount[index]; }
-    int signalParameterType(int sigIndex, int paramIndex) const Q_DECL_OVERRIDE { return signalArgTypes[sigIndex][paramIndex]; }
-    int methodParameterCount(int index) const Q_DECL_OVERRIDE { return methodArgCount[index]; }
-    int methodParameterType(int methodIndex, int paramIndex) const Q_DECL_OVERRIDE { return methodArgTypes[methodIndex][paramIndex]; }
-    int propertyIndexFromSignal(int index) const Q_DECL_OVERRIDE
+    int signalParameterCount(int index) const override { return signalArgCount[index]; }
+    int signalParameterType(int sigIndex, int paramIndex) const override { return signalArgTypes[sigIndex][paramIndex]; }
+    int methodParameterCount(int index) const override { return methodArgCount[index]; }
+    int methodParameterType(int methodIndex, int paramIndex) const override { return methodArgTypes[methodIndex][paramIndex]; }
+    int propertyIndexFromSignal(int index) const override
     {
         switch (index) {
         case 0: return _properties[1];
@@ -172,7 +172,7 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         }
         return -1;
     }
-    int propertyRawIndexFromSignal(int index) const Q_DECL_OVERRIDE
+    int propertyRawIndexFromSignal(int index) const override
     {
         switch (index) {
         case 0: return 0;
@@ -180,7 +180,7 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         }
         return -1;
     }
-    const QByteArray signalSignature(int index) const Q_DECL_OVERRIDE
+    const QByteArray signalSignature(int index) const override
     {
         switch (index) {
         case 0: return QByteArrayLiteral("availableRolesChanged()");
@@ -195,7 +195,7 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         }
         return QByteArrayLiteral("");
     }
-    const QByteArray methodSignature(int index) const Q_DECL_OVERRIDE
+    const QByteArray methodSignature(int index) const override
     {
         switch (index) {
         case 0: return QByteArrayLiteral("replicaSizeRequest(IndexList)");
@@ -206,11 +206,11 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         }
         return QByteArrayLiteral("");
     }
-    QMetaMethod::MethodType methodType(int) const Q_DECL_OVERRIDE
+    QMetaMethod::MethodType methodType(int) const override
     {
         return QMetaMethod::Slot;
     }
-    const QByteArray typeName(int index) const Q_DECL_OVERRIDE
+    const QByteArray typeName(int index) const override
     {
         switch (index) {
         case 0: return QByteArrayLiteral("QSize");
@@ -220,8 +220,8 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         }
         return QByteArrayLiteral("");
     }
-    QByteArray objectSignature() const Q_DECL_OVERRIDE { return QByteArray{}; }
-    bool isAdapterSignal(int index) const Q_DECL_OVERRIDE
+    QByteArray objectSignature() const override { return QByteArray{}; }
+    bool isAdapterSignal(int index) const override
     {
         switch (index) {
         case 0:
@@ -235,7 +235,7 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         }
         return false;
     }
-    bool isAdapterMethod(int index) const Q_DECL_OVERRIDE
+    bool isAdapterMethod(int index) const override
     {
         switch (index) {
         case 0:
@@ -247,7 +247,7 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         }
         return false;
     }
-    bool isAdapterProperty(int index) const Q_DECL_OVERRIDE
+    bool isAdapterProperty(int index) const override
     {
         switch (index) {
         case 0:
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
index e72df09..bacd0d3 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
@@ -51,17 +51,17 @@ public:
 
     QItemSelectionModel* selectionModel() const;
 
-    QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
-    QModelIndex parent(const QModelIndex & index) const  Q_DECL_OVERRIDE;
-    QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    bool hasChildren(const QModelIndex & parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    int rowCount(const QModelIndex & parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    int columnCount(const QModelIndex & parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE;
-    Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+    QModelIndex parent(const QModelIndex & index) const  override;
+    QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const override;
+    bool hasChildren(const QModelIndex & parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex & parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex & parent = QModelIndex()) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
     QVector<int> availableRoles() const;
-    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    QHash<int, QByteArray> roleNames() const override;
 
     bool isInitialized() const;
     bool hasData(const QModelIndex &index, int role) const;
diff --git a/src/remoteobjects/qremoteobjectdynamicreplica.h b/src/remoteobjects/qremoteobjectdynamicreplica.h
index 1a509b9..619d6d6 100644
--- a/src/remoteobjects/qremoteobjectdynamicreplica.h
+++ b/src/remoteobjects/qremoteobjectdynamicreplica.h
@@ -43,9 +43,9 @@ class Q_REMOTEOBJECTS_EXPORT QRemoteObjectDynamicReplica : public QRemoteObjectR
 public:
     ~QRemoteObjectDynamicReplica();
 
-    const QMetaObject *metaObject() const Q_DECL_OVERRIDE;
-    void *qt_metacast(const char *name) Q_DECL_OVERRIDE;
-    int qt_metacall(QMetaObject::Call call, int id, void **argv) Q_DECL_OVERRIDE;
+    const QMetaObject *metaObject() const override;
+    void *qt_metacast(const char *name) override;
+    int qt_metacall(QMetaObject::Call call, int id, void **argv) override;
 
 private:
     explicit QRemoteObjectDynamicReplica();
diff --git a/src/remoteobjects/qremoteobjectnode.h b/src/remoteobjects/qremoteobjectnode.h
index b784568..45556fb 100644
--- a/src/remoteobjects/qremoteobjectnode.h
+++ b/src/remoteobjects/qremoteobjectnode.h
@@ -148,7 +148,7 @@ class Q_REMOTEOBJECTS_EXPORT QRemoteObjectHostBase : public QRemoteObjectNode
 {
     Q_OBJECT
 public:
-    void setName(const QString &name) Q_DECL_OVERRIDE;
+    void setName(const QString &name) override;
 
     template <template <typename> class ApiDefinition, typename ObjectType>
     bool enableRemoting(ObjectType *object)
@@ -178,8 +178,8 @@ public:
     QRemoteObjectHost(const QUrl &address, const QUrl &registryAddress = QUrl(), QObject *parent = nullptr);
     QRemoteObjectHost(const QUrl &address, QObject *parent);
     virtual ~QRemoteObjectHost();
-    QUrl hostUrl() const Q_DECL_OVERRIDE;
-    bool setHostUrl(const QUrl &hostAddress) Q_DECL_OVERRIDE;
+    QUrl hostUrl() const override;
+    bool setHostUrl(const QUrl &hostAddress) override;
 
 protected:
     QRemoteObjectHost(QRemoteObjectHostPrivate &, QObject *);
@@ -194,7 +194,7 @@ class Q_REMOTEOBJECTS_EXPORT QRemoteObjectRegistryHost : public QRemoteObjectHos
 public:
     QRemoteObjectRegistryHost(const QUrl &registryAddress = QUrl(), QObject *parent = nullptr);
     virtual ~QRemoteObjectRegistryHost();
-    bool setRegistryUrl(const QUrl &registryUrl) Q_DECL_OVERRIDE;
+    bool setRegistryUrl(const QUrl &registryUrl) override;
 
 protected:
     QRemoteObjectRegistryHost(QRemoteObjectRegistryHostPrivate &, QObject *);
diff --git a/src/remoteobjects/qremoteobjectnode_p.h b/src/remoteobjects/qremoteobjectnode_p.h
index 52382ac..d646b28 100644
--- a/src/remoteobjects/qremoteobjectnode_p.h
+++ b/src/remoteobjects/qremoteobjectnode_p.h
@@ -131,7 +131,7 @@ class QRemoteObjectHostBasePrivate : public QRemoteObjectNodePrivate
 public:
     QRemoteObjectHostBasePrivate();
     virtual ~QRemoteObjectHostBasePrivate() {}
-    QReplicaPrivateInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name) Q_DECL_OVERRIDE;
+    QReplicaPrivateInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name) override;
 
 public:
     QRemoteObjectSourceIo *remoteObjectIo;
@@ -151,7 +151,7 @@ class QRemoteObjectRegistryHostPrivate : public QRemoteObjectHostBasePrivate
 public:
     QRemoteObjectRegistryHostPrivate();
     virtual ~QRemoteObjectRegistryHostPrivate() {}
-    QRemoteObjectSourceLocations remoteObjectAddresses() const Q_DECL_OVERRIDE;
+    QRemoteObjectSourceLocations remoteObjectAddresses() const override;
     QRegistrySource *registrySource;
     Q_DECLARE_PUBLIC(QRemoteObjectRegistryHost);
 };
diff --git a/src/remoteobjects/qremoteobjectregistry.h b/src/remoteobjects/qremoteobjectregistry.h
index 95a649c..1ba3254 100644
--- a/src/remoteobjects/qremoteobjectregistry.h
+++ b/src/remoteobjects/qremoteobjectregistry.h
@@ -62,7 +62,7 @@ protected Q_SLOTS:
     void pushToRegistryIfNeeded();
 
 private:
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
     explicit QRemoteObjectRegistry();
     explicit QRemoteObjectRegistry(QRemoteObjectNode *node, const QString &name);
     QRemoteObjectSourceLocations hostedSources;
diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h
index 899c159..50c3dd0 100644
--- a/src/remoteobjects/qremoteobjectreplica_p.h
+++ b/src/remoteobjects/qremoteobjectreplica_p.h
@@ -91,16 +91,16 @@ public:
     explicit QStubReplicaPrivate();
     virtual ~QStubReplicaPrivate();
 
-    const QVariant getProperty(int i) const Q_DECL_OVERRIDE;
-    void setProperties(const QVariantList &) Q_DECL_OVERRIDE;
-    void setProperty(int i, const QVariant &) Q_DECL_OVERRIDE;
-    bool isInitialized() const Q_DECL_OVERRIDE { return false; }
-    QRemoteObjectReplica::State state() const Q_DECL_OVERRIDE { return QRemoteObjectReplica::State::Uninitialized;}
-    bool waitForSource(int) Q_DECL_OVERRIDE { return false; }
-    QRemoteObjectNode *node() const Q_DECL_OVERRIDE { return nullptr; }
-
-    void _q_send(QMetaObject::Call call, int index, const QVariantList &args) Q_DECL_OVERRIDE;
-    QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args) Q_DECL_OVERRIDE;
+    const QVariant getProperty(int i) const override;
+    void setProperties(const QVariantList &) override;
+    void setProperty(int i, const QVariant &) override;
+    bool isInitialized() const override { return false; }
+    QRemoteObjectReplica::State state() const override { return QRemoteObjectReplica::State::Uninitialized;}
+    bool waitForSource(int) override { return false; }
+    QRemoteObjectNode *node() const override { return nullptr; }
+
+    void _q_send(QMetaObject::Call call, int index, const QVariantList &args) override;
+    QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args) override;
     QVariantList m_propertyStorage;
 };
 
@@ -112,22 +112,22 @@ public:
 
     bool needsDynamicInitialization() const;
 
-    virtual const QVariant getProperty(int i) const Q_DECL_OVERRIDE = 0;
-    virtual void setProperties(const QVariantList &) Q_DECL_OVERRIDE = 0;
-    virtual void setProperty(int i, const QVariant &) Q_DECL_OVERRIDE = 0;
+    virtual const QVariant getProperty(int i) const override = 0;
+    virtual void setProperties(const QVariantList &) override = 0;
+    virtual void setProperty(int i, const QVariant &) override = 0;
     virtual bool isShortCircuit() const = 0;
-    virtual bool isInitialized() const Q_DECL_OVERRIDE { return true; }
-    QRemoteObjectReplica::State state() const Q_DECL_OVERRIDE { return QRemoteObjectReplica::State(m_state.load()); }
+    virtual bool isInitialized() const override { return true; }
+    QRemoteObjectReplica::State state() const override { return QRemoteObjectReplica::State(m_state.load()); }
     void setState(QRemoteObjectReplica::State state);
-    virtual bool waitForSource(int) Q_DECL_OVERRIDE { return true; }
+    virtual bool waitForSource(int) override { return true; }
     virtual bool waitForFinished(const QRemoteObjectPendingCall &, int) { return true; }
     virtual void notifyAboutReply(int, const QVariant &) {}
     virtual void configurePrivate(QRemoteObjectReplica *);
     void emitInitialized();
-    QRemoteObjectNode *node() const Q_DECL_OVERRIDE { return m_node; }
+    QRemoteObjectNode *node() const override { return m_node; }
 
-    virtual void _q_send(QMetaObject::Call call, int index, const QVariantList &args) Q_DECL_OVERRIDE = 0;
-    virtual QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args) Q_DECL_OVERRIDE = 0;
+    virtual void _q_send(QMetaObject::Call call, int index, const QVariantList &args) override = 0;
+    virtual QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args) override = 0;
 
     //Dynamic replica functions
     virtual void initializeMetaObject(const QMetaObjectBuilder &builder, const QVariantList &values);
@@ -150,26 +150,26 @@ class QConnectedReplicaPrivate : public QRemoteObjectReplicaPrivate
 public:
     explicit QConnectedReplicaPrivate(const QString &name, const QMetaObject *, QRemoteObjectNode *);
     virtual ~QConnectedReplicaPrivate();
-    const QVariant getProperty(int i) const Q_DECL_OVERRIDE;
-    void setProperties(const QVariantList &) Q_DECL_OVERRIDE;
-    void setProperty(int i, const QVariant &) Q_DECL_OVERRIDE;
-    bool isShortCircuit() const Q_DECL_OVERRIDE { return false; }
-    bool isInitialized() const Q_DECL_OVERRIDE;
-    bool waitForSource(int timeout) Q_DECL_OVERRIDE;
+    const QVariant getProperty(int i) const override;
+    void setProperties(const QVariantList &) override;
+    void setProperty(int i, const QVariant &) override;
+    bool isShortCircuit() const override { return false; }
+    bool isInitialized() const override;
+    bool waitForSource(int timeout) override;
     void initialize(const QVariantList &values);
-    void configurePrivate(QRemoteObjectReplica *) Q_DECL_OVERRIDE;
+    void configurePrivate(QRemoteObjectReplica *) override;
     void requestRemoteObjectSource();
     bool sendCommand();
     QRemoteObjectPendingCall sendCommandWithReply(int serialId);
-    bool waitForFinished(const QRemoteObjectPendingCall &call, int timeout) Q_DECL_OVERRIDE;
-    void notifyAboutReply(int ackedSerialId, const QVariant &value) Q_DECL_OVERRIDE;
+    bool waitForFinished(const QRemoteObjectPendingCall &call, int timeout) override;
+    void notifyAboutReply(int ackedSerialId, const QVariant &value) override;
     void setConnection(ClientIoDevice *conn);
     void setDisconnected();
 
-    void _q_send(QMetaObject::Call call, int index, const QVariantList &args) Q_DECL_OVERRIDE;
-    QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList& args) Q_DECL_OVERRIDE;
+    void _q_send(QMetaObject::Call call, int index, const QVariantList &args) override;
+    QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList& args) override;
 
-    void initializeMetaObject(const QMetaObjectBuilder&, const QVariantList&) Q_DECL_OVERRIDE;
+    void initializeMetaObject(const QMetaObjectBuilder&, const QVariantList&) override;
     QVector<QRemoteObjectReplica *> m_parentsNeedingConnect;
     QVariantList m_propertyStorage;
     QPointer<ClientIoDevice> connectionToSource;
@@ -186,13 +186,13 @@ public:
     explicit QInProcessReplicaPrivate(const QString &name, const QMetaObject *, QRemoteObjectNode *);
     virtual ~QInProcessReplicaPrivate();
 
-    const QVariant getProperty(int i) const Q_DECL_OVERRIDE;
-    void setProperties(const QVariantList &) Q_DECL_OVERRIDE;
-    void setProperty(int i, const QVariant &) Q_DECL_OVERRIDE;
-    bool isShortCircuit() const Q_DECL_OVERRIDE { return true; }
+    const QVariant getProperty(int i) const override;
+    void setProperties(const QVariantList &) override;
+    void setProperty(int i, const QVariant &) override;
+    bool isShortCircuit() const override { return true; }
 
-    void _q_send(QMetaObject::Call call, int index, const QVariantList &args) Q_DECL_OVERRIDE;
-    QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList& args) Q_DECL_OVERRIDE;
+    void _q_send(QMetaObject::Call call, int index, const QVariantList &args) override;
+    QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList& args) override;
 
     QPointer<QRemoteObjectSource> connectionToSource;
 };
diff --git a/src/remoteobjects/qremoteobjectsource_p.h b/src/remoteobjects/qremoteobjectsource_p.h
index 94deccd..e855f29 100644
--- a/src/remoteobjects/qremoteobjectsource_p.h
+++ b/src/remoteobjects/qremoteobjectsource_p.h
@@ -89,52 +89,52 @@ class DynamicApiMap : public SourceApiMap
 public:
     DynamicApiMap(const QMetaObject *metaObject, const QString &name, const QString &typeName);
     ~DynamicApiMap() {}
-    QString name() const Q_DECL_OVERRIDE { return m_name; }
-    QString typeName() const Q_DECL_OVERRIDE { return m_typeName; }
-    int propertyCount() const Q_DECL_OVERRIDE { return m_properties.size(); }
-    int signalCount() const Q_DECL_OVERRIDE { return m_signals.size(); }
-    int methodCount() const Q_DECL_OVERRIDE { return m_methods.size(); }
-    int sourcePropertyIndex(int index) const Q_DECL_OVERRIDE
+    QString name() const override { return m_name; }
+    QString typeName() const override { return m_typeName; }
+    int propertyCount() const override { return m_properties.size(); }
+    int signalCount() const override { return m_signals.size(); }
+    int methodCount() const override { return m_methods.size(); }
+    int sourcePropertyIndex(int index) const override
     {
         if (index < 0 || index >= propertyCount())
             return -1;
         return m_properties.at(index);
     }
-    int sourceSignalIndex(int index) const Q_DECL_OVERRIDE
+    int sourceSignalIndex(int index) const override
     {
         if (index < 0 || index >= signalCount())
             return -1;
         return m_signals.at(index);
     }
-    int sourceMethodIndex(int index) const Q_DECL_OVERRIDE
+    int sourceMethodIndex(int index) const override
     {
         if (index < 0 || index >= methodCount())
             return -1;
         return m_methods.at(index);
     }
-    int signalParameterCount(int index) const Q_DECL_OVERRIDE { return parameterCount(m_signals.at(index)); }
-    int signalParameterType(int sigIndex, int paramIndex) const Q_DECL_OVERRIDE { return parameterType(m_signals.at(sigIndex), paramIndex); }
-    const QByteArray signalSignature(int index) const Q_DECL_OVERRIDE { return signature(m_signals.at(index)); }
-    int methodParameterCount(int index) const Q_DECL_OVERRIDE { return parameterCount(m_methods.at(index)); }
-    int methodParameterType(int methodIndex, int paramIndex) const Q_DECL_OVERRIDE { return parameterType(m_methods.at(methodIndex), paramIndex); }
-    const QByteArray methodSignature(int index) const Q_DECL_OVERRIDE { return signature(m_methods.at(index)); }
-    QMetaMethod::MethodType methodType(int index) const Q_DECL_OVERRIDE;
-    const QByteArray typeName(int index) const Q_DECL_OVERRIDE;
-    int propertyIndexFromSignal(int index) const Q_DECL_OVERRIDE
+    int signalParameterCount(int index) const override { return parameterCount(m_signals.at(index)); }
+    int signalParameterType(int sigIndex, int paramIndex) const override { return parameterType(m_signals.at(sigIndex), paramIndex); }
+    const QByteArray signalSignature(int index) const override { return signature(m_signals.at(index)); }
+    int methodParameterCount(int index) const override { return parameterCount(m_methods.at(index)); }
+    int methodParameterType(int methodIndex, int paramIndex) const override { return parameterType(m_methods.at(methodIndex), paramIndex); }
+    const QByteArray methodSignature(int index) const override { return signature(m_methods.at(index)); }
+    QMetaMethod::MethodType methodType(int index) const override;
+    const QByteArray typeName(int index) const override;
+    int propertyIndexFromSignal(int index) const override
     {
         if (index >= 0 && index < m_propertyAssociatedWithSignal.size())
             return m_properties.at(m_propertyAssociatedWithSignal.at(index));
         return -1;
     }
-    int propertyRawIndexFromSignal(int index) const Q_DECL_OVERRIDE
+    int propertyRawIndexFromSignal(int index) const override
     {
         if (index >= 0 && index < m_propertyAssociatedWithSignal.size())
             return m_propertyAssociatedWithSignal.at(index);
         return -1;
     }
-    QByteArray objectSignature() const Q_DECL_OVERRIDE { return m_objectSignature; }
+    QByteArray objectSignature() const override { return m_objectSignature; }
 
-    bool isDynamic() const Q_DECL_OVERRIDE { return true; }
+    bool isDynamic() const override { return true; }
 private:
     int parameterCount(int objectIndex) const;
     int parameterType(int objectIndex, int paramIndex) const;
diff --git a/tests/auto/integration/engine.h b/tests/auto/integration/engine.h
index 9e9d036..732ccce 100644
--- a/tests/auto/integration/engine.h
+++ b/tests/auto/integration/engine.h
@@ -45,23 +45,23 @@ public:
     Engine(QObject *parent = nullptr);
     virtual ~Engine();
 
-    bool start() Q_DECL_OVERRIDE;
-    void increaseRpm(int deltaRpm) Q_DECL_OVERRIDE;
+    bool start() override;
+    void increaseRpm(int deltaRpm) override;
 
-    void unnormalizedSignature(int, int) Q_DECL_OVERRIDE {}
+    void unnormalizedSignature(int, int) override {}
 
-    Temperature temperature() Q_DECL_OVERRIDE;
+    Temperature temperature() override;
     void setTemperature(const Temperature &value);
 
-    void setSharedTemperature(const Temperature::Ptr &) Q_DECL_OVERRIDE {}
+    void setSharedTemperature(const Temperature::Ptr &) override {}
 
     bool purchasedPart() {return _purchasedPart;}
 
 public Q_SLOTS:
     void setpurchasedPart(bool value);
 
-    QString myTestString() Q_DECL_OVERRIDE { return _myTestString; }
-    void setMyTestString(QString value) Q_DECL_OVERRIDE { _myTestString = value; }
+    QString myTestString() override { return _myTestString; }
+    void setMyTestString(QString value) override { _myTestString = value; }
 
 private:
     bool _purchasedPart;
diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp
index 3182950..9c35ace 100644
--- a/tests/auto/integration/tst_integration.cpp
+++ b/tests/auto/integration/tst_integration.cpp
@@ -75,11 +75,11 @@ class Persist : public QRemoteObjectPersistedStore
 {
 public:
     Persist() : type(EngineReplica::HYBRID) {}
-    void saveProperties(const QString &, const QByteArray &, const QVariantList &values) Q_DECL_OVERRIDE
+    void saveProperties(const QString &, const QByteArray &, const QVariantList &values) override
     {
         type = values.at(0).value<EngineReplica::EngineType>();
     }
-    QVariantList restoreProperties(const QString &, const QByteArray &) Q_DECL_OVERRIDE
+    QVariantList restoreProperties(const QString &, const QByteArray &) override
     {
         return QVariantList() << QVariant::fromValue(type);
     }
diff --git a/tests/auto/integration_multiprocess/server/mytestserver.h b/tests/auto/integration_multiprocess/server/mytestserver.h
index 3082c32..a3e8761 100644
--- a/tests/auto/integration_multiprocess/server/mytestserver.h
+++ b/tests/auto/integration_multiprocess/server/mytestserver.h
@@ -50,8 +50,8 @@ public:
     ~MyTestServer();
 
 public Q_SLOTS:
-    bool start() Q_DECL_OVERRIDE;
-    bool stop() Q_DECL_OVERRIDE;
+    bool start() override;
+    bool stop() override;
 };
 
 #endif // MYTESTSERVER_H
diff --git a/tests/auto/modelview/tst_modelview.cpp b/tests/auto/modelview/tst_modelview.cpp
index beeb6ff..bdc1de0 100644
--- a/tests/auto/modelview/tst_modelview.cpp
+++ b/tests/auto/modelview/tst_modelview.cpp
@@ -360,8 +360,8 @@ class RolenamesListModel : public QAbstractListModel
 {
 public:
     explicit RolenamesListModel(QObject *parent = 0) : QAbstractListModel(parent) { }
-    int rowCount(const QModelIndex &) const Q_DECL_OVERRIDE{return m_list.length(); }
-    QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE
+    int rowCount(const QModelIndex &) const override{return m_list.length(); }
+    QVariant data(const QModelIndex &index, int role) const override
     {
        if (role == Qt::UserRole)
            return m_list.at(index.row()).second;
@@ -370,7 +370,7 @@ public:
        else
            return QVariant();
     }
-    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE
+    QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> roles;
         roles[Qt::UserRole] = "name";
diff --git a/tests/auto/repc/signature/signatureServer/main.cpp b/tests/auto/repc/signature/signatureServer/main.cpp
index e7e4f78..ca492dc 100644
--- a/tests/auto/repc/signature/signatureServer/main.cpp
+++ b/tests/auto/repc/signature/signatureServer/main.cpp
@@ -43,14 +43,14 @@ public:
     bool shouldQuit = false;
     // TestClassSimpleSource interface
 public slots:
-    bool slot1() Q_DECL_OVERRIDE {return true;}
-    QString slot2() Q_DECL_OVERRIDE {return QLatin1String("Hello there");}
-    void ping(const QString &message) Q_DECL_OVERRIDE
+    bool slot1() override {return true;}
+    QString slot2() override {return QLatin1String("Hello there");}
+    void ping(const QString &message) override
     {
         emit pong(message);
     }
 
-    bool quit() Q_DECL_OVERRIDE
+    bool quit() override
     {
         qDebug() << "quit() called";
 
diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp
index a521fe4..35a73ea 100644
--- a/tools/repc/repcodegenerator.cpp
+++ b/tools/repc/repcodegenerator.cpp
@@ -865,67 +865,67 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
 
     out << QStringLiteral("    }") << endl;
     out << QStringLiteral("") << endl;
-    out << QString::fromLatin1("    QString name() const Q_DECL_OVERRIDE { return QStringLiteral(\"%1\"); }").arg(astClass.name) << endl;
-    out << QString::fromLatin1("    QString typeName() const Q_DECL_OVERRIDE { return QStringLiteral(\"%1\"); }").arg(astClass.name) << endl;
-    out << QStringLiteral("    int propertyCount() const Q_DECL_OVERRIDE { return _properties[0]; }") << endl;
-    out << QStringLiteral("    int signalCount() const Q_DECL_OVERRIDE { return _signals[0]; }") << endl;
-    out << QStringLiteral("    int methodCount() const Q_DECL_OVERRIDE { return _methods[0]; }") << endl;
-    out << QStringLiteral("    int sourcePropertyIndex(int index) const Q_DECL_OVERRIDE") << endl;
+    out << QString::fromLatin1("    QString name() const override { return QStringLiteral(\"%1\"); }").arg(astClass.name) << endl;
+    out << QString::fromLatin1("    QString typeName() const override { return QStringLiteral(\"%1\"); }").arg(astClass.name) << endl;
+    out << QStringLiteral("    int propertyCount() const override { return _properties[0]; }") << endl;
+    out << QStringLiteral("    int signalCount() const override { return _signals[0]; }") << endl;
+    out << QStringLiteral("    int methodCount() const override { return _methods[0]; }") << endl;
+    out << QStringLiteral("    int sourcePropertyIndex(int index) const override") << endl;
     out << QStringLiteral("    {") << endl;
     out << QStringLiteral("        if (index < 0 || index >= _properties[0])") << endl;
     out << QStringLiteral("            return -1;") << endl;
     out << QStringLiteral("        return _properties[index+1];") << endl;
     out << QStringLiteral("    }") << endl;
-    out << QStringLiteral("    int sourceSignalIndex(int index) const Q_DECL_OVERRIDE") << endl;
+    out << QStringLiteral("    int sourceSignalIndex(int index) const override") << endl;
     out << QStringLiteral("    {") << endl;
     out << QStringLiteral("        if (index < 0 || index >= _signals[0])") << endl;
     out << QStringLiteral("            return -1;") << endl;
     out << QStringLiteral("        return _signals[index+1];") << endl;
     out << QStringLiteral("    }") << endl;
-    out << QStringLiteral("    int sourceMethodIndex(int index) const Q_DECL_OVERRIDE") << endl;
+    out << QStringLiteral("    int sourceMethodIndex(int index) const override") << endl;
     out << QStringLiteral("    {") << endl;
     out << QStringLiteral("        if (index < 0 || index >= _methods[0])") << endl;
     out << QStringLiteral("            return -1;") << endl;
     out << QStringLiteral("        return _methods[index+1];") << endl;
     out << QStringLiteral("    }") << endl;
     if (signalCount+changedCount > 0) {
-        out << QStringLiteral("    int signalParameterCount(int index) const Q_DECL_OVERRIDE") << endl;
+        out << QStringLiteral("    int signalParameterCount(int index) const override") << endl;
         out << QStringLiteral("    {") << endl;
         out << QStringLiteral("        if (index < 0 || index >= _signals[0])") << endl;
         out << QStringLiteral("            return -1;") << endl;
         out << QStringLiteral("        return signalArgCount[index];") << endl;
         out << QStringLiteral("    }") << endl;
-        out << QStringLiteral("    int signalParameterType(int sigIndex, int paramIndex) const Q_DECL_OVERRIDE") << endl;
+        out << QStringLiteral("    int signalParameterType(int sigIndex, int paramIndex) const override") << endl;
         out << QStringLiteral("    {") << endl;
         out << QStringLiteral("        if (sigIndex < 0 || sigIndex >= _signals[0] || paramIndex < 0 || paramIndex >= signalArgCount[sigIndex])") << endl;
         out << QStringLiteral("            return -1;") << endl;
         out << QStringLiteral("        return signalArgTypes[sigIndex][paramIndex];") << endl;
         out << QStringLiteral("    }") << endl;
     } else {
-        out << QStringLiteral("    int signalParameterCount(int index) const Q_DECL_OVERRIDE { Q_UNUSED(index); return -1; }") << endl;
-        out << QStringLiteral("    int signalParameterType(int sigIndex, int paramIndex) const Q_DECL_OVERRIDE") << endl;
+        out << QStringLiteral("    int signalParameterCount(int index) const override { Q_UNUSED(index); return -1; }") << endl;
+        out << QStringLiteral("    int signalParameterType(int sigIndex, int paramIndex) const override") << endl;
         out << QStringLiteral("    { Q_UNUSED(sigIndex); Q_UNUSED(paramIndex); return -1; }") << endl;
     }
     if (methodCount > 0) {
-        out << QStringLiteral("    int methodParameterCount(int index) const Q_DECL_OVERRIDE") << endl;
+        out << QStringLiteral("    int methodParameterCount(int index) const override") << endl;
         out << QStringLiteral("    {") << endl;
         out << QStringLiteral("        if (index < 0 || index >= _methods[0])") << endl;
         out << QStringLiteral("            return -1;") << endl;
         out << QStringLiteral("        return methodArgCount[index];") << endl;
         out << QStringLiteral("    }") << endl;
-        out << QStringLiteral("    int methodParameterType(int methodIndex, int paramIndex) const Q_DECL_OVERRIDE") << endl;
+        out << QStringLiteral("    int methodParameterType(int methodIndex, int paramIndex) const override") << endl;
         out << QStringLiteral("    {") << endl;
         out << QStringLiteral("        if (methodIndex < 0 || methodIndex >= _methods[0] || paramIndex < 0 || paramIndex >= methodArgCount[methodIndex])") << endl;
         out << QStringLiteral("            return -1;") << endl;
         out << QStringLiteral("        return methodArgTypes[methodIndex][paramIndex];") << endl;
         out << QStringLiteral("    }") << endl;
     } else {
-        out << QStringLiteral("    int methodParameterCount(int index) const Q_DECL_OVERRIDE { Q_UNUSED(index); return -1; }") << endl;
-        out << QStringLiteral("    int methodParameterType(int methodIndex, int paramIndex) const Q_DECL_OVERRIDE") << endl;
+        out << QStringLiteral("    int methodParameterCount(int index) const override { Q_UNUSED(index); return -1; }") << endl;
+        out << QStringLiteral("    int methodParameterType(int methodIndex, int paramIndex) const override") << endl;
         out << QStringLiteral("    { Q_UNUSED(methodIndex); Q_UNUSED(paramIndex); return -1; }") << endl;
     }
     //propertyIndexFromSignal method
-    out << QStringLiteral("    int propertyIndexFromSignal(int index) const Q_DECL_OVERRIDE") << endl;
+    out << QStringLiteral("    int propertyIndexFromSignal(int index) const override") << endl;
     out << QStringLiteral("    {") << endl;
     if (!propertyChangeIndex.isEmpty()) {
         out << QStringLiteral("        switch (index) {") << endl;
@@ -937,7 +937,7 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
     out << QStringLiteral("        return -1;") << endl;
     out << QStringLiteral("    }") << endl;
     //propertyRawIndexFromSignal method
-    out << QStringLiteral("    int propertyRawIndexFromSignal(int index) const Q_DECL_OVERRIDE") << endl;
+    out << QStringLiteral("    int propertyRawIndexFromSignal(int index) const override") << endl;
     out << QStringLiteral("    {") << endl;
     if (!propertyChangeIndex.isEmpty()) {
         out << QStringLiteral("        switch (index) {") << endl;
@@ -950,7 +950,7 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
     out << QStringLiteral("    }") << endl;
 
     //signalSignature method
-    out << QStringLiteral("    const QByteArray signalSignature(int index) const Q_DECL_OVERRIDE") << endl;
+    out << QStringLiteral("    const QByteArray signalSignature(int index) const override") << endl;
     out << QStringLiteral("    {") << endl;
     if (signalCount+changedCount > 0) {
         out << QStringLiteral("        switch (index) {") << endl;
@@ -969,7 +969,7 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
     out << QStringLiteral("    }") << endl;
 
     //methodSignature method
-    out << QStringLiteral("    const QByteArray methodSignature(int index) const Q_DECL_OVERRIDE") << endl;
+    out << QStringLiteral("    const QByteArray methodSignature(int index) const override") << endl;
     out << QStringLiteral("    {") << endl;
     if (methodCount > 0) {
         out << QStringLiteral("        switch (index) {") << endl;
@@ -992,13 +992,13 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
     out << QStringLiteral("    }") << endl;
 
     //methodType method
-    out << QStringLiteral("    QMetaMethod::MethodType methodType(int) const Q_DECL_OVERRIDE") << endl;
+    out << QStringLiteral("    QMetaMethod::MethodType methodType(int) const override") << endl;
     out << QStringLiteral("    {") << endl;
     out << QStringLiteral("        return QMetaMethod::Slot;") << endl;
     out << QStringLiteral("    }") << endl;
 
     //typeName method
-    out << QStringLiteral("    const QByteArray typeName(int index) const Q_DECL_OVERRIDE") << endl;
+    out << QStringLiteral("    const QByteArray typeName(int index) const override") << endl;
     out << QStringLiteral("    {") << endl;
     if (methodCount > 0) {
         out << QStringLiteral("        switch (index) {") << endl;
@@ -1020,7 +1020,7 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
     out << QStringLiteral("    }") << endl;
 
     //objectSignature method
-    out << QStringLiteral("    QByteArray objectSignature() const Q_DECL_OVERRIDE { return QByteArray{\"")
+    out << QStringLiteral("    QByteArray objectSignature() const override { return QByteArray{\"")
         << QLatin1String(classSignature(astClass))
         << QStringLiteral("\"}; }") << endl;