From 61ee861d8eab9d6233a9cd0d11a03970ad883713 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Mon, 25 Mar 2024 16:25:04 +0100 Subject: [PATCH] refactor: Replace CIdentifierSet with plain QSet --- .../context/contextapplicationproxy.cpp | 2 +- .../context/contextapplicationproxy.h | 4 +- src/blackmisc/CMakeLists.txt | 2 - src/blackmisc/identifierset.cpp | 42 --------------- src/blackmisc/identifierset.h | 53 ------------------- 5 files changed, 3 insertions(+), 100 deletions(-) delete mode 100644 src/blackmisc/identifierset.cpp delete mode 100644 src/blackmisc/identifierset.h diff --git a/src/blackcore/context/contextapplicationproxy.cpp b/src/blackcore/context/contextapplicationproxy.cpp index b3a8f0157..13011ee49 100644 --- a/src/blackcore/context/contextapplicationproxy.cpp +++ b/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 identifiers = m_proxyPingIdentifiers; // copy so member can be modified for (const CIdentifier &identifier : identifiers) { this->registerApplication(identifier); diff --git a/src/blackcore/context/contextapplicationproxy.h b/src/blackcore/context/contextapplicationproxy.h index 57e65058f..0cfe6cea0 100644 --- a/src/blackcore/context/contextapplicationproxy.h +++ b/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 #include #include +#include // 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 m_proxyPingIdentifiers; //!< automatically ping the implementing side QTimer m_pingTimer; //! Relay connection signals to local signals diff --git a/src/blackmisc/CMakeLists.txt b/src/blackmisc/CMakeLists.txt index b3e28e71b..09c1c62f1 100644 --- a/src/blackmisc/CMakeLists.txt +++ b/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 diff --git a/src/blackmisc/identifierset.cpp b/src/blackmisc/identifierset.cpp deleted file mode 100644 index da6b279c8..000000000 --- a/src/blackmisc/identifierset.cpp +++ /dev/null @@ -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 &other) : CCollection(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 diff --git a/src/blackmisc/identifierset.h b/src/blackmisc/identifierset.h deleted file mode 100644 index 0c7e96b59..000000000 --- a/src/blackmisc/identifierset.h +++ /dev/null @@ -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 -#include - -BLACK_DECLARE_COLLECTION_MIXINS(BlackMisc, CIdentifier, CIdentifierSet) - -namespace BlackMisc -{ - /*! - * Value object encapsulating a set of object identifiers - */ - class BLACKMISC_EXPORT CIdentifierSet : - public CCollection, - public Mixin::MetaType - { - using CCollection::CCollection; - BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CIdentifierSet) - - public: - //! Default constructor. - CIdentifierSet(); - - //! Construct from a base class object. - CIdentifierSet(const CCollection &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) -// in list: Q_DECLARE_METATYPE(BlackMisc::CSequence) - -#endif // guard