Code cleanup

This commit is contained in:
2018-11-25 11:47:14 +01:00
parent 95da309a3c
commit 2637594c0a
7 changed files with 20 additions and 30 deletions

View File

@ -178,19 +178,19 @@ void Text::addLabel(const QString &text, const QPainterPath &path,
if (tp.isEmpty())
return;
TextPathItem *pi = new TextPathItem(text, reverse(tp) ? tp.toReversed()
: tp, painter.font(), _properties);
if (!_sceneRect.contains(pi->boundingRect())) {
delete pi;
TextPathItem *ti = new TextPathItem(text, reverse(tp) ? tp.toReversed()
: tp, painter.font());
if (!_sceneRect.contains(ti->boundingRect())) {
delete ti;
return;
}
pi->setPen(painter.pen());
ti->setPen(painter.pen());
addItem(pi);
addItem(ti);
QList<TextItem*> ci = collidingItems(pi);
for (int j = 0; j < ci.size(); j++)
ci[j]->setVisible(false);
QList<TextItem*> ci = collidingItems(ti);
for (int i = 0; i < ci.size(); i++)
ci[i]->setVisible(false);
}
QList<TextItem*> Text::collidingItems(const TextItem *item) const