diff options
Diffstat (limited to 'src/plugins/qmldesigner')
19 files changed, 393 insertions, 394 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h b/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h index 1061cd4762..adfde1afe6 100644 --- a/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h +++ b/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h @@ -45,12 +45,12 @@ public: virtual bool isVisible(const SelectionContext &m_selectionState) const = 0; virtual bool isEnabled(const SelectionContext &m_selectionState) const = 0; - ActionInterface::Type type() const QTC_OVERRIDE; - QAction *action() const QTC_OVERRIDE; + ActionInterface::Type type() const Q_DECL_OVERRIDE; + QAction *action() const Q_DECL_OVERRIDE; QMenu *menu() const; SelectionContext selectionContext() const; - virtual void currentContextChanged(const SelectionContext &selectionContext) QTC_OVERRIDE; + virtual void currentContextChanged(const SelectionContext &selectionContext) Q_DECL_OVERRIDE; virtual void updateContext(); private: diff --git a/src/plugins/qmldesigner/components/debugview/debugview.h b/src/plugins/qmldesigner/components/debugview/debugview.h index f61be38424..eda20bea7c 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.h +++ b/src/plugins/qmldesigner/components/debugview/debugview.h @@ -48,50 +48,50 @@ public: ~DebugView(); // AbstractView - void modelAttached(Model *model) QTC_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; + void modelAttached(Model *model) Q_DECL_OVERRIDE; + void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_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) QTC_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; + 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<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE; + const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE; + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE; - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; + void rewriterBeginTransaction() Q_DECL_OVERRIDE; + void rewriterEndTransaction() Q_DECL_OVERRIDE; - WidgetInfo widgetInfo() QTC_OVERRIDE; - bool hasWidget() const QTC_OVERRIDE; + WidgetInfo widgetInfo() Q_DECL_OVERRIDE; + bool hasWidget() const Q_DECL_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_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<ModelNode> &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; 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 646c077e9c..541eadb4dc 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h +++ b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h @@ -39,7 +39,7 @@ class QMLDESIGNERCORE_EXPORT AbstractCustomTool : public QmlDesigner::AbstractFo public: AbstractCustomTool(); - void selectedItemsChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE; + void selectedItemsChanged(const QList<FormEditorItem *> &itemList) Q_DECL_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 eacef05229..612aefb340 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.h +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h @@ -48,36 +48,36 @@ public: DragTool(FormEditorView *editorView); virtual ~DragTool(); - void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; + void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; + void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void dropEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE; - void dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE; - void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE; - void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE; + void dropEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE; - void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; - void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; - void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; - void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; + void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; + void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void updateMoveManipulator(); void beginWithPoint(const QPointF &beginPoint); - void clear() QTC_OVERRIDE; + void clear() Q_DECL_OVERRIDE; - void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; - void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void clearMoveDelay(); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index fc0d9c9f78..106a641fa8 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -64,30 +64,30 @@ public: ~FormEditorView(); // AbstractView - void modelAttached(Model *model) QTC_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; + void modelAttached(Model *model) Q_DECL_OVERRIDE; + void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_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<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE; + const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; - void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE; + void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE; // FormEditorView - WidgetInfo widgetInfo() QTC_OVERRIDE; + WidgetInfo widgetInfo() Q_DECL_OVERRIDE; FormEditorWidget *formEditorWidget(); AbstractFormEditorTool *currentTool() const; @@ -105,29 +105,29 @@ public: void registerTool(AbstractCustomTool *tool); - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE; + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; + void rewriterBeginTransaction() Q_DECL_OVERRIDE; + void rewriterEndTransaction() Q_DECL_OVERRIDE; double containerPadding() const; double spacing() const; void deActivateItemCreator(); - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_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; protected: void reset(); diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.h b/src/plugins/qmldesigner/components/formeditor/movetool.h index 9947037ea1..1cbe637b5b 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.h +++ b/src/plugins/qmldesigner/components/formeditor/movetool.h @@ -47,32 +47,32 @@ public: MoveTool(FormEditorView* editorView); ~MoveTool(); - void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE; - void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE; + void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; - void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE; - void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE; + void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; + void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; - void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; - void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; - void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; - void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; + void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; + void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void updateMoveManipulator(); void beginWithPoint(const QPointF &beginPoint); - void clear() QTC_OVERRIDE; + void clear() Q_DECL_OVERRIDE; - void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; protected: static bool haveSameParent(const QList<FormEditorItem*> &itemList); diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.h b/src/plugins/qmldesigner/components/formeditor/resizetool.h index f6f067eb0c..2cd98f7c2e 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizetool.h +++ b/src/plugins/qmldesigner/components/formeditor/resizetool.h @@ -45,30 +45,30 @@ public: ResizeTool(FormEditorView* editorView); ~ResizeTool(); - void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; + void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; + void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE; - void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE; + void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE; - void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; - void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; - void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; - void clear() QTC_OVERRIDE; + void clear() Q_DECL_OVERRIDE; - void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; - void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE; + void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; + void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; - void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; + void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; private: diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.h b/src/plugins/qmldesigner/components/formeditor/selectiontool.h index 20c6632bef..cc7f1cca91 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h @@ -51,35 +51,35 @@ public: SelectionTool(FormEditorView* editorView); ~SelectionTool(); - void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; - void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; + void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE; + void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE; - void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; - void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE; - void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE; + void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; + void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; - void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; // QVariant itemChange(const QList<QGraphicsItem*> &itemList, // QGraphicsItem::GraphicsItemChange change, // const QVariant &value ); // void update(); - void clear() QTC_OVERRIDE; + void clear() Q_DECL_OVERRIDE; - void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; - void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; + void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; - void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE; - void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; + void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; + void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void selectUnderPoint(QGraphicsSceneMouseEvent *event); diff --git a/src/plugins/qmldesigner/components/integration/componentview.h b/src/plugins/qmldesigner/components/integration/componentview.h index bf1fba2a5c..ecc3e32bff 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.h +++ b/src/plugins/qmldesigner/components/integration/componentview.h @@ -56,60 +56,60 @@ public: ComponentView(QObject *parent = 0); - void modelAttached(Model *model) QTC_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; + void modelAttached(Model *model) Q_DECL_OVERRIDE; + void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; ComponentAction *action(); - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_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) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; + void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty>& propertyList, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; + 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<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; + void rewriterBeginTransaction() Q_DECL_OVERRIDE; + void rewriterEndTransaction() Q_DECL_OVERRIDE; - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; + const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE; + void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_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<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE; + const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; QStandardItemModel *standardItemModel() const; diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.h b/src/plugins/qmldesigner/components/integration/designdocumentview.h index 96cfb1d7b9..c5cd7ffecf 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.h +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.h @@ -42,46 +42,46 @@ public: DesignDocumentView(QObject *parent = 0); ~DesignDocumentView(); - virtual void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; - virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE; + 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 nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; virtual void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; + 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<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; virtual void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; + const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; - virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; - virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_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<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; void rewriterBeginTransaction(); void rewriterEndTransaction(); - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_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 7bd6a0111b..d9bcc4cefa 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h @@ -48,57 +48,57 @@ public: ItemLibraryView(QObject* parent = 0); ~ItemLibraryView(); - bool hasWidget() const QTC_OVERRIDE; - WidgetInfo widgetInfo() QTC_OVERRIDE; + bool hasWidget() const Q_DECL_OVERRIDE; + WidgetInfo widgetInfo() Q_DECL_OVERRIDE; // AbstractView - void modelAttached(Model *model) QTC_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; + void modelAttached(Model *model) Q_DECL_OVERRIDE; + void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; + void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty> &propertyList, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; + void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; + 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<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; - - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; - - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; - - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; + const QList<ModelNode> &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<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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; void setResourcePath(const QString &resourcePath); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 5918c55762..b27803ba80 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -57,45 +57,45 @@ public: WidgetInfo widgetInfo(); // AbstractView - void modelAttached(Model *model) QTC_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; + void modelAttached(Model *model) Q_DECL_OVERRIDE; + void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE; - void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_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<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; + void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; + void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_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<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList , - const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; - - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; - - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; - - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; + const QList<ModelNode> &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<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &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<ModelNode> &nodeVector) Q_DECL_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 e3021586de..e9a6de5451 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h @@ -62,46 +62,46 @@ public: WidgetInfo widgetInfo(); void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; + const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; + void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; - void modelAttached(Model *model) QTC_OVERRIDE; + void modelAttached(Model *model) Q_DECL_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; + void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; ModelState modelState() const; - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE; + void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_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 resetView(); - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &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<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_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 a7c1b0a481..f92e212144 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h @@ -55,53 +55,53 @@ public: QmlModelStateGroup rootStateGroup() const; // AbstractView - void modelAttached(Model *model) QTC_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; + void modelAttached(Model *model) Q_DECL_OVERRIDE; + void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty>& propertyList, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; + void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, - PropertyChangeFlags propertyChange) QTC_OVERRIDE; + PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; // AbstractView - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; - - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; - void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) QTC_OVERRIDE; - void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; - - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - - WidgetInfo widgetInfo() QTC_OVERRIDE; - - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + 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<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; + + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + + WidgetInfo widgetInfo() Q_DECL_OVERRIDE; + + void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; + void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; public slots: void synchonizeCurrentStateFromWidget(); diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp index 6894e5df23..cb7fc0cd8e 100644 --- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp +++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp @@ -49,7 +49,7 @@ public: { } public /*slots*/: - void actionTriggered(bool) QTC_OVERRIDE + void actionTriggered(bool) Q_DECL_OVERRIDE { DocumentManager::goIntoComponent(m_selectionContext.targetNode()); } diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h index e4d7db2c42..a878c9baee 100644 --- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h +++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h @@ -39,10 +39,10 @@ class EnterTabDesignerAction : public AbstractActionGroup public: EnterTabDesignerAction(); - QByteArray category() const QTC_OVERRIDE; - QByteArray menuId() const QTC_OVERRIDE; - int priority() const QTC_OVERRIDE; - void updateContext() QTC_OVERRIDE; + QByteArray category() const Q_DECL_OVERRIDE; + QByteArray menuId() const Q_DECL_OVERRIDE; + int priority() const Q_DECL_OVERRIDE; + void updateContext() Q_DECL_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 bc027c0f71..c3254419c6 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -84,44 +84,44 @@ public: explicit NodeInstanceView(QObject *parent = 0, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus); ~NodeInstanceView(); - void modelAttached(Model *model) QTC_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; + 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<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; - void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE; - void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; - - - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; + 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<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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<ModelNode> &nodeList, const QList<QVariant> &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; void currentStateChanged(const ModelNode &node); diff --git a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h index a1ad1acad9..50f5213b35 100644 --- a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h +++ b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h @@ -33,7 +33,6 @@ #include <QtGlobal> #include <QList> -#include <utils/qtcoverride.h> // Unnecessary since core isn't a dll any more. diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 770b242464..953b4a9f25 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -114,51 +114,51 @@ public: RewriterView(DifferenceHandling differenceHandling, QObject *parent); ~RewriterView(); - void modelAttached(Model *model) QTC_OVERRIDE; - void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; - void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; - void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE; + 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<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; + void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; + AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE; - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE; + 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; void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, - const QList<QVariant> &data) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; + const QList<QVariant> &data) Q_DECL_OVERRIDE; + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; - void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; + void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE; + void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; - void rewriterBeginTransaction() QTC_OVERRIDE; - void rewriterEndTransaction() QTC_OVERRIDE; + void rewriterBeginTransaction() Q_DECL_OVERRIDE; + void rewriterEndTransaction() Q_DECL_OVERRIDE; - void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE; + void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE; - void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; + void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; TextModifier *textModifier() const; void setTextModifier(TextModifier *textModifier); |