summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-06-03 15:34:34 +0200
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-06-08 10:51:24 +0000
commitae477c3a4b0a671e593eb06b4504e7eadf7b5f4f (patch)
treef5674e8c59c342e9b6c423d17d25f58787d047e6 /share
parent8264b806af2625105ca1cb1e38b6dde22ce5db24 (diff)
downloadqt-creator-ae477c3a4b0a671e593eb06b4504e7eadf7b5f4f.tar.gz
qml2puppet: s/Q_DECL_OVERRIDE/override/g
Change-Id: I4c582486572df9d94c53163321212b15dcc042cf Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h10
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h6
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h4
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h18
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h8
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h10
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h10
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h14
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h4
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h14
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h20
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h10
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h10
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h2
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h74
15 files changed, 107 insertions, 107 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
index 34f7f1a80b..7e78b560bd 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -53,15 +53,15 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
- void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
- QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
- void resetProperty(const PropertyName &name) Q_DECL_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) Q_DECL_OVERRIDE;
+ const PropertyName &newParentProperty) override;
protected:
AnchorChangesNodeInstance(QObject *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
index 49d52548db..fea9222f56 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
@@ -46,10 +46,10 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
- void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE;
+ QVariant property(const PropertyName &name) const override;
+ void resetProperty(const PropertyName &name) override;
- PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE;
+ PropertyNameList ignoredProperties() const override;
private:
bool m_isEnabled;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
index ef17ebf946..16eb437d13 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
@@ -48,9 +48,9 @@ public:
ComponentNodeInstance(QQmlComponent *component);
static Pointer create(QObject *objectToBeWrapped);
- bool hasContent() const Q_DECL_OVERRIDE;
+ bool hasContent() const override;
- void setNodeSource(const QString &source) Q_DECL_OVERRIDE;
+ void setNodeSource(const QString &source) override;
private: //function
QQmlComponent *component() const;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
index 7b4a0ef12e..1787d3bbee 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
@@ -46,16 +46,16 @@ public:
static Pointer create();
- QRectF boundingRect() const Q_DECL_OVERRIDE;
- QPointF position() const Q_DECL_OVERRIDE;
- QSizeF size() const Q_DECL_OVERRIDE;
- QTransform transform() const Q_DECL_OVERRIDE;
- double opacity() const Q_DECL_OVERRIDE;
+ QRectF boundingRect() const override;
+ QPointF position() const override;
+ QSizeF size() const override;
+ QTransform transform() const override;
+ double opacity() const override;
- void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
- void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
- void setId(const QString &id) Q_DECL_OVERRIDE;
- QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
+ void setPropertyVariant(const PropertyName &name, const QVariant &value) override;
+ void setPropertyBinding(const PropertyName &name, const QString &expression) override;
+ void setId(const QString &id) override;
+ QVariant property(const PropertyName &name) const override;
void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
index 1f5174956c..581cca6529 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
@@ -45,13 +45,13 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- bool isLayoutable() const Q_DECL_OVERRIDE;
+ bool isLayoutable() const override;
- bool isResizable() const Q_DECL_OVERRIDE;
+ bool isResizable() const override;
- void refreshLayoutable() Q_DECL_OVERRIDE;
+ void refreshLayoutable() override;
- PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE;
+ PropertyNameList ignoredProperties() const override;
protected:
LayoutNodeInstance(QQuickItem *item);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
index 6a0169ed91..8070db69fa 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
@@ -48,14 +48,14 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- bool isPositioner() const Q_DECL_OVERRIDE;
- bool isLayoutable() const Q_DECL_OVERRIDE;
+ bool isPositioner() const override;
+ bool isLayoutable() const override;
- bool isResizable() const Q_DECL_OVERRIDE;
+ bool isResizable() const override;
- void refreshLayoutable() Q_DECL_OVERRIDE;
+ void refreshLayoutable() override;
- PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE;
+ PropertyNameList ignoredProperties() const override;
protected:
PositionerNodeInstance(QQuickItem *item);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
index 218d895986..1c0637fe15 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
@@ -49,12 +49,12 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- virtual void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
- virtual void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
- virtual QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
- virtual void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE;
+ 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 reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) Q_DECL_OVERRIDE;
+ void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) override;
protected:
QmlPropertyChangesNodeInstance(QObject *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
index 80a6864134..cbe667d6e8 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
@@ -44,15 +44,15 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
- void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
+ void setPropertyVariant(const PropertyName &name, const QVariant &value) override;
+ void setPropertyBinding(const PropertyName &name, const QString &expression) override;
- void activateState() Q_DECL_OVERRIDE;
- void deactivateState() Q_DECL_OVERRIDE;
+ void activateState() override;
+ void deactivateState() override;
- bool updateStateVariant(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &value) Q_DECL_OVERRIDE;
- bool updateStateBinding(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QString &expression) Q_DECL_OVERRIDE;
- bool resetStateProperty(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &resetValue) Q_DECL_OVERRIDE;
+ bool updateStateVariant(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &value) override;
+ bool updateStateBinding(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QString &expression) override;
+ bool resetStateProperty(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &resetValue) override;
protected:
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
index 69b67228e7..a85d5798de 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
@@ -44,9 +44,9 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- bool isTransition() const Q_DECL_OVERRIDE;
+ bool isTransition() const override;
- PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE;
+ PropertyNameList ignoredProperties() const override;
private:
QmlTransitionNodeInstance(QObject *transition);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
index eb97a6d183..728c860da2 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
@@ -42,15 +42,15 @@ class Qt5InformationNodeInstanceServer : public Qt5NodeInstanceServer
public:
explicit Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
- void reparentInstances(const ReparentInstancesCommand &command) Q_DECL_OVERRIDE;
- void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE;
- void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
- void completeComponent(const CompleteComponentCommand &command) Q_DECL_OVERRIDE;
- void token(const TokenCommand &command) Q_DECL_OVERRIDE;
- void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE;
+ void reparentInstances(const ReparentInstancesCommand &command) override;
+ void clearScene(const ClearSceneCommand &command) override;
+ void createScene(const CreateSceneCommand &command) override;
+ void completeComponent(const CompleteComponentCommand &command) override;
+ void token(const TokenCommand &command) override;
+ void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
protected:
- void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE;
+ void collectItemChangesAndSendChangeCommands() override;
void sendChildrenChangedCommand(const QList<ServerNodeInstance> &childList);
void sendTokenBack();
bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
index 41a8a2c6c5..b6836404aa 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
@@ -49,22 +49,22 @@ public:
Qt5NodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
~Qt5NodeInstanceServer();
- QQuickView *quickView() const Q_DECL_OVERRIDE;
- QQmlView *declarativeView() const Q_DECL_OVERRIDE;
- QQmlEngine *engine() const Q_DECL_OVERRIDE;
- void refreshBindings() Q_DECL_OVERRIDE;
+ QQuickView *quickView() const override;
+ QQmlView *declarativeView() const override;
+ QQmlEngine *engine() const override;
+ void refreshBindings() override;
DesignerSupport *designerSupport();
- void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
- void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE;
- void reparentInstances(const ReparentInstancesCommand &command) Q_DECL_OVERRIDE;
+ void createScene(const CreateSceneCommand &command) override;
+ void clearScene(const ClearSceneCommand &command) override;
+ void reparentInstances(const ReparentInstancesCommand &command) override;
protected:
- void initializeView() Q_DECL_OVERRIDE;
- void resizeCanvasSizeToRootItemSize() Q_DECL_OVERRIDE;
+ void initializeView() override;
+ void resizeCanvasSizeToRootItemSize() override;
void resetAllItems();
- void setupScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
+ void setupScene(const CreateSceneCommand &command) override;
QList<QQuickItem*> allItems() const;
private:
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
index b188682cba..a9f9e4f79b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
@@ -41,15 +41,15 @@ class Qt5PreviewNodeInstanceServer : public Qt5NodeInstanceServer
public:
explicit Qt5PreviewNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
- void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
- void changeState(const ChangeStateCommand &command) Q_DECL_OVERRIDE;
- void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE;
+ void createScene(const CreateSceneCommand &command) override;
+ void changeState(const ChangeStateCommand &command) override;
+ void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
QImage renderPreviewImage();
protected:
- void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE;
- void startRenderTimer() Q_DECL_OVERRIDE;
+ void collectItemChangesAndSendChangeCommands() override;
+ void startRenderTimer() override;
private:
ServerNodeInstance m_currentState;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
index 4064a0cdfe..1327d5bd64 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
@@ -41,13 +41,13 @@ class Qt5RenderNodeInstanceServer : public Qt5NodeInstanceServer
public:
explicit Qt5RenderNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
- void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
- void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE;
- void completeComponent(const CompleteComponentCommand &command) Q_DECL_OVERRIDE;
- void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE;
+ void createScene(const CreateSceneCommand &command) override;
+ void clearScene(const ClearSceneCommand &command) override;
+ void completeComponent(const CompleteComponentCommand &command) override;
+ void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
protected:
- void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE;
+ void collectItemChangesAndSendChangeCommands() override;
ServerNodeInstance findNodeInstanceForItem(QQuickItem *item) const;
private:
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h
index 33b5933e33..51e0c90955 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h
@@ -61,7 +61,7 @@ public:
using Qt5NodeInstanceServer::createInstances;
protected:
- void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE;
+ void collectItemChangesAndSendChangeCommands() override;
void sendChildrenChangedCommand(const QList<ServerNodeInstance> &childList);
bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const;
};
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
index 7b773a1c0e..22d2d06e8e 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
@@ -52,55 +52,55 @@ public:
static Pointer create(QObject *objectToBeWrapped);
static void createEffectItem(bool createEffectItem);
- void initialize(const ObjectNodeInstance::Pointer &objectNodeInstance) Q_DECL_OVERRIDE;
+ void initialize(const ObjectNodeInstance::Pointer &objectNodeInstance) override;
- QQuickItem *contentItem() const Q_DECL_OVERRIDE;
- bool hasContent() const Q_DECL_OVERRIDE;
+ QQuickItem *contentItem() const override;
+ bool hasContent() const override;
- QRectF contentItemBoundingBox() const Q_DECL_OVERRIDE;
- QRectF boundingRect() const Q_DECL_OVERRIDE;
- QTransform contentTransform() const Q_DECL_OVERRIDE;
- QTransform sceneTransform() const Q_DECL_OVERRIDE;
- double opacity() const Q_DECL_OVERRIDE;
- double rotation() const Q_DECL_OVERRIDE;
- double scale() const Q_DECL_OVERRIDE;
- QPointF transformOriginPoint() const Q_DECL_OVERRIDE;
- double zValue() const Q_DECL_OVERRIDE;
- QPointF position() const Q_DECL_OVERRIDE;
- QSizeF size() const Q_DECL_OVERRIDE;
- QTransform transform() const Q_DECL_OVERRIDE;
- QTransform contentItemTransform() const Q_DECL_OVERRIDE;
- int penWidth() const Q_DECL_OVERRIDE;
+ QRectF contentItemBoundingBox() const override;
+ QRectF boundingRect() const override;
+ QTransform contentTransform() const override;
+ QTransform sceneTransform() const override;
+ double opacity() const override;
+ double rotation() const override;
+ double scale() const override;
+ QPointF transformOriginPoint() const override;
+ double zValue() const override;
+ QPointF position() const override;
+ QSizeF size() const override;
+ QTransform transform() const override;
+ QTransform contentItemTransform() const override;
+ int penWidth() const override;
- QImage renderImage() const Q_DECL_OVERRIDE;
- QImage renderPreviewImage(const QSize &previewImageSize) const Q_DECL_OVERRIDE;
+ QImage renderImage() const override;
+ QImage renderPreviewImage(const QSize &previewImageSize) const override;
- void updateAllDirtyNodesRecursive() Q_DECL_OVERRIDE;
+ void updateAllDirtyNodesRecursive() override;
- QObject *parent() const Q_DECL_OVERRIDE;
- QList<ServerNodeInstance> childItems() const Q_DECL_OVERRIDE;
+ QObject *parent() const override;
+ QList<ServerNodeInstance> childItems() const override;
- void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) Q_DECL_OVERRIDE;
+ void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) override;
- void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
- void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
- QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
- void resetProperty(const PropertyName &name) Q_DECL_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;
- bool isAnchoredByChildren() const Q_DECL_OVERRIDE;
- bool hasAnchor(const PropertyName &name) const Q_DECL_OVERRIDE;
- QPair<PropertyName, ServerNodeInstance> anchor(const PropertyName &name) const Q_DECL_OVERRIDE;
- bool isAnchoredBySibling() const Q_DECL_OVERRIDE;
- bool isResizable() const Q_DECL_OVERRIDE;
- bool isMovable() const Q_DECL_OVERRIDE;
- bool isQuickItem() const Q_DECL_OVERRIDE;
+ bool isAnchoredByChildren() const override;
+ bool hasAnchor(const PropertyName &name) const override;
+ QPair<PropertyName, ServerNodeInstance> anchor(const PropertyName &name) const override;
+ bool isAnchoredBySibling() const override;
+ bool isResizable() const override;
+ bool isMovable() const override;
+ bool isQuickItem() const override;
- QList<ServerNodeInstance> stateInstances() const Q_DECL_OVERRIDE;
+ QList<ServerNodeInstance> stateInstances() const override;
- void doComponentComplete() Q_DECL_OVERRIDE;
+ void doComponentComplete() override;
- QList<QQuickItem*> allItemsRecursive() const Q_DECL_OVERRIDE;
+ QList<QQuickItem*> allItemsRecursive() const override;
protected:
explicit QuickItemNodeInstance(QQuickItem*);