Revert "Try Clazy fix-its"

Segfault on old Qt versions!
This reverts commit dba7caed30.
This commit is contained in:
Laurent Trinques
2025-02-14 16:17:58 +01:00
parent dba7caed30
commit 43f0107eb1
88 changed files with 409 additions and 512 deletions

View File

@@ -377,7 +377,7 @@ void Diagram::keyPressEvent(QKeyEvent *event)
switch(event->key())
{
case Qt::Key_Left:
for (Element* item : std::as_const(dc.m_elements))
for (Element *item : dc.m_elements)
{
left_position = item->sceneBoundingRect().x();
if(left_position <= 5)
@@ -389,7 +389,7 @@ void Diagram::keyPressEvent(QKeyEvent *event)
movement = QPointF(+xKeyGrid, 0.0);
break;
case Qt::Key_Up:
for (Element* item : std::as_const(dc.m_elements))
for(Element *item : dc.m_elements)
{
top_position = item->sceneBoundingRect().y();
if(top_position <= 5)
@@ -420,7 +420,7 @@ void Diagram::keyPressEvent(QKeyEvent *event)
switch(event->key())
{
case Qt::Key_Left:
for (Element* item : std::as_const(dc.m_elements))
for (Element *item : dc.m_elements)
{
left_position = item->sceneBoundingRect().x();
if(left_position <= 5)
@@ -432,7 +432,7 @@ void Diagram::keyPressEvent(QKeyEvent *event)
movement = QPointF(+xKeyGridFine, 0.0);
break;
case Qt::Key_Up:
for (Element* item : std::as_const(dc.m_elements))
for(Element *item : dc.m_elements)
{
top_position = item->sceneBoundingRect().y();
if(top_position <= 5)
@@ -949,8 +949,7 @@ QDomDocument Diagram::toXml(bool whole_content) {
if (!list_elements.isEmpty()) {
auto dom_elements = document.createElement(QStringLiteral("elements"));
for (auto elmt : std::as_const(list_elements))
{
for (auto elmt : list_elements) {
dom_elements.appendChild(elmt->toXml(document,
table_adr_id));
}
@@ -959,8 +958,7 @@ QDomDocument Diagram::toXml(bool whole_content) {
if (!list_conductors.isEmpty()) {
auto dom_conductors = document.createElement(QStringLiteral("conductors"));
for (auto cond : std::as_const(list_conductors))
{
for (auto cond : list_conductors) {
dom_conductors.appendChild(cond->toXml(document,
table_adr_id));
}
@@ -969,8 +967,7 @@ QDomDocument Diagram::toXml(bool whole_content) {
if (!list_texts.isEmpty()) {
auto dom_texts = document.createElement(QStringLiteral("inputs"));
for (auto dti : std::as_const(list_texts))
{
for (auto dti : list_texts) {
dom_texts.appendChild(dti->toXml(document));
}
dom_root.appendChild(dom_texts);
@@ -978,8 +975,7 @@ QDomDocument Diagram::toXml(bool whole_content) {
if (!list_images.isEmpty()) {
auto dom_images = document.createElement(QStringLiteral("images"));
for (auto dii : std::as_const(list_images))
{
for (auto dii : list_images) {
dom_images.appendChild(dii->toXml(document));
}
dom_root.appendChild(dom_images);
@@ -987,8 +983,7 @@ QDomDocument Diagram::toXml(bool whole_content) {
if (!list_shapes.isEmpty()) {
auto dom_shapes = document.createElement(QStringLiteral("shapes"));
for (auto dii : std::as_const(list_shapes))
{
for (auto dii : list_shapes) {
dom_shapes.appendChild(dii -> toXml(document));
}
dom_root.appendChild(dom_shapes);
@@ -996,8 +991,7 @@ QDomDocument Diagram::toXml(bool whole_content) {
if (table_vector.size()) {
auto tables = document.createElement(QStringLiteral("tables"));
for (auto table : std::as_const(table_vector))
{
for (auto table : table_vector) {
tables.appendChild(table->toXml(document));
}
dom_root.appendChild(tables);
@@ -1382,11 +1376,9 @@ bool Diagram::fromXml(QDomElement &document,
// Load text
QList<IndependentTextItem *> added_texts;
for (const auto& text_xml : QET::findInDomElement(
root,
QStringLiteral("inputs"),
QStringLiteral("input")))
{
for (auto text_xml : QET::findInDomElement(root,
QStringLiteral("inputs"),
QStringLiteral("input"))) {
IndependentTextItem *iti = new IndependentTextItem();
iti -> fromXml(text_xml);
addItem(iti);
@@ -1395,11 +1387,9 @@ bool Diagram::fromXml(QDomElement &document,
// Load image
QList<DiagramImageItem *> added_images;
for (const auto& image_xml : QET::findInDomElement(
root,
QStringLiteral("images"),
QStringLiteral("image")))
{
for (auto image_xml : QET::findInDomElement(root,
QStringLiteral("images"),
QStringLiteral("image"))) {
DiagramImageItem *dii = new DiagramImageItem ();
dii -> fromXml(image_xml);
addItem(dii);
@@ -1408,11 +1398,9 @@ bool Diagram::fromXml(QDomElement &document,
// Load shape
QList<QetShapeItem *> added_shapes;
for (const auto& shape_xml : QET::findInDomElement(
root,
QStringLiteral("shapes"),
QStringLiteral("shape")))
{
for (auto shape_xml : QET::findInDomElement(root,
QStringLiteral("shapes"),
QStringLiteral("shape"))) {
QetShapeItem *dii = new QetShapeItem (QPointF(0,0));
dii -> fromXml(shape_xml);
addItem(dii);
@@ -1475,8 +1463,7 @@ bool Diagram::fromXml(QDomElement &document,
//Get the top left corner of the rectangle that contain all added items
QRectF items_rect;
for (auto item : std::as_const(added_items))
{
for (auto item : added_items) {
items_rect = items_rect.united(
item->mapToScene(
item->boundingRect()
@@ -1488,7 +1475,7 @@ bool Diagram::fromXml(QDomElement &document,
position.y() - point_.y()));
//Translate all added items
for (auto qgi : std::as_const(added_items))
for (auto qgi : added_items)
qgi->setPos(qgi->pos() += pos_);
}
@@ -1847,7 +1834,7 @@ void Diagram::changeZValue(QET::DepthOption option)
DiagramContent::Shapes | \
DiagramContent::Images);
QList<QGraphicsObject *> list;
for (QGraphicsItem* item : std::as_const(l))
for(QGraphicsItem *item : l)
list << item->toGraphicsObject();
qreal maxz=0,
@@ -1863,7 +1850,7 @@ void Diagram::changeZValue(QET::DepthOption option)
if(option == QET::Raise)
{
for (QGraphicsObject* qgo : std::as_const(list))
for(QGraphicsObject *qgo : list)
if(qgo->zValue() < (Terminal::Z-2)) //Ensure item is always below terminal
new QPropertyUndoCommand(qgo,
"z",
@@ -1873,7 +1860,7 @@ void Diagram::changeZValue(QET::DepthOption option)
}
else if(option == QET::Lower)
{
for (QGraphicsObject* qgo : std::as_const(list))
for(QGraphicsObject *qgo : list)
if(qgo->zValue() < (Terminal::Z-2)) //Ensure item is always below terminal
new QPropertyUndoCommand(qgo,
"z",
@@ -1883,13 +1870,21 @@ void Diagram::changeZValue(QET::DepthOption option)
}
else if (option == QET::BringForward)
{
for (QGraphicsObject* qgo : std::as_const(list))
new QPropertyUndoCommand(qgo, "z", qgo->zValue(), maxz + 1, undo);
for(QGraphicsObject *qgo : list)
new QPropertyUndoCommand(qgo,
"z",
qgo->zValue(),
maxz+1,
undo);
}
else if(option == QET::SendBackward)
{
for (QGraphicsObject* qgo : std::as_const(list))
new QPropertyUndoCommand(qgo, "z", qgo->zValue(), minz - 1, undo);
for(QGraphicsObject *qgo : list)
new QPropertyUndoCommand(qgo,
"z",
qgo->zValue(),
minz-1,
undo);
}
if(undo->childCount())