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

qmldesigner: s/Q_DECL_OVERRIDE/override/g

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

6
src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h
View File

@@ -46,12 +46,12 @@ public:
virtual bool isVisible(const SelectionContext &m_selectionState) const = 0; virtual bool isVisible(const SelectionContext &m_selectionState) const = 0;
virtual bool isEnabled(const SelectionContext &m_selectionState) const = 0; virtual bool isEnabled(const SelectionContext &m_selectionState) const = 0;
ActionInterface::Type type() const Q_DECL_OVERRIDE; ActionInterface::Type type() const override;
QAction *action() const Q_DECL_OVERRIDE; QAction *action() const override;
QMenu *menu() const; QMenu *menu() const;
SelectionContext selectionContext() const; SelectionContext selectionContext() const;
virtual void currentContextChanged(const SelectionContext &selectionContext) Q_DECL_OVERRIDE; virtual void currentContextChanged(const SelectionContext &selectionContext) override;
virtual void updateContext(); virtual void updateContext();
private: private:

66
src/plugins/qmldesigner/components/debugview/debugview.h
View File

@@ -49,50 +49,50 @@ public:
~DebugView(); ~DebugView();
// AbstractView // AbstractView
void modelAttached(Model *model) Q_DECL_OVERRIDE; void modelAttached(Model *model) override;
void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; void modelAboutToBeDetached(Model *model) override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override;
void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; void nodeCreated(const ModelNode &createdNode) override;
void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; void nodeAboutToBeRemoved(const ModelNode &removedNode) override;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) override;
void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; const QList<ModelNode> &lastSelectedNodeList) override;
void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty> &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 rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() override;
WidgetInfo widgetInfo() Q_DECL_OVERRIDE; WidgetInfo widgetInfo() override;
bool hasWidget() const Q_DECL_OVERRIDE; bool hasWidget() const override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE; void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &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 nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) override;
void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void currentStateChanged(const ModelNode &node) 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;
protected: protected:
void log(const QString &title, const QString &message, bool highlight = false); void log(const QString &title, const QString &message, bool highlight = false);

2
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
View File

@@ -40,7 +40,7 @@ class QMLDESIGNERCORE_EXPORT AbstractCustomTool : public QmlDesigner::AbstractFo
public: public:
AbstractCustomTool(); AbstractCustomTool();
void selectedItemsChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; void selectedItemsChanged(const QList<FormEditorItem *> &itemList) override;
virtual QString name() const = 0; virtual QString name() const = 0;

36
src/plugins/qmldesigner/components/formeditor/dragtool.h
View File

@@ -49,36 +49,36 @@ public:
DragTool(FormEditorView *editorView); DragTool(FormEditorView *editorView);
virtual ~DragTool(); virtual ~DragTool();
void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void dropEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; void dropEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) override;
void dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; void dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) override;
void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) override;
void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) override;
void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *event) override;
void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent *keyEvent) override;
void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) override;
void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void selectedItemsChanged(const QList<FormEditorItem*> &itemList) override;
void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; void instancesParentChanged(const QList<FormEditorItem *> &itemList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void updateMoveManipulator(); void updateMoveManipulator();
void beginWithPoint(const QPointF &beginPoint); void beginWithPoint(const QPointF &beginPoint);
void clear() Q_DECL_OVERRIDE; void clear() override;
void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) override;
void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void instancesCompleted(const QList<FormEditorItem*> &itemList) override;
void clearMoveDelay(); void clearMoveDelay();

64
src/plugins/qmldesigner/components/formeditor/formeditorview.h
View File

@@ -65,30 +65,30 @@ public:
~FormEditorView(); ~FormEditorView();
// AbstractView // AbstractView
void modelAttached(Model *model) Q_DECL_OVERRIDE; void modelAttached(Model *model) override;
void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; void modelAboutToBeDetached(Model *model) override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override;
void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; void nodeCreated(const ModelNode &createdNode) override;
void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_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 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) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; const QList<ModelNode> &lastSelectedNodeList) override;
void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty> &propertyList) override;
void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE; void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) override;
// FormEditorView // FormEditorView
WidgetInfo widgetInfo() Q_DECL_OVERRIDE; WidgetInfo widgetInfo() override;
FormEditorWidget *formEditorWidget(); FormEditorWidget *formEditorWidget();
AbstractFormEditorTool *currentTool() const; AbstractFormEditorTool *currentTool() const;
@@ -106,29 +106,29 @@ public:
void registerTool(AbstractCustomTool *tool); 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<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) override;
void rewriterBeginTransaction() Q_DECL_OVERRIDE; void rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() override;
double containerPadding() const; double containerPadding() const;
double spacing() const; double spacing() const;
void deActivateItemCreator(); 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 nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) override;
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE; void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) 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;
protected: protected:
void reset(); void reset();

32
src/plugins/qmldesigner/components/formeditor/movetool.h
View File

@@ -48,32 +48,32 @@ public:
MoveTool(FormEditorView* editorView); MoveTool(FormEditorView* editorView);
~MoveTool(); ~MoveTool();
void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *event) override;
void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent *keyEvent) override;
void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) override;
void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) override;
void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) override;
void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void selectedItemsChanged(const QList<FormEditorItem*> &itemList) override;
void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void instancesCompleted(const QList<FormEditorItem*> &itemList) override;
void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; void instancesParentChanged(const QList<FormEditorItem *> &itemList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void updateMoveManipulator(); void updateMoveManipulator();
void beginWithPoint(const QPointF &beginPoint); void beginWithPoint(const QPointF &beginPoint);
void clear() Q_DECL_OVERRIDE; void clear() override;
void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) override;
protected: protected:
static bool haveSameParent(const QList<FormEditorItem*> &itemList); static bool haveSameParent(const QList<FormEditorItem*> &itemList);

32
src/plugins/qmldesigner/components/formeditor/resizetool.h
View File

@@ -46,30 +46,30 @@ public:
ResizeTool(FormEditorView* editorView); ResizeTool(FormEditorView* editorView);
~ResizeTool(); ~ResizeTool();
void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) override;
void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) override;
void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *event) override;
void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent *keyEvent) override;
void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) override;
void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void selectedItemsChanged(const QList<FormEditorItem*> &itemList) override;
void clear() Q_DECL_OVERRIDE; void clear() override;
void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) override;
void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; void instancesParentChanged(const QList<FormEditorItem *> &itemList) override;
void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void instancesCompleted(const QList<FormEditorItem*> &itemList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
private: private:

32
src/plugins/qmldesigner/components/formeditor/selectiontool.h
View File

@@ -52,35 +52,35 @@ public:
SelectionTool(FormEditorView* editorView); SelectionTool(FormEditorView* editorView);
~SelectionTool(); ~SelectionTool();
void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) override;
void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *event) override;
void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent *keyEvent) override;
void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) override;
void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE; void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) override;
void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) override;
// QVariant itemChange(const QList<QGraphicsItem*> &itemList, // QVariant itemChange(const QList<QGraphicsItem*> &itemList,
// QGraphicsItem::GraphicsItemChange change, // QGraphicsItem::GraphicsItemChange change,
// const QVariant &value ); // const QVariant &value );
// void update(); // void update();
void clear() Q_DECL_OVERRIDE; void clear() override;
void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void selectedItemsChanged(const QList<FormEditorItem*> &itemList) override;
void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) override;
void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE; void instancesCompleted(const QList<FormEditorItem*> &itemList) override;
void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE; void instancesParentChanged(const QList<FormEditorItem *> &itemList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void selectUnderPoint(QGraphicsSceneMouseEvent *event); void selectUnderPoint(QGraphicsSceneMouseEvent *event);

64
src/plugins/qmldesigner/components/integration/componentview.h
View File

@@ -57,60 +57,60 @@ public:
ComponentView(QObject *parent = 0); ComponentView(QObject *parent = 0);
void modelAttached(Model *model) Q_DECL_OVERRIDE; void modelAttached(Model *model) override;
void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; void modelAboutToBeDetached(Model *model) override;
ComponentAction *action(); ComponentAction *action();
void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; void nodeCreated(const ModelNode &createdNode) override;
void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; void nodeAboutToBeRemoved(const ModelNode &removedNode) override;
void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override;
void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty>& propertyList) override;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, void variantPropertiesChanged(const QList<VariantProperty>& propertyList,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, void bindingPropertiesChanged(const QList<BindingProperty>& propertyList,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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 rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() override;
void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void currentStateChanged(const ModelNode &node) override;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; const QList<ModelNode> &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, void customNotification(const AbstractView *view, const QString &identifier,
const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE; const QList<ModelNode> &nodeList, const QList<QVariant> &data) override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override;
QStandardItemModel *standardItemModel() const; QStandardItemModel *standardItemModel() const;

50
src/plugins/qmldesigner/components/integration/designdocumentview.h
View File

@@ -43,46 +43,46 @@ public:
DesignDocumentView(QObject *parent = 0); DesignDocumentView(QObject *parent = 0);
~DesignDocumentView(); ~DesignDocumentView();
virtual void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; virtual void nodeCreated(const ModelNode &createdNode) override;
virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) override;
virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override;
virtual void nodeAboutToBeReparented(const ModelNode &node, virtual void nodeAboutToBeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
virtual void nodeReparented(const ModelNode &node, virtual void nodeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override;
virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override;
virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) override;
virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override;
virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override;
virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) override;
virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
virtual void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, virtual void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; const QList<ModelNode> &lastSelectedNodeList) override;
virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE; virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override;
virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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 rewriterBeginTransaction();
void rewriterEndTransaction(); void rewriterEndTransaction();
void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void currentStateChanged(const ModelNode &node) override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override;
ModelNode insertModel(const ModelNode &modelNode) ModelNode insertModel(const ModelNode &modelNode)
{ return m_modelMerger.insertModel(modelNode); } { return m_modelMerger.insertModel(modelNode); }

