Commit 0dd5f681 authored by Marco Bubke's avatar Marco Bubke
Browse files

QmlDesigner: Rename actualState in currentState



Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent c3be93f2
......@@ -51,7 +51,7 @@ protected:
void startRenderTimer() Q_DECL_OVERRIDE;
private:
ServerNodeInstance m_actualState;
ServerNodeInstance m_currentState;
};
} // namespace QmlDesigner
......
......@@ -51,7 +51,7 @@ protected:
void startRenderTimer();
private:
ServerNodeInstance m_actualState;
ServerNodeInstance m_currentState;
};
} // namespace QmlDesigner
......
......@@ -154,7 +154,7 @@ public:
setupContext();
}
virtual void actualStateChanged(const ModelNode &) QTC_OVERRIDE
virtual void currentStateChanged(const ModelNode &) QTC_OVERRIDE
{
setupContext();
}
......
......@@ -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
......
......@@ -386,7 +386,7 @@ void DebugView::instancesToken(const QString &/*tokenName*/, int /*tokenNumber*/
}
void DebugView::actualStateChanged(const ModelNode &/*node*/)
void DebugView::currentStateChanged(const ModelNode &/*node*/)
{
}
......
......@@ -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<ModelNode> &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:
......
......@@ -619,7 +619,7 @@ bool FormEditorView::isMoveToolAvailable() const
return true;
}
void FormEditorView::actualStateChanged(const ModelNode &/*node*/)
void FormEditorView::currentStateChanged(const ModelNode &/*node*/)
{
}
......
......@@ -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;
......
......@@ -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"));
}
......
......@@ -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))
......
......@@ -50,7 +50,7 @@ class MoveManipulator
{
public:
enum State {
UseActualState,
UseCurrentState,
UseBaseState
};
......@@ -62,7 +62,7 @@ public:
void synchronizeParent(const QList<FormEditorItem*> &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);
......
......@@ -96,7 +96,7 @@ void MoveTool::mouseMoveEvent(const QList<QGraphicsItem*> &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);
......
......@@ -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<ModelNode> &/*selectedNodeList*/,
const QList<ModelNode> &/*lastSelectedNodeList*/) {}
......
......@@ -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<ModelNode> &selectedNodeList,
const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
......
......@@ -119,7 +119,7 @@ void DesignDocumentView::rewriterEndTransaction()
{
}
void DesignDocumentView::actualStateChanged(const ModelNode &/*node*/)
void DesignDocumentView::currentStateChanged(const ModelNode &/*node*/)
{
}
......
......@@ -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<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
......
......@@ -203,7 +203,7 @@ void ItemLibraryView::rewriterEndTransaction()
{
}
void ItemLibraryView::actualStateChanged(const ModelNode &/*node*/)
void ItemLibraryView::currentStateChanged(const ModelNode &/*node*/)
{
}
......
......@@ -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);
......
......@@ -275,7 +275,7 @@ void NavigatorView::rewriterEndTransaction()
{
}
void NavigatorView::actualStateChanged(const ModelNode &/*node*/)
void NavigatorView::currentStateChanged(const ModelNode &/*node*/)
{
}
......
......@@ -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<ModelNode> &nodeVector) QTC_OVERRIDE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment