Merge pull request #2918 from uklotzde/controlobject

ControlObject/ControlPrivateDouble: Various Fixes

1 files changed, 2 insertions, 8 deletions

diff --git a/src/test/mixxxtest.cpp b/src/test/mixxxtest.cpp
index f70495e225..a57debe7c7 100644
--- a/src/test/mixxxtest.cpp
+++ b/src/test/mixxxtest.cpp
@@ -45,13 +45,7 @@ MixxxTest::MixxxTest() {
 MixxxTest::~MixxxTest() {
     // Mixxx leaks a ton of COs normally. To make new tests not affected by
     // previous tests, we clear our all COs after every MixxxTest completion.
-    QList<QSharedPointer<ControlDoublePrivate>> leakedControls;
-    ControlDoublePrivate::getControls(&leakedControls);
-    foreach (QSharedPointer<ControlDoublePrivate> pCDP, leakedControls) {
-        if (pCDP.isNull()) {
-            continue;
-        }
-        ConfigKey key = pCDP->getKey();
-        delete pCDP->getCreatorCO();
+    for (auto pControl : ControlDoublePrivate::takeAllInstances()) {
+        pControl->deleteCreatorCO();
     }
 }