diff --git a/src/blackmisc/network/registermetadatanetwork.cpp b/src/blackmisc/network/registermetadatanetwork.cpp index e50f8eda6..bce18e223 100644 --- a/src/blackmisc/network/registermetadatanetwork.cpp +++ b/src/blackmisc/network/registermetadatanetwork.cpp @@ -36,7 +36,6 @@ #include "blackmisc/network/user.h" #include "blackmisc/network/userlist.h" #include "blackmisc/network/voicecapabilities.h" -#include "blackmisc/network/settings/networksettings.h" namespace BlackMisc { @@ -76,7 +75,6 @@ namespace BlackMisc CUser::registerMetadata(); CUserList::registerMetadata(); CVoiceCapabilities::registerMetadata(); - Settings::CNetworkSettings::registerMetadata(); } } diff --git a/src/blackmisc/network/settings/networksettings.cpp b/src/blackmisc/network/settings/networksettings.cpp deleted file mode 100644 index 92f395fe2..000000000 --- a/src/blackmisc/network/settings/networksettings.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 2018 - * swift project Community / Contributors - * - * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level - * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated, - * or distributed except according to the terms contained in the LICENSE file. - */ - -#include "blackmisc/network/settings/networksettings.h" -#include "blackmisc/stringutils.h" - -#include -#include - -BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network::Settings, CNetworkSettings) - -namespace BlackMisc::Network::Settings -{ - QString CNetworkSettings::convertToQString(bool i18n) const - { - Q_UNUSED(i18n); - return QStringLiteral("NOT USED"); - } - - QVariant CNetworkSettings::propertyByIndex(CPropertyIndexRef index) const - { - if (index.isMyself()) { return QVariant::fromValue(*this); } - // const ColumnIndex i = index.frontCasted(); - // switch (i) - // { - // case IndexDynamicOffsetTime: return CVariant::fromValue(m_dynamicOffsetTimes); - // default: break; - // } - return CValueObject::propertyByIndex(index); - } - - void CNetworkSettings::setPropertyByIndex(CPropertyIndexRef index, const QVariant &variant) - { - if (index.isMyself()) { (*this) = variant.value(); return; } - // const ColumnIndex i = index.frontCasted(); - // switch (i) - // { - // case IndexDynamicOffsetTime: this->setDynamicOffsetTimes(variant.toBool()); break; - // default: break; - // } - CValueObject::setPropertyByIndex(index, variant); - } -} // ns diff --git a/src/blackmisc/network/settings/networksettings.h b/src/blackmisc/network/settings/networksettings.h deleted file mode 100644 index 92385efc2..000000000 --- a/src/blackmisc/network/settings/networksettings.h +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright (C) 2018 - * swift project Community / Contributors - * - * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level - * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated, - * or distributed except according to the terms contained in the LICENSE file. - */ - -//! \file - -#ifndef BLACKMISC_NETWORK_SETTINGS_NETWORKSETTINGS_H -#define BLACKMISC_NETWORK_SETTINGS_NETWORKSETTINGS_H - -#include "blackmisc/propertyindexref.h" -#include "blackmisc/metaclass.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/blackmiscexport.h" - -#include -#include -#include - -BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network::Settings, CNetworkSettings) - -namespace BlackMisc::Network::Settings -{ - //! Network settings - //! \remark CURRENTLY a STUB not used - class BLACKMISC_EXPORT CNetworkSettings : public CValueObject - { - public: - //! Properties by index - enum ColumnIndex - { - IndexDynamicOffsetTime = CPropertyIndexRef::GlobalIndexCNetworkSettings, - }; - - //! Constructor - CNetworkSettings() {} - - //! \copydoc BlackMisc::Mixin::String::toQString - QString convertToQString(bool i18n = false) const; - - //! \copydoc BlackMisc::Mixin::Index::propertyByIndex - QVariant propertyByIndex(CPropertyIndexRef index) const; - - //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex - void setPropertyByIndex(CPropertyIndexRef index, const QVariant &variant); - - private: - bool m_dummy = false; - - BLACK_METACLASS( - CNetworkSettings, - BLACK_METAMEMBER(dummy) - ); - }; -} // ns - -Q_DECLARE_METATYPE(BlackMisc::Network::Settings::CNetworkSettings) - -#endif // guard diff --git a/src/blackmisc/propertyindexref.h b/src/blackmisc/propertyindexref.h index b07bfff05..e0fba185d 100644 --- a/src/blackmisc/propertyindexref.h +++ b/src/blackmisc/propertyindexref.h @@ -79,7 +79,6 @@ namespace BlackMisc GlobalIndexCServer = 6400, GlobalIndexCFsdSetup = 6500, GlobalIndexCVoiceSetup = 6600, - GlobalIndexCNetworkSettings = 6700, GlobalIndexCUrl = 6800, GlobalIndexCUrlLog = 6900, GlobalIndexCRemoteFile = 7000,