diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index 1b4eee9003d..8a818b431b6 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -53,7 +53,7 @@ public: void remove(QObject *component); template T *component() { - QReadLocker(&lock()); + QReadLocker locker(&lock()); foreach (QObject *component, m_components) { if (T *result = qobject_cast(component)) return result; @@ -62,7 +62,7 @@ public: } template QList components() { - QReadLocker(&lock()); + QReadLocker locker(&lock()); QList results; foreach (QObject *component, m_components) { if (T *result = qobject_cast(component)) { @@ -101,7 +101,7 @@ template T *query(QObject *obj) return (T *)0; T *result = qobject_cast(obj); if (!result) { - QReadLocker(&lock()); + QReadLocker locker(&Aggregate::lock()); Aggregate *parentAggregation = Aggregate::parentAggregate(obj); result = (parentAggregation ? query(parentAggregation) : 0); } @@ -120,7 +120,7 @@ template QList query_all(QObject *obj) { if (!obj) return QList(); - QReadLocker(&lock()); + QReadLocker locker(&Aggregate::lock()); Aggregate *parentAggregation = Aggregate::parentAggregate(obj); QList results; if (parentAggregation)