aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-05-07 14:56:23 +0200
committerTobias Hunger <tobias.hunger@qt.io>2018-05-07 15:43:28 +0000
commit0e71ed1bfcdcc02927f6fba9dc49ada73a4b973b (patch)
treebc0b2cba29ecbd23ab8e1dce9a5cbc27c1d34448 /share
parentbd87969b63031e57a242020665f7658b0bc137fc (diff)
QmlPuppet: Use override consistently
clang-tidy fixes from modernize-use-override check. Change-Id: Ia9785ef4d5d236d9740abec26359495eaea2fad1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h22
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h2
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h34
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h2
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h8
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h2
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h2
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h2
8 files changed, 37 insertions, 37 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
index 9eb7aa5047..a14bbb3b45 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
@@ -65,19 +65,19 @@ class NodeInstanceClientProxy : public QObject, public NodeInstanceClientInterfa
public:
NodeInstanceClientProxy(QObject *parent = 0);
- void informationChanged(const InformationChangedCommand &command);
- void valuesChanged(const ValuesChangedCommand &command);
- void pixmapChanged(const PixmapChangedCommand &command);
- void childrenChanged(const ChildrenChangedCommand &command);
- void statePreviewImagesChanged(const StatePreviewImageChangedCommand &command);
- void componentCompleted(const ComponentCompletedCommand &command);
- void token(const TokenCommand &command);
- void debugOutput(const DebugOutputCommand &command);
+ void informationChanged(const InformationChangedCommand &command) override;
+ void valuesChanged(const ValuesChangedCommand &command) override;
+ void pixmapChanged(const PixmapChangedCommand &command) override;
+ void childrenChanged(const ChildrenChangedCommand &command) override;
+ void statePreviewImagesChanged(const StatePreviewImageChangedCommand &command) override;
+ void componentCompleted(const ComponentCompletedCommand &command) override;
+ void token(const TokenCommand &command) override;
+ void debugOutput(const DebugOutputCommand &command) override;
void puppetAlive(const PuppetAliveCommand &command);
- void flush();
- void synchronizeWithClientProcess();
- qint64 bytesToWrite() const;
+ void flush() override;
+ void synchronizeWithClientProcess() override;
+ qint64 bytesToWrite() const override;
protected:
void initializeSocket();
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h
index 659ccf58f3..ee1a6b2d57 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h
@@ -41,7 +41,7 @@ signals:
void childrenChanged(QObject *object);
protected:
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
};
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
index c777c0a7a1..e43c804ca6 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
@@ -72,22 +72,22 @@ public:
explicit NodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
- void createInstances(const CreateInstancesCommand &command);
- void changeFileUrl(const ChangeFileUrlCommand &command);
- void changePropertyValues(const ChangeValuesCommand &command);
- void changePropertyBindings(const ChangeBindingsCommand &command);
- void changeAuxiliaryValues(const ChangeAuxiliaryCommand &command);
- void changeIds(const ChangeIdsCommand &command);
- void createScene(const CreateSceneCommand &command);
- void clearScene(const ClearSceneCommand &command);
- void removeInstances(const RemoveInstancesCommand &command);
- void removeProperties(const RemovePropertiesCommand &command);
- void reparentInstances(const ReparentInstancesCommand &command);
- void changeState(const ChangeStateCommand &command);
- void completeComponent(const CompleteComponentCommand &command);
- void changeNodeSource(const ChangeNodeSourceCommand &command);
- void token(const TokenCommand &command);
- void removeSharedMemory(const RemoveSharedMemoryCommand &command);
+ void createInstances(const CreateInstancesCommand &command) override;
+ void changeFileUrl(const ChangeFileUrlCommand &command) override;
+ void changePropertyValues(const ChangeValuesCommand &command) override;
+ void changePropertyBindings(const ChangeBindingsCommand &command) override;
+ void changeAuxiliaryValues(const ChangeAuxiliaryCommand &command) override;
+ void changeIds(const ChangeIdsCommand &command) override;
+ void createScene(const CreateSceneCommand &command) override;
+ void clearScene(const ClearSceneCommand &command) override;
+ void removeInstances(const RemoveInstancesCommand &command) override;
+ void removeProperties(const RemovePropertiesCommand &command) override;
+ void reparentInstances(const ReparentInstancesCommand &command) override;
+ void changeState(const ChangeStateCommand &command) override;
+ void completeComponent(const CompleteComponentCommand &command) override;
+ void changeNodeSource(const ChangeNodeSourceCommand &command) override;
+ void token(const TokenCommand &command) override;
+ void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
ServerNodeInstance instanceForId(qint32 id) const;
bool hasInstanceForId(qint32 id) const;
@@ -147,7 +147,7 @@ protected:
NodeInstanceClientInterface *nodeInstanceClient() const;
- void timerEvent(QTimerEvent *);
+ void timerEvent(QTimerEvent *) override;
virtual void collectItemChangesAndSendChangeCommands() = 0;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h
index 066c74f6a3..3dc00ed7cc 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h
@@ -46,7 +46,7 @@ public:
void setObjectNodeInstance(const ObjectNodeInstancePointer &nodeInstance);
- virtual int qt_metacall(QMetaObject::Call, int, void **);
+ int qt_metacall(QMetaObject::Call, int, void **) override;
protected:
void registerObject(QObject *spiedObject);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
index 4ea6c896ec..017a0eb710 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
@@ -44,10 +44,10 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- virtual void setPropertyVariant(const PropertyName &name, const QVariant &value) override;
- virtual void setPropertyBinding(const PropertyName &name, const QString &expression) override;
- virtual QVariant property(const PropertyName &name) const override;
- virtual void resetProperty(const PropertyName &name) override;
+ void setPropertyVariant(const PropertyName &name, const QVariant &value) override;
+ void setPropertyBinding(const PropertyName &name, const QString &expression) override;
+ QVariant property(const PropertyName &name) const override;
+ void resetProperty(const PropertyName &name) override;
void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) override;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
index d4aaa91ddf..ca43363a9a 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
@@ -41,7 +41,7 @@ class Qt5NodeInstanceServer : public NodeInstanceServer
Q_OBJECT
public:
Qt5NodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
- ~Qt5NodeInstanceServer();
+ ~Qt5NodeInstanceServer() override;
QQuickView *quickView() const override;
QQmlView *declarativeView() const override;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
index 1f000f1ba2..bf78df2212 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
@@ -41,7 +41,7 @@ public:
typedef QSharedPointer<QuickItemNodeInstance> Pointer;
typedef QWeakPointer<QuickItemNodeInstance> WeakPointer;
- ~QuickItemNodeInstance();
+ ~QuickItemNodeInstance() override;
static Pointer create(QObject *objectToBeWrapped);
static void createEffectItem(bool createEffectItem);
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h
index fc61657c07..ccb2879f15 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h
@@ -46,7 +46,7 @@ struct MetaPropertyData;
class MetaObject : public QQmlVMEMetaObject
{
public:
- ~MetaObject();
+ ~MetaObject() override;
static void registerNotifyPropertyChangeCallBack(void (*callback)(QObject*, const PropertyName &propertyName));