whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QGraphicsItemAnimation: don't hold Private::Pair in QList 

QGraphicsItemAnimationPrivate::Pair, being a (qreal,qreal) is
larger than a void*, so holding them in a QList is needlessly
inefficient. Worse, the code could come to depend on the fragile
property of (inefficient) QLists that references to elements
therein never are invalidated.

Fix by marking Pair as primitive and holding it in QVector
instead.

Change-Id: I190721f4b0cdeab2efab2d51536f64572cd663df
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
bb10
Marc Mutz 2014-08-17 20:44:39 +02:00
parent dff10573f2
commit 26281561fe
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/widgets/graphicsview/qgraphicsitemanimation.cpp
View File

@ -124,21 +124,22 @@ public:
qreal step;
qreal value;
};
QList<Pair> xPosition;
QList<Pair> yPosition;
QList<Pair> rotation;
QList<Pair> verticalScale;
QList<Pair> horizontalScale;
QList<Pair> verticalShear;
QList<Pair> horizontalShear;
QList<Pair> xTranslation;
QList<Pair> yTranslation;
QVector<Pair> xPosition;
QVector<Pair> yPosition;
QVector<Pair> rotation;
QVector<Pair> verticalScale;
QVector<Pair> horizontalScale;
QVector<Pair> verticalShear;
QVector<Pair> horizontalShear;
QVector<Pair> xTranslation;
QVector<Pair> yTranslation;
qreal linearValueForStep(qreal step, QList<Pair> *source, qreal defaultValue = 0);
void insertUniquePair(qreal step, qreal value, QList<Pair> *binList, const char* method);
qreal linearValueForStep(qreal step, QVector<Pair> *source, qreal defaultValue = 0);
void insertUniquePair(qreal step, qreal value, QVector<Pair> *binList, const char* method);
};
Q_DECLARE_TYPEINFO(QGraphicsItemAnimationPrivate::Pair, Q_PRIMITIVE_TYPE);
qreal QGraphicsItemAnimationPrivate::linearValueForStep(qreal step, QList<Pair> *source, qreal defaultValue)
qreal QGraphicsItemAnimationPrivate::linearValueForStep(qreal step, QVector<Pair> *source, qreal defaultValue)
{
if (source->isEmpty())
return defaultValue;
@ -168,14 +169,14 @@ qreal QGraphicsItemAnimationPrivate::linearValueForStep(qreal step, QList<Pair>
return valueBefore + (valueAfter - valueBefore) * ((step - stepBefore) / (stepAfter - stepBefore));
}
void QGraphicsItemAnimationPrivate::insertUniquePair(qreal step, qreal value, QList<Pair> *binList, const char* method)
void QGraphicsItemAnimationPrivate::insertUniquePair(qreal step, qreal value, QVector<Pair> *binList, const char* method)
{
if (!check_step_valid(step, method))
return;
Pair pair(step, value);
QList<Pair>::iterator result = std::lower_bound(binList->begin(), binList->end(), pair);
const QVector<Pair>::iterator result = std::lower_bound(binList->begin(), binList->end(), pair);
if ((result != binList->end()) && !(pair < *result))
result->value = value;
else {