feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qml2puppet: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: I4c582486572df9d94c53163321212b15dcc042cf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:34:34 +02:00
parent 8264b806af
commit ae477c3a4b
15 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
View File

@@ -53,15 +53,15 @@ public:
static Pointer create(QObject *objectToBeWrapped); static Pointer create(QObject *objectToBeWrapped);
void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE; void setPropertyVariant(const PropertyName &name, const QVariant &value) override;
void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE; void setPropertyBinding(const PropertyName &name, const QString &expression) override;
QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE; QVariant property(const PropertyName &name) const override;
void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE; void resetProperty(const PropertyName &name) override;
void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, void reparent(const ObjectNodeInstance::Pointer &oldParentInstance,
const PropertyName &oldParentProperty, const PropertyName &oldParentProperty,
const ObjectNodeInstance::Pointer &newParentInstance, const ObjectNodeInstance::Pointer &newParentInstance,
const PropertyName &newParentProperty) Q_DECL_OVERRIDE; const PropertyName &newParentProperty) override;
protected: protected:
AnchorChangesNodeInstance(QObject *object); AnchorChangesNodeInstance(QObject *object);

6
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
View File

@@ -46,10 +46,10 @@ public:
static Pointer create(QObject *objectToBeWrapped); static Pointer create(QObject *objectToBeWrapped);
QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE; QVariant property(const PropertyName &name) const override;
void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE; void resetProperty(const PropertyName &name) override;
PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE; PropertyNameList ignoredProperties() const override;
private: private:
bool m_isEnabled; bool m_isEnabled;

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
View File

@@ -48,9 +48,9 @@ public:
ComponentNodeInstance(QQmlComponent *component); ComponentNodeInstance(QQmlComponent *component);
static Pointer create(QObject *objectToBeWrapped); 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 private: //function
QQmlComponent *component() const; QQmlComponent *component() const;

18
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
View File

@@ -46,16 +46,16 @@ public:
static Pointer create(); static Pointer create();
QRectF boundingRect() const Q_DECL_OVERRIDE; QRectF boundingRect() const override;
QPointF position() const Q_DECL_OVERRIDE; QPointF position() const override;
QSizeF size() const Q_DECL_OVERRIDE; QSizeF size() const override;
QTransform transform() const Q_DECL_OVERRIDE; QTransform transform() const override;
double opacity() const Q_DECL_OVERRIDE; double opacity() const override;
void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE; void setPropertyVariant(const PropertyName &name, const QVariant &value) override;
void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE; void setPropertyBinding(const PropertyName &name, const QString &expression) override;
void setId(const QString &id) Q_DECL_OVERRIDE; void setId(const QString &id) override;
QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE; QVariant property(const PropertyName &name) const override;
void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance); void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance);

8
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
View File

@@ -45,13 +45,13 @@ public:
static Pointer create(QObject *objectToBeWrapped); 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: protected:
LayoutNodeInstance(QQuickItem *item); LayoutNodeInstance(QQuickItem *item);

10
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
View File

@@ -48,14 +48,14 @@ public:
static Pointer create(QObject *objectToBeWrapped); static Pointer create(QObject *objectToBeWrapped);
bool isPositioner() const Q_DECL_OVERRIDE; bool isPositioner() const override;
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: protected:
PositionerNodeInstance(QQuickItem *item); PositionerNodeInstance(QQuickItem *item);

10
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
View File

@@ -49,12 +49,12 @@ public:
static Pointer create(QObject *objectToBeWrapped); static Pointer create(QObject *objectToBeWrapped);
virtual void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE; virtual void setPropertyVariant(const PropertyName &name, const QVariant &value) override;
virtual void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE; virtual void setPropertyBinding(const PropertyName &name, const QString &expression) override;
virtual QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE; virtual QVariant property(const PropertyName &name) const override;
virtual void resetProperty(const PropertyName &name) Q_DECL_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: protected:
QmlPropertyChangesNodeInstance(QObject *object); QmlPropertyChangesNodeInstance(QObject *object);

14
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
View File

