From 8264b806af2625105ca1cb1e38b6dde22ce5db24 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 3 Jun 2015 15:31:53 +0200 Subject: [PATCH] qmldesigner: s/Q_DECL_OVERRIDE/override/g Change-Id: I8853e3e8c6fe6e6a54d73ce0014f1ae37d377378 Reviewed-by: Tim Jenssen --- .../componentcore/abstractactiongroup.h | 6 +- .../components/debugview/debugview.h | 66 ++++++++--------- .../formeditor/abstractcustomtool.h | 2 +- .../components/formeditor/dragtool.h | 36 +++++----- .../components/formeditor/formeditorview.h | 64 ++++++++--------- .../components/formeditor/movetool.h | 32 ++++----- .../components/formeditor/resizetool.h | 32 ++++----- .../components/formeditor/selectiontool.h | 32 ++++----- .../components/integration/componentview.h | 64 ++++++++--------- .../integration/designdocumentview.h | 50 ++++++------- .../components/itemlibrary/itemlibraryview.h | 70 +++++++++---------- .../components/navigator/navigatorview.h | 66 ++++++++--------- .../propertyeditor/propertyeditorview.h | 60 ++++++++-------- .../stateseditor/stateseditorview.h | 68 +++++++++--------- .../entertabdesigneraction.cpp | 2 +- .../componentsplugin/entertabdesigneraction.h | 8 +-- .../designercore/include/nodeinstanceview.h | 66 ++++++++--------- .../designercore/include/rewriterview.h | 62 ++++++++-------- 18 files changed, 393 insertions(+), 393 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h b/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h index ea549a63fd..43cc67f087 100644 --- a/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h +++ b/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h @@ -46,12 +46,12 @@ public: virtual bool isVisible(const SelectionContext &m_selectionState) const = 0; virtual bool isEnabled(const SelectionContext &m_selectionState) const = 0; - ActionInterface::Type type() const Q_DECL_OVERRIDE; - QAction *action() const Q_DECL_OVERRIDE; + ActionInterface::Type type() const override; + QAction *action() const override; QMenu *menu() const; SelectionContext selectionContext() const; - virtual void currentContextChanged(const SelectionContext &selectionContext) Q_DECL_OVERRIDE; + virtual void currentContextChanged(const SelectionContext &selectionContext) override; virtual void updateContext(); private: diff --git a/src/plugins/qmldesigner/components/debugview/debugview.h b/src/plugins/qmldesigner/components/debugview/debugview.h index f15ca72e56..c9e063cd6c 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.h +++ b/src/plugins/qmldesigner/components/debugview/debugview.h @@ -49,50 +49,50 @@ public: ~DebugView(); // AbstractView - void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void importsChanged(const QList &addedImports, const QList &removedImports) override; - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; + void nodeCreated(const ModelNode &createdNode) override; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, - const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; + const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void propertiesAboutToBeRemoved(const QList& propertyList) override; + void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector& propertyList, PropertyChangeFlags propertyChange) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; void selectedNodesChanged(const QList &selectedNodeList, - const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList &propertyList) Q_DECL_OVERRIDE; + const QList &lastSelectedNodeList) override; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; + void propertiesRemoved(const QList &propertyList) override; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE; + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; - WidgetInfo widgetInfo() Q_DECL_OVERRIDE; - bool hasWidget() const Q_DECL_OVERRIDE; + WidgetInfo widgetInfo() override; + bool hasWidget() const override; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList > &propertyList) override; + void instancesCompleted(const QVector &completedNodeList) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) override; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; + void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; + void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; + void currentStateChanged(const ModelNode &node) override; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; protected: void log(const QString &title, const QString &message, bool highlight = false); diff --git a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h index edf396e8b7..f9c565d866 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h +++ b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h @@ -40,7 +40,7 @@ class QMLDESIGNERCORE_EXPORT AbstractCustomTool : public QmlDesigner::AbstractFo public: AbstractCustomTool(); - void selectedItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; + void selectedItemsChanged(const QList &itemList) override; virtual QString name() const = 0; diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h index b0851640a9..dcf413a412 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.h +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h @@ -49,36 +49,36 @@ public: DragTool(FormEditorView *editorView); virtual ~DragTool(); - void mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; - void hoverMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void hoverMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; - void dropEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragEnterEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) override; + void dragEnterEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) override; + void dragLeaveEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) override; + void dragMoveEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) override; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *keyEvent) override; - void itemsAboutToRemoved(const QList &itemList) Q_DECL_OVERRIDE; + void itemsAboutToRemoved(const QList &itemList) override; - void selectedItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; - void instancesParentChanged(const QList &itemList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; + void selectedItemsChanged(const QList &itemList) override; + void instancesParentChanged(const QList &itemList) override; + void instancePropertyChange(const QList > &propertyList) override; void updateMoveManipulator(); void beginWithPoint(const QPointF &beginPoint); - void clear() Q_DECL_OVERRIDE; + void clear() override; - void formEditorItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; + void formEditorItemsChanged(const QList &itemList) override; - void instancesCompleted(const QList &itemList) Q_DECL_OVERRIDE; + void instancesCompleted(const QList &itemList) override; void clearMoveDelay(); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index 90bd106f81..36bd463fa1 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -65,30 +65,30 @@ public: ~FormEditorView(); // AbstractView - void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void importsChanged(const QList &addedImports, const QList &removedImports) override; - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; + void nodeCreated(const ModelNode &createdNode) override; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; + void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void propertiesAboutToBeRemoved(const QList& propertyList) override; + void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector& propertyList, PropertyChangeFlags propertyChange) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; void selectedNodesChanged(const QList &selectedNodeList, - const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList &propertyList) Q_DECL_OVERRIDE; + const QList &lastSelectedNodeList) override; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; + void propertiesRemoved(const QList &propertyList) override; - void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) Q_DECL_OVERRIDE; + void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) override; // FormEditorView - WidgetInfo widgetInfo() Q_DECL_OVERRIDE; + WidgetInfo widgetInfo() override; FormEditorWidget *formEditorWidget(); AbstractFormEditorTool *currentTool() const; @@ -106,29 +106,29 @@ public: void registerTool(AbstractCustomTool *tool); - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE; + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector &completedNodeList) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void instancePropertyChange(const QList > &propertyList) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; double containerPadding() const; double spacing() const; void deActivateItemCreator(); - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; + void currentStateChanged(const ModelNode &node) override; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; + void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; + void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) override; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; protected: void reset(); diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.h b/src/plugins/qmldesigner/components/formeditor/movetool.h index 08cffdf213..c0151c528e 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.h +++ b/src/plugins/qmldesigner/components/formeditor/movetool.h @@ -48,32 +48,32 @@ public: MoveTool(FormEditorView* editorView); ~MoveTool(); - void mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void hoverMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; + void mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void hoverMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *keyEvent) override; - void dragLeaveEvent(const QList &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; - void dragMoveEvent(const QList &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; + void dragLeaveEvent(const QList &itemList, QGraphicsSceneDragDropEvent * event) override; + void dragMoveEvent(const QList &itemList, QGraphicsSceneDragDropEvent * event) override; - void itemsAboutToRemoved(const QList &itemList) Q_DECL_OVERRIDE; + void itemsAboutToRemoved(const QList &itemList) override; - void selectedItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; + void selectedItemsChanged(const QList &itemList) override; - void instancesCompleted(const QList &itemList) Q_DECL_OVERRIDE; - void instancesParentChanged(const QList &itemList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QList &itemList) override; + void instancesParentChanged(const QList &itemList) override; + void instancePropertyChange(const QList > &propertyList) override; void updateMoveManipulator(); void beginWithPoint(const QPointF &beginPoint); - void clear() Q_DECL_OVERRIDE; + void clear() override; - void formEditorItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; + void formEditorItemsChanged(const QList &itemList) override; protected: static bool haveSameParent(const QList &itemList); diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.h b/src/plugins/qmldesigner/components/formeditor/resizetool.h index fd0c59c132..54fbabc8db 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizetool.h +++ b/src/plugins/qmldesigner/components/formeditor/resizetool.h @@ -46,30 +46,30 @@ public: ResizeTool(FormEditorView* editorView); ~ResizeTool(); - void mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; - void hoverMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void hoverMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; - void dragLeaveEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragLeaveEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) override; + void dragMoveEvent(const QList &itemList, QGraphicsSceneDragDropEvent *event) override; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *keyEvent) override; - void itemsAboutToRemoved(const QList &itemList) Q_DECL_OVERRIDE; + void itemsAboutToRemoved(const QList &itemList) override; - void selectedItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; + void selectedItemsChanged(const QList &itemList) override; - void clear() Q_DECL_OVERRIDE; + void clear() override; - void formEditorItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; - void instancesParentChanged(const QList &itemList) Q_DECL_OVERRIDE; + void formEditorItemsChanged(const QList &itemList) override; + void instancesParentChanged(const QList &itemList) override; - void instancesCompleted(const QList &itemList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QList &itemList) override; + void instancePropertyChange(const QList > &propertyList) override; private: diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.h b/src/plugins/qmldesigner/components/formeditor/selectiontool.h index 0aea85ac71..09dfdb1a35 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h @@ -52,35 +52,35 @@ public: SelectionTool(FormEditorView* editorView); ~SelectionTool(); - void mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; - void hoverMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void hoverMoveEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) override; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *keyEvent) override; - void dragLeaveEvent(const QList &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; - void dragMoveEvent(const QList &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; + void dragLeaveEvent(const QList &itemList, QGraphicsSceneDragDropEvent * event) override; + void dragMoveEvent(const QList &itemList, QGraphicsSceneDragDropEvent * event) override; - void itemsAboutToRemoved(const QList &itemList) Q_DECL_OVERRIDE; + void itemsAboutToRemoved(const QList &itemList) override; // QVariant itemChange(const QList &itemList, // QGraphicsItem::GraphicsItemChange change, // const QVariant &value ); // void update(); - void clear() Q_DECL_OVERRIDE; + void clear() override; - void selectedItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; + void selectedItemsChanged(const QList &itemList) override; - void formEditorItemsChanged(const QList &itemList) Q_DECL_OVERRIDE; + void formEditorItemsChanged(const QList &itemList) override; - void instancesCompleted(const QList &itemList) Q_DECL_OVERRIDE; - void instancesParentChanged(const QList &itemList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QList &itemList) override; + void instancesParentChanged(const QList &itemList) override; + void instancePropertyChange(const QList > &propertyList) override; void selectUnderPoint(QGraphicsSceneMouseEvent *event); diff --git a/src/plugins/qmldesigner/components/integration/componentview.h b/src/plugins/qmldesigner/components/integration/componentview.h index 7da3e6762e..72a94fb96c 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.h +++ b/src/plugins/qmldesigner/components/integration/componentview.h @@ -57,60 +57,60 @@ public: ComponentView(QObject *parent = 0); - void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; ComponentAction *action(); - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; + void nodeCreated(const ModelNode &createdNode) override; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList& propertyList) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void propertiesAboutToBeRemoved(const QList& propertyList) override; + void propertiesRemoved(const QList& propertyList) override; void variantPropertiesChanged(const QList& propertyList, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; void bindingPropertiesChanged(const QList& propertyList, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; void signalHandlerPropertiesChanged(const QVector& propertyList, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; + void instancePropertyChange(const QList > &propertyList) override; + void instancesCompleted(const QVector &completedNodeList) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; + void currentStateChanged(const ModelNode &node) override; void selectedNodesChanged(const QList &selectedNodeList, - const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; + const QList &lastSelectedNodeList) override; - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE; + void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) override; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE; + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; void customNotification(const AbstractView *view, const QString &identifier, - const QList &nodeList, const QList &data) Q_DECL_OVERRIDE; + const QList &nodeList, const QList &data) override; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void importsChanged(const QList &addedImports, const QList &removedImports) override; QStandardItemModel *standardItemModel() const; diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.h b/src/plugins/qmldesigner/components/integration/designdocumentview.h index 574512e817..20ac42191b 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.h +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.h @@ -43,46 +43,46 @@ public: DesignDocumentView(QObject *parent = 0); ~DesignDocumentView(); - virtual void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; - virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + virtual void nodeCreated(const ModelNode &createdNode) override; + virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) override; + virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; virtual void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; virtual void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - virtual void propertiesAboutToBeRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - virtual void propertiesRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - virtual void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - virtual void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - virtual void signalHandlerPropertiesChanged(const QVector& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; + virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + virtual void propertiesAboutToBeRemoved(const QList& propertyList) override; + virtual void propertiesRemoved(const QList& propertyList) override; + virtual void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + virtual void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + virtual void signalHandlerPropertiesChanged(const QVector& propertyList, PropertyChangeFlags propertyChange) override; + virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; virtual void selectedNodesChanged(const QList &selectedNodeList, - const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; + const QList &lastSelectedNodeList) override; - virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; - virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; + virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; + virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; + void instancePropertyChange(const QList > &propertyList) override; + void instancesCompleted(const QVector &completedNodeList) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; void rewriterBeginTransaction(); void rewriterEndTransaction(); - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; + void currentStateChanged(const ModelNode &node) override; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void importsChanged(const QList &addedImports, const QList &removedImports) override; ModelNode insertModel(const ModelNode &modelNode) { return m_modelMerger.insertModel(modelNode); } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h index 121c10eeca..9c62749633 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h @@ -49,57 +49,57 @@ public: ItemLibraryView(QObject* parent = 0); ~ItemLibraryView(); - bool hasWidget() const Q_DECL_OVERRIDE; - WidgetInfo widgetInfo() Q_DECL_OVERRIDE; + bool hasWidget() const override; + WidgetInfo widgetInfo() override; // AbstractView - void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void importsChanged(const QList &addedImports, const QList &removedImports) override; - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; + void nodeCreated(const ModelNode &createdNode) override; void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList &propertyList) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; + void propertiesRemoved(const QList &propertyList) override; void variantPropertiesChanged(const QList &propertyList, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; void bindingPropertiesChanged(const QList &propertyList, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; void signalHandlerPropertiesChanged(const QVector& propertyList, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList& propertyList) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void propertiesAboutToBeRemoved(const QList& propertyList) override; void selectedNodesChanged(const QList &selectedNodeList, - const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; - - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; - - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; + const QList &lastSelectedNodeList) override; + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; + void instancePropertyChange(const QList > &propertyList) override; + void instancesCompleted(const QVector &completedNodeList) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; + + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; + + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; + + void currentStateChanged(const ModelNode &node) override; void setResourcePath(const QString &resourcePath); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 4918fd48ac..e35c465c1f 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -58,45 +58,45 @@ public: WidgetInfo widgetInfo(); // AbstractView - void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void importsChanged(const QList &addedImports, const QList &removedImports) override; - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList &propertyList) Q_DECL_OVERRIDE; - void variantPropertiesChanged(const QList &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void bindingPropertiesChanged(const QList &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void nodeCreated(const ModelNode &createdNode) override; + void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; + void propertiesRemoved(const QList &propertyList) override; + void variantPropertiesChanged(const QList &propertyList, PropertyChangeFlags propertyChange) override; + void bindingPropertiesChanged(const QList &propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector& propertyList,PropertyChangeFlags propertyChange) override; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList& propertyList) Q_DECL_OVERRIDE; + void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) override; + void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void propertiesAboutToBeRemoved(const QList& propertyList) override; void selectedNodesChanged(const QList &selectedNodeList , - const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; - - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; - - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; + const QList &lastSelectedNodeList) override; + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; + void instancePropertyChange(const QList > &propertyList) override; + void instancesCompleted(const QVector &completedNodeList) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; + + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; + + void currentStateChanged(const ModelNode &node) override; + + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; private slots: void changeSelection(const QItemSelection &selected, const QItemSelection &deselected); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h index 2bf2d01709..1ae1b8d89c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h @@ -63,46 +63,46 @@ public: WidgetInfo widgetInfo(); void selectedNodesChanged(const QList &selectedNodeList, - const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; + const QList &lastSelectedNodeList) override; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; - void propertiesRemoved(const QList& propertyList) Q_DECL_OVERRIDE; + void propertiesRemoved(const QList& propertyList) override; - void modelAttached(Model *model) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; + void modelAboutToBeDetached(Model *model) override; ModelState modelState() const; - void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector& propertyList,PropertyChangeFlags propertyChange) override; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; void resetView(); - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList &propertyList) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void currentStateChanged(const ModelNode &node) override; + void instancePropertyChange(const QList > &propertyList) override; + + void nodeCreated(const ModelNode &createdNode) override; + void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; + void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) override; + void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) override; + void propertiesAboutToBeRemoved(const QList &propertyList) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; + void instancesCompleted(const QVector &completedNodeList) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; + void importsChanged(const QList &addedImports, const QList &removedImports) override; protected: void timerEvent(QTimerEvent *event); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h index 14875cec05..e15b682738 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h @@ -56,53 +56,53 @@ public: QmlModelStateGroup rootStateGroup() const; // AbstractView - void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList& propertyList) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; + void propertiesRemoved(const QList& propertyList) override; void variantPropertiesChanged(const QList& propertyList, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, - PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + PropertyChangeFlags propertyChange) override; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; // AbstractView - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; - - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) Q_DECL_OVERRIDE; - void bindingPropertiesChanged(const QList &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; - - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - - WidgetInfo widgetInfo() Q_DECL_OVERRIDE; - - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList &propertyList) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void currentStateChanged(const ModelNode &node) override; + + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; + void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) override; + void bindingPropertiesChanged(const QList &propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector& propertyList,PropertyChangeFlags propertyChange) override; + void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) override; + + void instancesPreviewImageChanged(const QVector &nodeList) override; + + WidgetInfo widgetInfo() override; + + void nodeCreated(const ModelNode &createdNode) override; + void propertiesAboutToBeRemoved(const QList &propertyList) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; + void instancePropertyChange(const QList > &propertyList) override; + void instancesCompleted(const QVector &completedNodeList) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; + void importsChanged(const QList &addedImports, const QList &removedImports) override; public slots: void synchonizeCurrentStateFromWidget(); diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp index d5617d9c8b..5847c3849f 100644 --- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp +++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp @@ -50,7 +50,7 @@ public: { } public /*slots*/: - void actionTriggered(bool) Q_DECL_OVERRIDE + void actionTriggered(bool) override { DocumentManager::goIntoComponent(m_selectionContext.targetNode()); } diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h index fff16395b5..94fd477e31 100644 --- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h +++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h @@ -40,10 +40,10 @@ class EnterTabDesignerAction : public AbstractActionGroup public: EnterTabDesignerAction(); - QByteArray category() const Q_DECL_OVERRIDE; - QByteArray menuId() const Q_DECL_OVERRIDE; - int priority() const Q_DECL_OVERRIDE; - void updateContext() Q_DECL_OVERRIDE; + QByteArray category() const override; + QByteArray menuId() const override; + int priority() const override; + void updateContext() override; protected: bool isVisible(const SelectionContext &selectionContext) const; diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index 9e50a32619..0cb8fa5c66 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -85,44 +85,44 @@ public: explicit NodeInstanceView(QObject *parent = 0, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus); ~NodeInstanceView(); - void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; + void nodeCreated(const ModelNode &createdNode) override; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; + void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; + void propertiesAboutToBeRemoved(const QList& propertyList) override; + void propertiesRemoved(const QList& propertyList) override; + void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector &propertyList, PropertyChangeFlags propertyChange) override; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; - void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE; - void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - - - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; + void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; + void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) override; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; + void instancePropertyChange(const QList > &propertyList) override; + void instancesCompleted(const QVector &completedNodeList) override; + void importsChanged(const QList &addedImports, const QList &removedImports) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; + void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) override; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; + + + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; void currentStateChanged(const ModelNode &node); diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 9077cf4908..f9c0af684e 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -115,51 +115,51 @@ public: RewriterView(DifferenceHandling differenceHandling, QObject *parent); ~RewriterView(); - void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; - void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void propertiesAboutToBeRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList& propertyList) Q_DECL_OVERRIDE; - void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; + void nodeCreated(const ModelNode &createdNode) override; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; + void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; + void propertiesAboutToBeRemoved(const QList& propertyList) override; + void propertiesRemoved(const QList& propertyList) override; + void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector& propertyList,PropertyChangeFlags propertyChange) override; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, - const QList &data) Q_DECL_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; + const QList &data) override; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; - void instancePropertyChange(const QList > &propertyList) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector &completedNodeList) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash &informationChangeHash) Q_DECL_OVERRIDE; - void instancesRenderImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesPreviewImageChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesChildrenChanged(const QVector &nodeList) Q_DECL_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList > &propertyList) override; + void instancesCompleted(const QVector &completedNodeList) override; + void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instancesRenderImageChanged(const QVector &nodeList) override; + void instancesPreviewImageChanged(const QVector &nodeList) override; + void instancesChildrenChanged(const QVector &nodeList) override; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) override; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; - void rewriterBeginTransaction() Q_DECL_OVERRIDE; - void rewriterEndTransaction() Q_DECL_OVERRIDE; + void rewriterBeginTransaction() override; + void rewriterEndTransaction() override; - void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; + void currentStateChanged(const ModelNode &node) override; - void importsChanged(const QList &addedImports, const QList &removedImports) Q_DECL_OVERRIDE; + void importsChanged(const QList &addedImports, const QList &removedImports) override; - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE; + void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) override; - void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) Q_DECL_OVERRIDE; + void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) override; TextModifier *textModifier() const; void setTextModifier(TextModifier *textModifier); -- GitLab