diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index 9693976ca..2a50b82f0 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -1093,7 +1093,7 @@ QDomElement Conductor::toXml(QDomDocument &dom_document, dom_element.setAttribute("userx", QString::number(m_text_item->pos().x())); dom_element.setAttribute("usery", QString::number(m_text_item->pos().y())); } - if(m_text_item->wasRotateByUser()) + if(m_text_item->wasRotatedByUser()) dom_element.setAttribute("rotation", QString::number(m_text_item->rotation())); return(dom_element); @@ -1367,7 +1367,7 @@ void Conductor::calculateTextItemPosition() Qt::Orientations rotation; QPointF text_pos = posForText(rotation); - if (!m_text_item -> wasRotateByUser()) + if (!m_text_item -> wasRotatedByUser()) { rotation == Qt::Vertical ? m_text_item -> setRotation(m_properties.verti_rotate_text): m_text_item -> setRotation(m_properties.horiz_rotate_text); diff --git a/sources/qetgraphicsitem/conductortextitem.cpp b/sources/qetgraphicsitem/conductortextitem.cpp index 1b65048fb..096f8f71a 100644 --- a/sources/qetgraphicsitem/conductortextitem.cpp +++ b/sources/qetgraphicsitem/conductortextitem.cpp @@ -90,10 +90,10 @@ bool ConductorTextItem::wasMovedByUser() const } /** - @brief ConductorTextItem::wasRotateByUser + @brief ConductorTextItem::wasRotatedByUser @return true if text was explicit moved by user else false */ -bool ConductorTextItem::wasRotateByUser() const +bool ConductorTextItem::wasRotatedByUser() const { return(rotate_by_user_); } diff --git a/sources/qetgraphicsitem/conductortextitem.h b/sources/qetgraphicsitem/conductortextitem.h index 6d664681d..38844cf4d 100644 --- a/sources/qetgraphicsitem/conductortextitem.h +++ b/sources/qetgraphicsitem/conductortextitem.h @@ -44,7 +44,7 @@ class ConductorTextItem : public DiagramTextItem void fromXml(const QDomElement &) override; int type() const override { return Type; } virtual bool wasMovedByUser() const; - virtual bool wasRotateByUser() const; + virtual bool wasRotatedByUser() const; virtual void forceMovedByUser(bool); virtual void forceRotateByUser(bool); virtual void setPos(const QPointF &pos); diff --git a/sources/undocommand/rotateselectioncommand.cpp b/sources/undocommand/rotateselectioncommand.cpp index bac35b594..0d9f7990f 100644 --- a/sources/undocommand/rotateselectioncommand.cpp +++ b/sources/undocommand/rotateselectioncommand.cpp @@ -91,7 +91,7 @@ void RotateSelectionCommand::undo() for(const QPointer& cti : m_cond_text) { cti->forceRotateByUser(m_rotate_by_user.value(cti.data())); - if(!cti->wasRotateByUser()) + if(!cti->wasRotatedByUser()) cti->parentConductor()->calculateTextItemPosition(); } } @@ -106,7 +106,7 @@ void RotateSelectionCommand::redo() for(const QPointer& cti : m_cond_text) { - m_rotate_by_user.insert(cti, cti->wasRotateByUser()); + m_rotate_by_user.insert(cti, cti->wasRotatedByUser()); cti->forceRotateByUser(true); } } diff --git a/sources/undocommand/rotatetextscommand.cpp b/sources/undocommand/rotatetextscommand.cpp index c06a4f35c..22968639e 100644 --- a/sources/undocommand/rotatetextscommand.cpp +++ b/sources/undocommand/rotatetextscommand.cpp @@ -45,7 +45,7 @@ m_diagram(diagram) if(dti->type() == ConductorTextItem::Type) { ConductorTextItem *cti = static_cast(dti); - m_cond_texts.insert(cti, cti->wasRotateByUser()); + m_cond_texts.insert(cti, cti->wasRotatedByUser()); } } for(ElementTextItemGroup *etig : dc.selectedTextsGroup())