64
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
View File

@@ -49,57 +49,57 @@ public:
ItemLibraryView(QObject* parent = 0); ItemLibraryView(QObject* parent = 0);
~ItemLibraryView(); ~ItemLibraryView();
bool hasWidget() const Q_DECL_OVERRIDE; bool hasWidget() const override;
WidgetInfo widgetInfo() Q_DECL_OVERRIDE; WidgetInfo widgetInfo() override;
// AbstractView // AbstractView
void modelAttached(Model *model) Q_DECL_OVERRIDE; void modelAttached(Model *model) override;
void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; void modelAboutToBeDetached(Model *model) override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override;
void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; void nodeCreated(const ModelNode &createdNode) override;
void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty> &propertyList) override;
void variantPropertiesChanged(const QList<VariantProperty> &propertyList, void variantPropertiesChanged(const QList<VariantProperty> &propertyList,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, void bindingPropertiesChanged(const QList<BindingProperty> &propertyList,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; void nodeAboutToBeRemoved(const ModelNode &removedNode) 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 nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; const QList<ModelNode> &lastSelectedNodeList) 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 scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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 rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() override;
void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void currentStateChanged(const ModelNode &node) override;
void setResourcePath(const QString &resourcePath); void setResourcePath(const QString &resourcePath);

60
src/plugins/qmldesigner/components/navigator/navigatorview.h
View File

@@ -58,45 +58,45 @@ public:
WidgetInfo widgetInfo(); WidgetInfo widgetInfo();
// AbstractView // AbstractView
void modelAttached(Model *model) Q_DECL_OVERRIDE; void modelAttached(Model *model) override;
void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; void modelAboutToBeDetached(Model *model) override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &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 nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override;
void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty> &propertyList) override;
void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) override;
void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; void nodeAboutToBeRemoved(const ModelNode &removedNode) 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 nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) 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) Q_DECL_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) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList , void selectedNodesChanged(const QList<ModelNode> &selectedNodeList ,
const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; const QList<ModelNode> &lastSelectedNodeList) 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 scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) 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 rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() override;
void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void currentStateChanged(const ModelNode &node) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) override;
private slots: private slots:
void changeSelection(const QItemSelection &selected, const QItemSelection &deselected); void changeSelection(const QItemSelection &selected, const QItemSelection &deselected);

58
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
View File

@@ -63,46 +63,46 @@ public:
WidgetInfo widgetInfo(); WidgetInfo widgetInfo();
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; const QList<ModelNode> &lastSelectedNodeList) override;
void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE; void nodeAboutToBeRemoved(const ModelNode &removedNode) override;
void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty>& 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; ModelState modelState() const;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override;
void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void resetView(); void resetView();
void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void currentStateChanged(const ModelNode &node) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) 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 nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_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) Q_DECL_OVERRIDE; void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) override;
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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 rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() 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 importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override;
protected: protected:
void timerEvent(QTimerEvent *event); void timerEvent(QTimerEvent *event);

60
src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
View File

