From 0dd5f681528f2507005cc0f381d3f87995e14c01 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 31 Jul 2013 15:19:18 +0200 Subject: [PATCH] QmlDesigner: Rename actualState in currentState Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7 Reviewed-by: Thomas Hartmann --- .../instances/qt5previewnodeinstanceserver.h | 2 +- .../instances/qt4previewnodeinstanceserver.h | 2 +- .../componentcore/designeractionmanager.cpp | 2 +- .../componentcore/selectioncontext.cpp | 2 +- .../components/debugview/debugview.cpp | 2 +- .../qmldesigner/components/debugview/debugview.h | 2 +- .../components/formeditor/formeditorview.cpp | 2 +- .../components/formeditor/formeditorview.h | 2 +- .../components/formeditor/formeditorwidget.cpp | 2 +- .../components/formeditor/movemanipulator.cpp | 2 +- .../components/formeditor/movemanipulator.h | 4 ++-- .../components/formeditor/movetool.cpp | 2 +- .../components/integration/componentview.cpp | 2 +- .../components/integration/componentview.h | 2 +- .../integration/designdocumentview.cpp | 2 +- .../components/integration/designdocumentview.h | 2 +- .../components/itemlibrary/itemlibraryview.cpp | 2 +- .../components/itemlibrary/itemlibraryview.h | 2 +- .../components/navigator/navigatorview.cpp | 2 +- .../components/navigator/navigatorview.h | 2 +- .../components/propertyeditor/propertyeditor.cpp | 4 ++-- .../components/propertyeditor/propertyeditor.h | 2 +- .../components/stateseditor/stateseditorview.cpp | 8 ++++---- .../components/stateseditor/stateseditorview.h | 2 +- .../designercore/include/abstractview.h | 6 +++--- .../designercore/include/nodeinstanceview.h | 2 +- .../designercore/include/rewriterview.h | 2 +- .../designercore/instances/nodeinstanceview.cpp | 6 +++--- .../designercore/model/abstractview.cpp | 8 ++++---- .../qmldesigner/designercore/model/model.cpp | 16 ++++++++-------- .../qmldesigner/designercore/model/model_p.h | 6 +++--- .../designercore/model/qmlitemnode.cpp | 4 ++-- .../designercore/model/qmlobjectnode.cpp | 2 +- .../designercore/model/rewriterview.cpp | 2 +- .../designercore/model/viewmanager.cpp | 2 +- 35 files changed, 57 insertions(+), 57 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h index 5064812770c..4d6630098c8 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h @@ -51,7 +51,7 @@ protected: void startRenderTimer() Q_DECL_OVERRIDE; private: - ServerNodeInstance m_actualState; + ServerNodeInstance m_currentState; }; } // namespace QmlDesigner diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h index 9737370ed61..ba03c477cb1 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h @@ -51,7 +51,7 @@ protected: void startRenderTimer(); private: - ServerNodeInstance m_actualState; + ServerNodeInstance m_currentState; }; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index be07a5fbbe3..53a20b5a133 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -154,7 +154,7 @@ public: setupContext(); } - virtual void actualStateChanged(const ModelNode &) QTC_OVERRIDE + virtual void currentStateChanged(const ModelNode &) QTC_OVERRIDE { setupContext(); } diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp index 42f09448d84..b6e592c047a 100644 --- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp +++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp @@ -63,7 +63,7 @@ bool SelectionContext::singleNodeIsSelected() const bool SelectionContext::isInBaseState() const { - return QmlModelState(view()->actualStateNode()).isBaseState(); + return QmlModelState(view()->currentStateNode()).isBaseState(); } ModelNode SelectionContext::currentSingleSelectedNode() const diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index 37cc7d6734e..deb6840e001 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -386,7 +386,7 @@ void DebugView::instancesToken(const QString &/*tokenName*/, int /*tokenNumber*/ } -void DebugView::actualStateChanged(const ModelNode &/*node*/) +void DebugView::currentStateChanged(const ModelNode &/*node*/) { } diff --git a/src/plugins/qmldesigner/components/debugview/debugview.h b/src/plugins/qmldesigner/components/debugview/debugview.h index f0e8e78520e..88915ce68f9 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.h +++ b/src/plugins/qmldesigner/components/debugview/debugview.h @@ -90,7 +90,7 @@ public: 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 &nodeVector) QTC_OVERRIDE; - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; protected: diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 81fec1c6c1f..c4489a59a11 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -619,7 +619,7 @@ bool FormEditorView::isMoveToolAvailable() const return true; } -void FormEditorView::actualStateChanged(const ModelNode &/*node*/) +void FormEditorView::currentStateChanged(const ModelNode &/*node*/) { } diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index c245b2f3ce7..bb5fcc6d876 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -123,7 +123,7 @@ public: double spacing() const; void deActivateItemCreator(); - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) 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; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index c0bd2a60e56..6c091108346 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -178,7 +178,7 @@ void FormEditorWidget::changeRootItemHeight(const QString &heighText) void FormEditorWidget::resetNodeInstanceView() { - m_formEditorView->setAcutalStateNode(m_formEditorView->rootModelNode()); + m_formEditorView->setCurrentStateNode(m_formEditorView->rootModelNode()); m_formEditorView->emitCustomNotification(QLatin1String("reset QmlPuppet")); } diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp index ba777968d68..5ed78b6edd8 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp @@ -277,7 +277,7 @@ void MoveManipulator::update(const QPointF& updatePoint, Snapper::Snapping useSn continue; // don't support anchors for base state because it is not needed by the droptool - if (stateToBeManipulated == UseActualState) { + if (stateToBeManipulated == UseCurrentState) { QmlAnchors anchors(item->qmlItemNode().anchors()); if (anchors.instanceHasAnchor(AnchorLine::Top)) diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.h b/src/plugins/qmldesigner/components/formeditor/movemanipulator.h index f702a88ba04..98647bb2def 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.h +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.h @@ -50,7 +50,7 @@ class MoveManipulator { public: enum State { - UseActualState, + UseCurrentState, UseBaseState }; @@ -62,7 +62,7 @@ public: void synchronizeParent(const QList &itemList, const ModelNode &parentNode); void begin(const QPointF& beginPoint); - void update(const QPointF& updatePoint, Snapper::Snapping useSnapping, State stateToBeManipulated = UseActualState); + void update(const QPointF& updatePoint, Snapper::Snapping useSnapping, State stateToBeManipulated = UseCurrentState); void reparentTo(FormEditorItem *newParent); void end(); void end(Snapper::Snapping useSnapping); diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp index 9e11eb297ec..b47a820fbf4 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp @@ -96,7 +96,7 @@ void MoveTool::mouseMoveEvent(const QList &itemList, FormEditorItem *containerItem = containerFormEditorItem(itemList, m_movingItems); if (containerItem - && QmlModelState::isBaseState(view()->actualStateNode())) { + && QmlModelState::isBaseState(view()->currentStateNode())) { if (containerItem != m_movingItems.first()->parentItem() && event->modifiers().testFlag(Qt::ShiftModifier)) { m_moveManipulator.reparentTo(containerItem); diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp index d84120101b7..53d82f8adc1 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.cpp +++ b/src/plugins/qmldesigner/components/integration/componentview.cpp @@ -202,7 +202,7 @@ void ComponentView::nodeSourceChanged(const ModelNode &, const QString & /*newNo void ComponentView::rewriterBeginTransaction() {} void ComponentView::rewriterEndTransaction() {} -void ComponentView::actualStateChanged(const ModelNode &/*node*/) {} +void ComponentView::currentStateChanged(const ModelNode &/*node*/) {} void ComponentView::selectedNodesChanged(const QList &/*selectedNodeList*/, const QList &/*lastSelectedNodeList*/) {} diff --git a/src/plugins/qmldesigner/components/integration/componentview.h b/src/plugins/qmldesigner/components/integration/componentview.h index f3287940aab..3c5f3ab74b2 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.h +++ b/src/plugins/qmldesigner/components/integration/componentview.h @@ -95,7 +95,7 @@ public: void rewriterBeginTransaction() QTC_OVERRIDE; void rewriterEndTransaction() QTC_OVERRIDE; - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) QTC_OVERRIDE; diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp index 8c44ee83431..b0d33785409 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp @@ -119,7 +119,7 @@ void DesignDocumentView::rewriterEndTransaction() { } -void DesignDocumentView::actualStateChanged(const ModelNode &/*node*/) +void DesignDocumentView::currentStateChanged(const ModelNode &/*node*/) { } diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.h b/src/plugins/qmldesigner/components/integration/designdocumentview.h index d2ef379fec6..6cd5bf43324 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.h +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.h @@ -79,7 +79,7 @@ public: void rewriterBeginTransaction(); void rewriterEndTransaction(); - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; void importsChanged(const QList &addedImports, const QList &removedImports) QTC_OVERRIDE; diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp index 82ea759fe29..f1d011f878b 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp @@ -203,7 +203,7 @@ void ItemLibraryView::rewriterEndTransaction() { } -void ItemLibraryView::actualStateChanged(const ModelNode &/*node*/) +void ItemLibraryView::currentStateChanged(const ModelNode &/*node*/) { } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h index dc156d61e23..a4f9a9d3f47 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h @@ -98,7 +98,7 @@ public: void rewriterBeginTransaction() QTC_OVERRIDE; void rewriterEndTransaction() QTC_OVERRIDE; - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; void setResourcePath(const QString &resourcePath); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index cae98204acc..b24fd87ea07 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -275,7 +275,7 @@ void NavigatorView::rewriterEndTransaction() { } -void NavigatorView::actualStateChanged(const ModelNode &/*node*/) +void NavigatorView::currentStateChanged(const ModelNode &/*node*/) { } diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 575e1e37de2..aede53b67fc 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -96,7 +96,7 @@ public: void rewriterBeginTransaction() QTC_OVERRIDE; void rewriterEndTransaction() QTC_OVERRIDE; - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; void instancesToken(const QString &tokenName, int tokenNumber, const QVector &nodeVector) QTC_OVERRIDE; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp index ec07acb5156..93a7c45396e 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp @@ -738,7 +738,7 @@ void PropertyEditor::resetView() NodeType *type = m_typeHash.value(qmlFile.toString()); - QString currentStateName = QmlModelState::isValidQmlModelState(actualStateNode()) ? QmlModelState(actualStateNode()).name() : QLatin1String("invalid state"); + QString currentStateName = QmlModelState::isValidQmlModelState(currentStateNode()) ? QmlModelState(currentStateNode()).name() : QLatin1String("invalid state"); if (!type) { type = new NodeType(this); @@ -961,7 +961,7 @@ WidgetInfo PropertyEditor::widgetInfo() return createWidgetInfo(m_stackedWidget, 0, QLatin1String("Properties"), WidgetInfo::RightPane, 0); } -void PropertyEditor::actualStateChanged(const ModelNode &node) +void PropertyEditor::currentStateChanged(const ModelNode &node) { QmlModelState newQmlModelState(node); Q_ASSERT(newQmlModelState.isValid()); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h index df6f53e63d8..46ba909692e 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h @@ -107,7 +107,7 @@ public: void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; void resetView(); - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; void instancePropertyChange(const QList > &propertyList) QTC_OVERRIDE; void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index 0ae97319169..1497804e76d 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -247,7 +247,7 @@ void StatesEditorView::duplicateCurrentState() QmlModelState StatesEditorView::currentState() const { - return QmlModelState(actualStateNode()); + return QmlModelState(currentStateNode()); } void StatesEditorView::setCurrentState(const QmlModelState &state) @@ -255,8 +255,8 @@ void StatesEditorView::setCurrentState(const QmlModelState &state) if (!model() && !state.isValid()) return; - if (actualStateNode() != state.modelNode()) - setAcutalStateNode(state.modelNode()); + if (currentStateNode() != state.modelNode()) + setCurrentStateNode(state.modelNode()); } QmlModelState StatesEditorView::baseState() const @@ -383,7 +383,7 @@ void StatesEditorView::nodeOrderChanged(const NodeListProperty &listProperty, co resetModel(); } -void StatesEditorView::actualStateChanged(const ModelNode &node) +void StatesEditorView::currentStateChanged(const ModelNode &node) { QmlModelState newQmlModelState(node); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h index 568f6c2be3c..c36c6f24ecf 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h @@ -77,7 +77,7 @@ public: // AbstractView - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + 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; diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index c5502977dee..cde3a097094 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -210,7 +210,7 @@ public: virtual void rewriterBeginTransaction() = 0; virtual void rewriterEndTransaction() = 0; - virtual void actualStateChanged(const ModelNode &node) = 0; // base state is a invalid model node + virtual void currentStateChanged(const ModelNode &node) = 0; // base state is a invalid model node virtual void selectedNodesChanged(const QList &selectedNodeList, const QList &lastSelectedNodeList) = 0; @@ -233,8 +233,8 @@ public: NodeInstanceView *nodeInstanceView() const; RewriterView *rewriterView() const; - void setAcutalStateNode(const ModelNode &node); - ModelNode actualStateNode() const; + void setCurrentStateNode(const ModelNode &node); + ModelNode currentStateNode() const; int majorQtQuickVersion() const; diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index fbcfb29c0d2..ca7dbd2b388 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -119,7 +119,7 @@ public: void rewriterBeginTransaction() QTC_OVERRIDE; void rewriterEndTransaction() QTC_OVERRIDE; - void actualStateChanged(const ModelNode &node); + void currentStateChanged(const ModelNode &node); QList instances() const; NodeInstance instanceForModelNode(const ModelNode &node) const ; diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 0ad4428f8e1..33f5c2fe8b4 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -151,7 +151,7 @@ public: void rewriterBeginTransaction() QTC_OVERRIDE; void rewriterEndTransaction() QTC_OVERRIDE; - void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; + void currentStateChanged(const ModelNode &node) QTC_OVERRIDE; void importsChanged(const QList &addedImports, const QList &removedImports) QTC_OVERRIDE; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 45649407150..bddc51a8c98 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -159,7 +159,7 @@ void NodeInstanceView::modelAttached(Model *model) if (!isSkippedRootNode(rootModelNode())) nodeInstanceServer()->createScene(createCreateSceneCommand()); - ModelNode stateNode = actualStateNode(); + ModelNode stateNode = currentStateNode(); if (stateNode.isValid() && stateNode.metaInfo().isSubclassOf("QtQuick.State", 1, 0)) { NodeInstance newStateInstance = instanceForModelNode(stateNode); activateState(newStateInstance); @@ -203,7 +203,7 @@ void NodeInstanceView::restartProcess() if (!isSkippedRootNode(rootModelNode())) nodeInstanceServer()->createScene(createCreateSceneCommand()); - ModelNode stateNode = actualStateNode(); + ModelNode stateNode = currentStateNode(); if (stateNode.isValid() && stateNode.metaInfo().isSubclassOf("QtQuick.State", 1, 0)) { NodeInstance newStateInstance = instanceForModelNode(stateNode); activateState(newStateInstance); @@ -539,7 +539,7 @@ void NodeInstanceView::rewriterEndTransaction() } -void NodeInstanceView::actualStateChanged(const ModelNode &node) +void NodeInstanceView::currentStateChanged(const ModelNode &node) { NodeInstance newStateInstance = instanceForModelNode(node); diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index a3650fd7e53..fe904548bd8 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -515,11 +515,11 @@ void AbstractView::emitRewriterEndTransaction() model()->d->notifyRewriterEndTransaction(); } -void AbstractView::setAcutalStateNode(const ModelNode &node) +void AbstractView::setCurrentStateNode(const ModelNode &node) { Internal::WriteLocker locker(m_model.data()); if (model()) - model()->d->notifyActualStateChanged(node); + model()->d->notifyCurrentStateChanged(node); } void AbstractView::changeRootNodeType(const TypeName &type, int majorVersion, int minorVersion) @@ -529,10 +529,10 @@ void AbstractView::changeRootNodeType(const TypeName &type, int majorVersion, in m_model.data()->d->changeRootNodeType(type, majorVersion, minorVersion); } -ModelNode AbstractView::actualStateNode() const +ModelNode AbstractView::currentStateNode() const { if (model()) - return ModelNode(m_model.data()->d->actualStateNode(), m_model.data(), const_cast(this)); + return ModelNode(m_model.data()->d->currentStateNode(), m_model.data(), const_cast(this)); return ModelNode(); } diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 660855bc99f..6cea9d1dd1c 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -84,7 +84,7 @@ ModelPrivate::ModelPrivate(Model *model) : m_internalIdCounter(1) { m_rootInternalNode = createNode("QtQuick.Item", 1, 0, PropertyListType(), PropertyListType(), QString(), ModelNode::NodeWithoutSource,true); - m_acutalStateNode = m_rootInternalNode; + m_currentStateNode = m_rootInternalNode; } ModelPrivate::~ModelPrivate() @@ -574,16 +574,16 @@ void ModelPrivate::notifyInstancesChildrenChanged(const QVector &node resetModelByRewriter(description); } -void ModelPrivate::notifyActualStateChanged(const ModelNode &node) +void ModelPrivate::notifyCurrentStateChanged(const ModelNode &node) { bool resetModel = false; QString description; - m_acutalStateNode = node.internalNode(); + m_currentStateNode = node.internalNode(); try { if (rewriterView()) - rewriterView()->actualStateChanged(ModelNode(node.internalNode(), model(), rewriterView())); + rewriterView()->currentStateChanged(ModelNode(node.internalNode(), model(), rewriterView())); } catch (RewritingException &e) { description = e.description(); resetModel = true; @@ -591,11 +591,11 @@ void ModelPrivate::notifyActualStateChanged(const ModelNode &node) foreach (const QWeakPointer &view, m_viewList) { Q_ASSERT(view != 0); - view->actualStateChanged(ModelNode(node.internalNode(), model(), view.data())); + view->currentStateChanged(ModelNode(node.internalNode(), model(), view.data())); } if (nodeInstanceView()) - nodeInstanceView()->actualStateChanged(ModelNode(node.internalNode(), model(), nodeInstanceView())); + nodeInstanceView()->currentStateChanged(ModelNode(node.internalNode(), model(), nodeInstanceView())); if (resetModel) resetModelByRewriter(description); @@ -1641,9 +1641,9 @@ bool ModelPrivate::isWriteLocked() const return m_writeLock; } -InternalNode::Pointer ModelPrivate::actualStateNode() const +InternalNode::Pointer ModelPrivate::currentStateNode() const { - return m_acutalStateNode; + return m_currentStateNode; } diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h index 0b797a419c6..f547c744f68 100644 --- a/src/plugins/qmldesigner/designercore/model/model_p.h +++ b/src/plugins/qmldesigner/designercore/model/model_p.h @@ -158,7 +158,7 @@ public: void notifyInstancesChildrenChanged(const QVector &nodeList); void notifyInstanceToken(const QString &token, int number, const QVector &nodeVector); - void notifyActualStateChanged(const ModelNode &node); + void notifyCurrentStateChanged(const ModelNode &node); void notifyRewriterBeginTransaction(); void notifyRewriterEndTransaction(); @@ -221,7 +221,7 @@ public: void setNodeInstanceView(NodeInstanceView *nodeInstanceView); NodeInstanceView *nodeInstanceView() const; - InternalNodePointer actualStateNode() const; + InternalNodePointer currentStateNode() const; private: //functions void removePropertyWithoutNotification(const InternalPropertyPointer &property); @@ -241,7 +241,7 @@ private: QHash m_idNodeHash; QHash m_internalIdNodeHash; QSet m_nodeSet; - InternalNodePointer m_acutalStateNode; + InternalNodePointer m_currentStateNode; InternalNodePointer m_rootInternalNode; QUrl m_fileUrl; QWeakPointer m_rewriterView; diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index e4268c2cb65..5d74953b4e1 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -155,7 +155,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary newQmlItemNode.setId(view->generateNewId("image")); - if (!QmlModelState(view->actualStateNode()).isBaseState()) { + if (!QmlModelState(view->currentStateNode()).isBaseState()) { newQmlItemNode.modelNode().variantProperty("opacity").setValue(0); newQmlItemNode.setVariantProperty("opacity", 1); } @@ -221,7 +221,7 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, const QS newQmlItemNode.setId(view->generateNewId("image")); - if (!QmlModelState(view->actualStateNode()).isBaseState()) { + if (!QmlModelState(view->currentStateNode()).isBaseState()) { newQmlItemNode.modelNode().variantProperty("opacity").setValue(0); newQmlItemNode.setVariantProperty("opacity", 1); } diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 8863bc70b9b..8680c9c77e2 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -77,7 +77,7 @@ void QmlObjectNode::setBindingProperty(const PropertyName &name, const QString & QmlModelState QmlObjectNode::currentState() const { if (isValid()) - return QmlModelState(view()->actualStateNode()); + return QmlModelState(view()->currentStateNode()); else return QmlModelState(); } diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index e87c24a2f25..28289f605fc 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -442,7 +442,7 @@ void RewriterView::rewriterEndTransaction() } } -void RewriterView::actualStateChanged(const ModelNode & /*node*/) +void RewriterView::currentStateChanged(const ModelNode & /*node*/) { } diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp index 395fddfcbe8..eed353a8ced 100644 --- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp @@ -67,7 +67,7 @@ void ViewManager::detachRewriterView() void ViewManager::switchStateEditorViewToBaseState() { if (m_statesEditorView.isAttached()) { - m_savedState = QmlModelState(m_statesEditorView.actualStateNode()); + m_savedState = QmlModelState(m_statesEditorView.currentStateNode()); m_statesEditorView.setCurrentState(m_statesEditorView.baseState()); } }