refactor: Replace CIdentifierSet with plain QSet

src/blackcore/context/contextapplicationproxy.cpp

@@ -133,7 +133,7 @@ namespace BlackCore::Context
     {
         if (!m_dBusInterface) { return; }
         if (m_proxyPingIdentifiers.isEmpty()) { return; }
-        const CIdentifierSet identifiers = m_proxyPingIdentifiers; // copy so member can be modified
+        const QSet<BlackMisc::CIdentifier> identifiers = m_proxyPingIdentifiers; // copy so member can be modified
         for (const CIdentifier &identifier : identifiers)
         {
             this->registerApplication(identifier);

src/blackcore/context/contextapplicationproxy.h

@@ -9,7 +9,6 @@
 #include "blackcore/blackcoreexport.h"
 #include "blackcore/context/contextapplication.h"
 #include "blackcore/corefacadeconfig.h"
-#include "blackmisc/identifierset.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/valuecache.h"
 
@@ -17,6 +16,7 @@
 #include <QString>
 #include <QStringList>
 #include <QTimer>
+#include <QSet>
 
 // clazy:excludeall=const-signal-or-slot
 
@@ -100,7 +100,7 @@ namespace BlackCore
 
         private:
             BlackMisc::CGenericDBusInterface *m_dBusInterface = nullptr; //!< interface
-            BlackMisc::CIdentifierSet m_proxyPingIdentifiers; //!< automatically ping the implementing side
+            QSet<BlackMisc::CIdentifier> m_proxyPingIdentifiers; //!< automatically ping the implementing side
             QTimer m_pingTimer;
 
             //! Relay connection signals to local signals

src/blackmisc/CMakeLists.txt

@@ -234,8 +234,6 @@ add_library(misc SHARED
         identifier.h
         identifierlist.cpp
         identifierlist.h
-        identifierset.cpp
-        identifierset.h
         imageutils.cpp
         imageutils.h
         inheritancetraits.h

src/blackmisc/identifierset.cpp

@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "blackmisc/identifierset.h"
-
-BLACK_DEFINE_COLLECTION_MIXINS(BlackMisc, CIdentifier, CIdentifierSet)
-
-namespace BlackMisc
-{
-    CIdentifierSet::CIdentifierSet() {}
-
-    CIdentifierSet::CIdentifierSet(const CCollection<CIdentifier> &other) : CCollection<CIdentifier>(other)
-    {
-        // void
-    }
-
-    bool CIdentifierSet::containsAnyNotIn(const CIdentifierSet &other) const
-    {
-        return containsBy([&other](const CIdentifier &id) { return !other.contains(id); });
-    }
-
-    CIdentifierSet CIdentifierSet::getMachinesUnique() const
-    {
-        CIdentifierSet il;
-        for (const CIdentifier &identifier : *this)
-        {
-            const bool contained = il.containsBy([=](const CIdentifier &ident) {
-                return identifier.hasSameMachineName(ident);
-            });
-            if (!contained) { il.push_back(identifier); }
-        }
-        return il;
-    }
-
-    QStringList CIdentifierSet::getMachineNames(bool unique, bool sort) const
-    {
-        QStringList codes = this->transform(Predicates::MemberTransform(&CIdentifier::getMachineName));
-        if (sort) { codes.sort(); }
-        if (unique) { codes.removeDuplicates(); }
-        return codes;
-    }
-} // namespace

src/blackmisc/identifierset.h

@@ -1,53 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef BLACKMISC_IDENTIFIERSET_H
-#define BLACKMISC_IDENTIFIERSET_H
-
-#include "blackmisc/identifier.h"
-#include "blackmisc/collection.h"
-#include "blackmisc/blackmiscexport.h"
-
-#include <QStringList>
-#include <QMetaType>
-
-BLACK_DECLARE_COLLECTION_MIXINS(BlackMisc, CIdentifier, CIdentifierSet)
-
-namespace BlackMisc
-{
-    /*!
-     * Value object encapsulating a set of object identifiers
-     */
-    class BLACKMISC_EXPORT CIdentifierSet :
-        public CCollection<CIdentifier>,
-        public Mixin::MetaType<CIdentifierSet>
-    {
-        using CCollection::CCollection;
-        BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CIdentifierSet)
-
-    public:
-        //! Default constructor.
-        CIdentifierSet();
-
-        //! Construct from a base class object.
-        CIdentifierSet(const CCollection<CIdentifier> &other);
-
-        //! This list contains an identifier which is not contained in other.
-        bool containsAnyNotIn(const CIdentifierSet &other) const;
-
-        //! Get a list of identifiers reduced to maximum one per machine.
-        //! If there is more than one per machine, it is undefined which one will be added.
-        CIdentifierSet getMachinesUnique() const;
-
-        //! Get machine names
-        QStringList getMachineNames(bool unique = true, bool sort = true) const;
-    };
-} // namespace
-
-Q_DECLARE_METATYPE(BlackMisc::CIdentifierSet)
-Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CIdentifier>)
-// in list: Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CIdentifier>)
-
-#endif // guard