Merge pull request #2918 from uklotzde/controlobject

ControlObject/ControlPrivateDouble: Various Fixes

1 files changed, 5 insertions, 5 deletions

diff --git a/src/dialog/dlgdevelopertools.cpp b/src/dialog/dlgdevelopertools.cpp
index 4642c649cc..9e5b462e1c 100644
--- a/src/dialog/dlgdevelopertools.cpp
+++ b/src/dialog/dlgdevelopertools.cpp
@@ -13,9 +13,9 @@ DlgDeveloperTools::DlgDeveloperTools(QWidget* pParent,
           m_pConfig(pConfig) {
     setupUi(this);
 
-    QList<QSharedPointer<ControlDoublePrivate> > controlsList;
-    ControlDoublePrivate::getControls(&controlsList);
-    QHash<ConfigKey, ConfigKey> controlAliases =
+    const QList<QSharedPointer<ControlDoublePrivate>> controlsList =
+            ControlDoublePrivate::getAllInstances();
+    const QHash<ConfigKey, ConfigKey> controlAliases =
             ControlDoublePrivate::getControlAliases();
 
     for (auto it = controlsList.constBegin();
@@ -144,8 +144,8 @@ void DlgDeveloperTools::slotControlDump() {
         return;
     }
 
-    QList<QSharedPointer<ControlDoublePrivate> > controlsList;
-    ControlDoublePrivate::getControls(&controlsList);
+    const QList<QSharedPointer<ControlDoublePrivate>> controlsList =
+            ControlDoublePrivate::getAllInstances();
     for (auto it = controlsList.constBegin(); it != controlsList.constEnd(); ++it) {
         const QSharedPointer<ControlDoublePrivate>& pControl = *it;
         if (pControl) {