diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.cpp b/sources/qetgraphicsitem/dynamicelementtextitem.cpp index ba8ea4fcb..f8b7c798c 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp +++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp @@ -212,7 +212,7 @@ void DynamicElementTextItem::fromXml(const QDomElement &dom_elmt) setColor(QColor(dom_color.text())); //Force the update of the displayed text - setTextFrom(m_text_from); + setTextFrom(m_text_from); // TODO: does not update because there is a retrun inside if the textfrom argument is the same as m_text_from QGraphicsTextItem::setPos(dom_elmt.attribute("x", QString::number(0)).toDouble(), dom_elmt.attribute("y", QString::number(0)).toDouble()); @@ -325,7 +325,7 @@ void DynamicElementTextItem::setTextFrom(DynamicElementTextItem::TextFrom text_f { if(m_text_from == text_from) return; - + setNoEditable(text_from == UserText? false : true); clearFormulaConnection(); diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index ed36696ed..e68875217 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -745,7 +745,7 @@ bool Element::fromXml(QDomElement &e, QHash &table_id_adr, bool //************************// //***Dynamic texts item***// - //************************// + //************************// read from the diagram section for (const QDomElement& qde : QET::findInDomElement(e, "dynamic_texts", DynamicElementTextItem::xmlTagName())) { DynamicElementTextItem *deti = new DynamicElementTextItem(this); @@ -757,16 +757,16 @@ bool Element::fromXml(QDomElement &e, QHash &table_id_adr, bool //************************// //***Element texts item***// //************************// - QList inputs = QET::findInDomElement(e, "inputs", "input"); + QList inputs = QET::findInDomElement(e, "inputs", "input"); // inputs in diagram section //First case, we check for the text item converted to dynamic text item const QList conv_deti_list = m_converted_text_from_xml_description.keys(); QList successfully_converted; const QList dom_inputs = inputs; - - for (DynamicElementTextItem *deti : conv_deti_list) + // TODO: legacy??? + for (DynamicElementTextItem *deti : conv_deti_list) // elements read from the element collection definition { - for(const QDomElement& dom_input : dom_inputs) + for(const QDomElement& dom_input : dom_inputs) { //we use the same method used in ElementTextItem::fromXml to compar and know if the input dom element is for one of the text stored. //The comparaison is made from the text position : if the position of the text is the same as the position stored in 'input' dom element diff --git a/sources/qetgraphicsitem/slaveelement.cpp b/sources/qetgraphicsitem/slaveelement.cpp index 2a2f4fb08..3c61830d3 100644 --- a/sources/qetgraphicsitem/slaveelement.cpp +++ b/sources/qetgraphicsitem/slaveelement.cpp @@ -32,7 +32,7 @@ SlaveElement::SlaveElement(const ElementsLocation &location, QGraphicsItem *qgi, int *state) : Element(location, qgi, state, Element::Slave) { - m_xref_item = nullptr; + } /** diff --git a/sources/qetgraphicsitem/slaveelement.h b/sources/qetgraphicsitem/slaveelement.h index 78746a976..fe5067da9 100644 --- a/sources/qetgraphicsitem/slaveelement.h +++ b/sources/qetgraphicsitem/slaveelement.h @@ -32,7 +32,7 @@ class SlaveElement : public Element void unlinkElement(Element *elmt) override; private: - QGraphicsTextItem *m_xref_item; + QGraphicsTextItem *m_xref_item{nullptr}; }; #endif // SLAVEELEMENT_H