@@ -44,15 +44,15 @@ public:
static Pointer create(QObject *objectToBeWrapped); static Pointer create(QObject *objectToBeWrapped);
void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE; void setPropertyVariant(const PropertyName &name, const QVariant &value) override;
void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE; void setPropertyBinding(const PropertyName &name, const QString &expression) override;
void activateState() Q_DECL_OVERRIDE; void activateState() override;
void deactivateState() Q_DECL_OVERRIDE; void deactivateState() override;
bool updateStateVariant(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &value) 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) Q_DECL_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) Q_DECL_OVERRIDE; bool resetStateProperty(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &resetValue) override;
protected: protected:

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
View File

@@ -44,9 +44,9 @@ public:
static Pointer create(QObject *objectToBeWrapped); 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: private:
QmlTransitionNodeInstance(QObject *transition); QmlTransitionNodeInstance(QObject *transition);

14
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
View File

@@ -42,15 +42,15 @@ class Qt5InformationNodeInstanceServer : public Qt5NodeInstanceServer
public: public:
explicit Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient); explicit Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
void reparentInstances(const ReparentInstancesCommand &command) Q_DECL_OVERRIDE; void reparentInstances(const ReparentInstancesCommand &command) override;
void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE; void clearScene(const ClearSceneCommand &command) override;
void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE; void createScene(const CreateSceneCommand &command) override;
void completeComponent(const CompleteComponentCommand &command) Q_DECL_OVERRIDE; void completeComponent(const CompleteComponentCommand &command) override;
void token(const TokenCommand &command) Q_DECL_OVERRIDE; void token(const TokenCommand &command) override;
void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE; void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
protected: protected:
void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE; void collectItemChangesAndSendChangeCommands() override;
void sendChildrenChangedCommand(const QList<ServerNodeInstance> &childList); void sendChildrenChangedCommand(const QList<ServerNodeInstance> &childList);
void sendTokenBack(); void sendTokenBack();
bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const; bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const;

20
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
View File

@@ -49,22 +49,22 @@ public:
Qt5NodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient); Qt5NodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
~Qt5NodeInstanceServer(); ~Qt5NodeInstanceServer();
QQuickView *quickView() const Q_DECL_OVERRIDE; QQuickView *quickView() const override;
QQmlView *declarativeView() const Q_DECL_OVERRIDE; QQmlView *declarativeView() const override;
QQmlEngine *engine() const Q_DECL_OVERRIDE; QQmlEngine *engine() const override;
void refreshBindings() Q_DECL_OVERRIDE; void refreshBindings() override;
DesignerSupport *designerSupport(); DesignerSupport *designerSupport();
void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE; void createScene(const CreateSceneCommand &command) override;
void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE; void clearScene(const ClearSceneCommand &command) override;
void reparentInstances(const ReparentInstancesCommand &command) Q_DECL_OVERRIDE; void reparentInstances(const ReparentInstancesCommand &command) override;
protected: protected:
void initializeView() Q_DECL_OVERRIDE; void initializeView() override;
void resizeCanvasSizeToRootItemSize() Q_DECL_OVERRIDE; void resizeCanvasSizeToRootItemSize() override;
void resetAllItems(); void resetAllItems();
void setupScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE; void setupScene(const CreateSceneCommand &command) override;
QList<QQuickItem*> allItems() const; QList<QQuickItem*> allItems() const;
private: private:

10
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
View File

@@ -41,15 +41,15 @@ class Qt5PreviewNodeInstanceServer : public Qt5NodeInstanceServer
public: public:
explicit Qt5PreviewNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient); explicit Qt5PreviewNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE; void createScene(const CreateSceneCommand &command) override;
void changeState(const ChangeStateCommand &command) Q_DECL_OVERRIDE; void changeState(const ChangeStateCommand &command) override;
void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE; void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
QImage renderPreviewImage(); QImage renderPreviewImage();
protected: protected:
void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE; void collectItemChangesAndSendChangeCommands() override;
void startRenderTimer() Q_DECL_OVERRIDE; void startRenderTimer() override;
private: private:
ServerNodeInstance m_currentState; ServerNodeInstance m_currentState;

10
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
View File

@@ -41,13 +41,13 @@ class Qt5RenderNodeInstanceServer : public Qt5NodeInstanceServer
public: public:
explicit Qt5RenderNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient); explicit Qt5RenderNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE; void createScene(const CreateSceneCommand &command) override;
void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE; void clearScene(const ClearSceneCommand &command) override;
void completeComponent(const CompleteComponentCommand &command) Q_DECL_OVERRIDE; void completeComponent(const CompleteComponentCommand &command) override;
void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE; void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
protected: protected:
void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE; void collectItemChangesAndSendChangeCommands() override;
ServerNodeInstance findNodeInstanceForItem(QQuickItem *item) const; ServerNodeInstance findNodeInstanceForItem(QQuickItem *item) const;
private: private:

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h
View File

@@ -61,7 +61,7 @@ public:
using Qt5NodeInstanceServer::createInstances; using Qt5NodeInstanceServer::createInstances;
protected: protected:
void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE; void collectItemChangesAndSendChangeCommands() override;
void sendChildrenChangedCommand(const QList<ServerNodeInstance> &childList); void sendChildrenChangedCommand(const QList<ServerNodeInstance> &childList);
bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const; bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const;
}; };

74
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
View File

@@ -52,55 +52,55 @@ public:
static Pointer create(QObject *objectToBeWrapped); static Pointer create(QObject *objectToBeWrapped);
static void createEffectItem(bool createEffectItem); 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; QQuickItem *contentItem() const override;
bool hasContent() const Q_DECL_OVERRIDE; bool hasContent() const override;
QRectF contentItemBoundingBox() const Q_DECL_OVERRIDE; QRectF contentItemBoundingBox() const override;
QRectF boundingRect() const Q_DECL_OVERRIDE; QRectF boundingRect() const override;
QTransform contentTransform() const Q_DECL_OVERRIDE; QTransform contentTransform() const override;
QTransform sceneTransform() const Q_DECL_OVERRIDE; QTransform sceneTransform() const override;
double opacity() const Q_DECL_OVERRIDE; double opacity() const override;
double rotation() const Q_DECL_OVERRIDE; double rotation() const override;
double scale() const Q_DECL_OVERRIDE; double scale() const override;
QPointF transformOriginPoint() const Q_DECL_OVERRIDE; QPointF transformOriginPoint() const override;
double zValue() const Q_DECL_OVERRIDE; double zValue() const override;
QPointF position() const Q_DECL_OVERRIDE; QPointF position() const override;
QSizeF size() const Q_DECL_OVERRIDE; QSizeF size() const override;
QTransform transform() const Q_DECL_OVERRIDE; QTransform transform() const override;
QTransform contentItemTransform() const Q_DECL_OVERRIDE; QTransform contentItemTransform() const override;
int penWidth() const Q_DECL_OVERRIDE; int penWidth() const override;
QImage renderImage() const Q_DECL_OVERRIDE; QImage renderImage() const override;
QImage renderPreviewImage(const QSize &previewImageSize) const Q_DECL_OVERRIDE; QImage renderPreviewImage(const QSize &previewImageSize) const override;
void updateAllDirtyNodesRecursive() Q_DECL_OVERRIDE; void updateAllDirtyNodesRecursive() override;
QObject *parent() const Q_DECL_OVERRIDE; QObject *parent() const override;
QList<ServerNodeInstance> childItems() const Q_DECL_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 setPropertyVariant(const PropertyName &name, const QVariant &value) override;
void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE; void setPropertyBinding(const PropertyName &name, const QString &expression) override;
QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE; QVariant property(const PropertyName &name) const override;
void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE; void resetProperty(const PropertyName &name) override;
bool isAnchoredByChildren() const Q_DECL_OVERRIDE; bool isAnchoredByChildren() const override;
bool hasAnchor(const PropertyName &name) const Q_DECL_OVERRIDE; bool hasAnchor(const PropertyName &name) const override;
QPair<PropertyName, ServerNodeInstance> anchor(const PropertyName &name) const Q_DECL_OVERRIDE; QPair<PropertyName, ServerNodeInstance> anchor(const PropertyName &name) const override;
bool isAnchoredBySibling() const Q_DECL_OVERRIDE; bool isAnchoredBySibling() const override;
bool isResizable() const Q_DECL_OVERRIDE; bool isResizable() const override;
bool isMovable() const Q_DECL_OVERRIDE; bool isMovable() const override;
bool isQuickItem() const Q_DECL_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: protected:
explicit QuickItemNodeInstance(QQuickItem*); explicit QuickItemNodeInstance(QQuickItem*);