summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-05-25 13:47:12 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-05-25 14:12:40 +0000
commit0465bc722866a767946765195f698315a95b0e82 (patch)
tree36eebc178574117f590b5ea5bc184cebd0f1c334
parent1086610cb8daf4ffc0e57f30ae65d8ef6b8edfd4 (diff)
Qt Designer: Replace a QHash<QObject *,bool> by QSet<QObject *>
Change-Id: I6f18597d7777a4cacac1e6cb5d2c2059a00e868f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit c3feee64550c42aacd4b39bc180c34b63f010fc2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/designer/src/lib/extension/default_extensionfactory.cpp2
-rw-r--r--src/designer/src/lib/extension/default_extensionfactory.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/designer/src/lib/extension/default_extensionfactory.cpp b/src/designer/src/lib/extension/default_extensionfactory.cpp
index 9ddeb5049..99eb1a5eb 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.cpp
+++ b/src/designer/src/lib/extension/default_extensionfactory.cpp
@@ -89,7 +89,7 @@ QObject *QExtensionFactory::extension(QObject *object, const QString &iid) const
if (!m_extended.contains(object)) {
connect(object, &QObject::destroyed, this, &QExtensionFactory::objectDestroyed);
- m_extended.insert(object, true);
+ m_extended.insert(object);
}
if (it == m_extensions.end())
diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h
index 4c359c93b..589ade795 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.h
+++ b/src/designer/src/lib/extension/default_extensionfactory.h
@@ -10,6 +10,7 @@
#include <QtCore/qmap.h>
#include <QtCore/qhash.h>
#include <QtCore/qpair.h>
+#include <QtCore/qset.h>
QT_BEGIN_NAMESPACE
@@ -35,8 +36,7 @@ private:
typedef QPair<QString,QObject*> IdObjectKey;
typedef QMap< IdObjectKey, QObject*> ExtensionMap;
mutable ExtensionMap m_extensions;
- typedef QHash<QObject*, bool> ExtendedSet;
- mutable ExtendedSet m_extended;
+ mutable QSet<QObject *> m_extended;
};
QT_END_NAMESPACE