From 3ccbaff2da1d59a6143cbbaf27f86bfbcda1cf75 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 7 Sep 2017 13:22:29 +0200 Subject: [PATCH] QmlDebug: Add some missing override Change-Id: I742cbeedff43e1e33b30150fec60f843698f05e8 Reviewed-by: hjk --- src/libs/qmldebug/baseenginedebugclient.h | 4 ++-- src/libs/qmldebug/basetoolsclient.h | 2 +- src/libs/qmldebug/declarativeenginedebugclient.h | 8 ++++---- src/libs/qmldebug/declarativetoolsclient.h | 14 +++++++------- src/libs/qmldebug/qdebugmessageclient.h | 4 ++-- src/libs/qmldebug/qmlenginecontrolclient.h | 2 +- src/libs/qmldebug/qmltoolsclient.h | 14 +++++++------- src/plugins/qmlprofiler/qmlprofilertraceclient.h | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/libs/qmldebug/baseenginedebugclient.h b/src/libs/qmldebug/baseenginedebugclient.h index b74397cf9db..e77f658aeab 100644 --- a/src/libs/qmldebug/baseenginedebugclient.h +++ b/src/libs/qmldebug/baseenginedebugclient.h @@ -80,8 +80,8 @@ signals: void result(quint32 queryId, const QVariant &result, const QByteArray &type); protected: - virtual void stateChanged(State status); - virtual void messageReceived(const QByteArray &); + virtual void stateChanged(State status) override; + virtual void messageReceived(const QByteArray &) override; quint32 getId() { return m_nextId++; } diff --git a/src/libs/qmldebug/basetoolsclient.h b/src/libs/qmldebug/basetoolsclient.h index d84e02066e5..cb8d86cb19d 100644 --- a/src/libs/qmldebug/basetoolsclient.h +++ b/src/libs/qmldebug/basetoolsclient.h @@ -59,7 +59,7 @@ signals: void logActivity(QString client, QString message); protected: - void stateChanged(State status); + void stateChanged(State status) override; void recurseObjectIdList(const ObjectReference &ref, QList &debugIds, QList &objectIds); diff --git a/src/libs/qmldebug/declarativeenginedebugclient.h b/src/libs/qmldebug/declarativeenginedebugclient.h index 793347e9c71..6efda145ece 100644 --- a/src/libs/qmldebug/declarativeenginedebugclient.h +++ b/src/libs/qmldebug/declarativeenginedebugclient.h @@ -40,13 +40,13 @@ public: quint32 setBindingForObject(int objectDebugId, const QString &propertyName, const QVariant &bindingExpression, bool isLiteralValue, - QString source, int line); - quint32 resetBindingForObject(int objectDebugId, const QString &propertyName); + QString source, int line) override; + quint32 resetBindingForObject(int objectDebugId, const QString &propertyName) override; quint32 setMethodBody(int objectDebugId, const QString &methodName, - const QString &methodBody); + const QString &methodBody) override; protected: - void messageReceived(const QByteArray &data); + void messageReceived(const QByteArray &data) override; }; } // namespace QmlDebug diff --git a/src/libs/qmldebug/declarativetoolsclient.h b/src/libs/qmldebug/declarativetoolsclient.h index 83698b4037e..dcb70672078 100644 --- a/src/libs/qmldebug/declarativetoolsclient.h +++ b/src/libs/qmldebug/declarativetoolsclient.h @@ -35,17 +35,17 @@ class QMLDEBUG_EXPORT DeclarativeToolsClient : public BaseToolsClient public: DeclarativeToolsClient(QmlDebugConnection *client); - void setDesignModeBehavior(bool inDesignMode); - void changeToSelectTool(); - void changeToSelectMarqueeTool(); - void changeToZoomTool(); - void showAppOnTop(bool showOnTop); + void setDesignModeBehavior(bool inDesignMode) override; + void changeToSelectTool() override; + void changeToSelectMarqueeTool() override; + void changeToZoomTool() override; + void showAppOnTop(bool showOnTop) override; // ### Qt 4.8: remove if we can have access to qdeclarativecontextdata or id's - void setObjectIdList(const QList &objectRoots); + void setObjectIdList(const QList &objectRoots) override; protected: - void messageReceived(const QByteArray &); + void messageReceived(const QByteArray &) override; private: void log(LogDirection direction, diff --git a/src/libs/qmldebug/qdebugmessageclient.h b/src/libs/qmldebug/qdebugmessageclient.h index 0c6d5995c1e..cf092cbef90 100644 --- a/src/libs/qmldebug/qdebugmessageclient.h +++ b/src/libs/qmldebug/qdebugmessageclient.h @@ -47,8 +47,8 @@ public: explicit QDebugMessageClient(QmlDebugConnection *client); protected: - virtual void stateChanged(State state); - virtual void messageReceived(const QByteArray &); + virtual void stateChanged(State state) override; + virtual void messageReceived(const QByteArray &) override; signals: void newState(QmlDebug::QmlDebugClient::State); diff --git a/src/libs/qmldebug/qmlenginecontrolclient.h b/src/libs/qmldebug/qmlenginecontrolclient.h index c5da7a71302..43d2efdc80d 100644 --- a/src/libs/qmldebug/qmlenginecontrolclient.h +++ b/src/libs/qmldebug/qmlenginecontrolclient.h @@ -59,7 +59,7 @@ signals: void engineRemoved(int engineId, const QString &name); protected: - void messageReceived(const QByteArray &); + void messageReceived(const QByteArray &) override; void sendCommand(CommandType command, int engineId); struct EngineState { diff --git a/src/libs/qmldebug/qmltoolsclient.h b/src/libs/qmldebug/qmltoolsclient.h index 51dc6730afb..d0a19c784f9 100644 --- a/src/libs/qmldebug/qmltoolsclient.h +++ b/src/libs/qmldebug/qmltoolsclient.h @@ -35,17 +35,17 @@ class QMLDEBUG_EXPORT QmlToolsClient : public BaseToolsClient public: explicit QmlToolsClient(QmlDebugConnection *client); - void setDesignModeBehavior(bool inDesignMode); - void changeToSelectTool(); - void changeToSelectMarqueeTool(); - void changeToZoomTool(); - void showAppOnTop(bool showOnTop); + void setDesignModeBehavior(bool inDesignMode) override; + void changeToSelectTool() override; + void changeToSelectMarqueeTool() override; + void changeToZoomTool() override; + void showAppOnTop(bool showOnTop) override; // ### Qt 4.8: remove if we can have access to qdeclarativecontextdata or id's - void setObjectIdList(const QList &objectRoots); + void setObjectIdList(const QList &objectRoots) override; protected: - void messageReceived(const QByteArray &); + void messageReceived(const QByteArray &) override; private: void log(LogDirection direction, diff --git a/src/plugins/qmlprofiler/qmlprofilertraceclient.h b/src/plugins/qmlprofiler/qmlprofilertraceclient.h index 63518ef4f3c..1c5baf10fd5 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceclient.h +++ b/src/plugins/qmlprofiler/qmlprofilertraceclient.h @@ -69,8 +69,8 @@ signals: void cleared(); protected: - virtual void stateChanged(State status); - virtual void messageReceived(const QByteArray &); + virtual void stateChanged(State status) override; + virtual void messageReceived(const QByteArray &) override; private: class QmlProfilerTraceClientPrivate *d;