@@ -56,53 +56,53 @@ public:
QmlModelStateGroup rootStateGroup() const; QmlModelStateGroup rootStateGroup() const;
// AbstractView // AbstractView
void modelAttached(Model *model) Q_DECL_OVERRIDE; void modelAttached(Model *model) override;
void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; void modelAboutToBeDetached(Model *model) override;
void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty>& propertyList) override;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, void variantPropertiesChanged(const QList<VariantProperty>& 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, void nodeRemoved(const ModelNode &removedNode,
const NodeAbstractProperty &parentProperty, const NodeAbstractProperty &parentProperty,
PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; PropertyChangeFlags propertyChange) override;
void nodeAboutToBeReparented(const ModelNode &node, void nodeAboutToBeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void nodeReparented(const ModelNode &node, void nodeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) 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;
// AbstractView // AbstractView
void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void currentStateChanged(const ModelNode &node) override;
void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) override;
void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) override;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
WidgetInfo widgetInfo() Q_DECL_OVERRIDE; WidgetInfo widgetInfo() override;
void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; void nodeCreated(const ModelNode &createdNode) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) override;
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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 rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override;
public slots: public slots:
void synchonizeCurrentStateFromWidget(); void synchonizeCurrentStateFromWidget();

2
src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp
View File

@@ -50,7 +50,7 @@ public:
{ } { }
public /*slots*/: public /*slots*/:
void actionTriggered(bool) Q_DECL_OVERRIDE void actionTriggered(bool) override
{ {
DocumentManager::goIntoComponent(m_selectionContext.targetNode()); DocumentManager::goIntoComponent(m_selectionContext.targetNode());
} }

8
src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h
View File

@@ -40,10 +40,10 @@ class EnterTabDesignerAction : public AbstractActionGroup
public: public:
EnterTabDesignerAction(); EnterTabDesignerAction();
QByteArray category() const Q_DECL_OVERRIDE; QByteArray category() const override;
QByteArray menuId() const Q_DECL_OVERRIDE; QByteArray menuId() const override;
int priority() const Q_DECL_OVERRIDE; int priority() const override;
void updateContext() Q_DECL_OVERRIDE; void updateContext() override;
protected: protected:
bool isVisible(const SelectionContext &selectionContext) const; bool isVisible(const SelectionContext &selectionContext) const;

62
src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
View File

@@ -85,44 +85,44 @@ public:
explicit NodeInstanceView(QObject *parent = 0, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus); explicit NodeInstanceView(QObject *parent = 0, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus);
~NodeInstanceView(); ~NodeInstanceView();
void modelAttached(Model *model) Q_DECL_OVERRIDE; void modelAttached(Model *model) override;
void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; void modelAboutToBeDetached(Model *model) override;
void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; void nodeCreated(const ModelNode &createdNode) 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; void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override;
void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty>& propertyList) override;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange) override;
void nodeAboutToBeReparented(const ModelNode &node, void nodeAboutToBeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE; void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) override;
void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) 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 selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) override;
void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) 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<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE; void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) 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 rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() override;
void currentStateChanged(const ModelNode &node); void currentStateChanged(const ModelNode &node);

62
src/plugins/qmldesigner/designercore/include/rewriterview.h
View File

@@ -115,51 +115,51 @@ public:
RewriterView(DifferenceHandling differenceHandling, QObject *parent); RewriterView(DifferenceHandling differenceHandling, QObject *parent);
~RewriterView(); ~RewriterView();
void modelAttached(Model *model) Q_DECL_OVERRIDE; void modelAttached(Model *model) override;
void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE; void modelAboutToBeDetached(Model *model) override;
void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE; void nodeCreated(const ModelNode &createdNode) 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; void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override;
void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override;
void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE; void propertiesRemoved(const QList<AbstractProperty>& propertyList) override;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) override;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent, const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE; AbstractView::PropertyChangeFlags propertyChange) override;
void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) 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 rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
void customNotification(const AbstractView *view, const QString &identifier, void customNotification(const AbstractView *view, const QString &identifier,
const QList<ModelNode> &nodeList, const QList<ModelNode> &nodeList,
const QList<QVariant> &data) Q_DECL_OVERRIDE; const QList<QVariant> &data) override;
void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE; void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE; void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE; void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &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 rewriterBeginTransaction() override;
void rewriterEndTransaction() Q_DECL_OVERRIDE; void rewriterEndTransaction() override;
void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE; void currentStateChanged(const ModelNode &node) override;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE; void importsChanged(const QList<Import> &addedImports, const QList<Import> &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<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) override;
TextModifier *textModifier() const; TextModifier *textModifier() const;
void setTextModifier(TextModifier *textModifier); void setTextModifier(TextModifier *textModifier);