flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 16:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T709, style

Browse Source
This commit is contained in:
Klaus Basan
2019-07-25 16:04:21 +02:00
committed by Mat Sutcliffe
parent 8c65753951
commit 2a92ad63ab
3 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/data/vatsimsetup.h
View File

@@ -48,9 +48,6 @@ namespace BlackCore
//! Default constructor //! Default constructor
CVatsimSetup(); CVatsimSetup();
//! Destructor.
~CVatsimSetup() {}
//! VATSIM data file URLs //! VATSIM data file URLs
const BlackMisc::Network::CUrlList &getDataFileUrls() const { return m_dataFileUrls; } const BlackMisc::Network::CUrlList &getDataFileUrls() const { return m_dataFileUrls; }

37
src/blackmisc/dictionary.h
View File

@@ -11,7 +11,6 @@
#ifndef BLACKMISC_DICTIONARY_H #ifndef BLACKMISC_DICTIONARY_H
#define BLACKMISC_DICTIONARY_H #define BLACKMISC_DICTIONARY_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/containerbase.h" #include "blackmisc/containerbase.h"
#include "blackmisc/dbus.h" #include "blackmisc/dbus.h"
#include "blackmisc/datastream.h" #include "blackmisc/datastream.h"
@@ -23,6 +22,7 @@
#include "blackmisc/range.h" #include "blackmisc/range.h"
#include "blackmisc/stringutils.h" #include "blackmisc/stringutils.h"
#include "blackmisc/typetraits.h" #include "blackmisc/typetraits.h"
#include "blackmisc/blackmiscexport.h"
#include <QDBusArgument> #include <QDBusArgument>
#include <QHash> #include <QHash>
@@ -84,7 +84,6 @@ namespace BlackMisc
//! \endcond //! \endcond
} // namespace Private } // namespace Private
/*! /*!
* Trait to select the appropriate default associative container type depending on what the key type supports. * Trait to select the appropriate default associative container type depending on what the key type supports.
*/ */
@@ -94,12 +93,14 @@ namespace BlackMisc
/*! /*!
* Associative container with value semantics, chooses a sensible default implementation container type. * Associative container with value semantics, chooses a sensible default implementation container type.
*/ */
// *INDENT-OFF*
template<class Key, class Value, template <class...> class Impl = TDefaultAssociativeType> template<class Key, class Value, template <class...> class Impl = TDefaultAssociativeType>
class CDictionary : class CDictionary :
public Mixin::DBusOperators<CDictionary<Key, Value, Impl>>, public Mixin::DBusOperators<CDictionary<Key, Value, Impl>>,
public Mixin::DataStreamOperators<CDictionary<Key, Value, Impl>>, public Mixin::DataStreamOperators<CDictionary<Key, Value, Impl>>,
public Mixin::JsonOperators<CDictionary<Key, Value, Impl>>, public Mixin::JsonOperators<CDictionary<Key, Value, Impl>>,
public Mixin::String<CDictionary<Key, Value, Impl>> public Mixin::String<CDictionary<Key, Value, Impl>>
// *INDENT-ON*
{ {
//! \copydoc BlackMisc::CValueObject::compare //! \copydoc BlackMisc::CValueObject::compare
friend int compare(const CDictionary &a, const CDictionary &b) friend int compare(const CDictionary &a, const CDictionary &b)
@@ -111,7 +112,7 @@ namespace BlackMisc
public: public:
//! The implementation container //! The implementation container
using impl_type = Impl<Key,Value>; using impl_type = Impl<Key, Value>;
//! STL compatibility //! STL compatibility
//! @{ //! @{
@@ -119,10 +120,10 @@ namespace BlackMisc
typedef Value value_type; typedef Value value_type;
typedef Value &reference; typedef Value &reference;
typedef const Value &const_reference; typedef const Value &const_reference;
typedef typename Impl<Key,Value>::size_type size_type; typedef typename Impl<Key, Value>::size_type size_type;
typedef typename Impl<Key,Value>::iterator iterator; typedef typename Impl<Key, Value>::iterator iterator;
typedef typename Impl<Key,Value>::const_iterator const_iterator; typedef typename Impl<Key, Value>::const_iterator const_iterator;
//! @} //! @}
//! Return a copy containing only those elements for which the dictionary keys return true for a given predicate. //! Return a copy containing only those elements for which the dictionary keys return true for a given predicate.
@@ -350,18 +351,18 @@ namespace BlackMisc
//! Returns an const iterator pointing to the item with the key. //! Returns an const iterator pointing to the item with the key.
//! \return If key is not found, the function returns constEnd() //! \return If key is not found, the function returns constEnd()
const_iterator constFind (const Key &key) const { return m_impl.constFind(key); } const_iterator constFind(const Key &key) const { return m_impl.constFind(key); }
//! Returns an const iterator pointing to the item with the key. //! Returns an const iterator pointing to the item with the key.
//! \return If key is not found, the function returns end() //! \return If key is not found, the function returns end()
const_iterator find(const Key & key) const { return m_impl.find(key); } const_iterator find(const Key &key) const { return m_impl.find(key); }
//! Returns an iterator pointing to the item with the key. //! Returns an iterator pointing to the item with the key.
//! \return If key is not found, the function returns end() //! \return If key is not found, the function returns end()
iterator find(const Key &key) { return m_impl.find(key); } iterator find(const Key &key) { return m_impl.find(key); }
//! Returns true if dictionary contains an item with key, otherwise false //! Returns true if dictionary contains an item with key, otherwise false
bool contains (const Key &key) const {return m_impl.contains(key); } bool contains(const Key &key) const {return m_impl.contains(key); }
//! Returns the number of items with key //! Returns the number of items with key
int count(const Key &key) const { return m_impl.count(key); } int count(const Key &key) const { return m_impl.count(key); }
@@ -388,25 +389,25 @@ namespace BlackMisc
const Key key(const Value &value) const { return m_impl.key(value); } const Key key(const Value &value) const { return m_impl.key(value); }
//! Return key assigned to value or if key is not found defaultKey //! Return key assigned to value or if key is not found defaultKey
const Key key(const Value &value, const Key & defaultKey) const { return m_impl.key(value, defaultKey); } const Key key(const Value &value, const Key &defaultKey) const { return m_impl.key(value, defaultKey); }
//! Return a range of all keys (does not allocate a temporary container) //! Return a range of all keys (does not allocate a temporary container)
auto keys() const { return makeRange(keyBegin(), keyEnd()); } auto keys() const { return makeRange(keyBegin(), keyEnd()); }
//! Remove all items with key from the dictionary //! Remove all items with key from the dictionary
int remove(const Key &key) { return m_impl.remove(key); } int remove(const Key &key) { return m_impl.remove(key); }
//! Returns the number of items in the hash. //! Returns the number of items in the hash.
int size() const { return m_impl.size(); } int size() const { return m_impl.size(); }
//! Swaps hash other with this hash. This operation is very fast and never fails. //! Swaps hash other with this hash. This operation is very fast and never fails.
void swap(CDictionary &other) noexcept { m_impl.swap(other.m_impl); } void swap(CDictionary &other) noexcept { m_impl.swap(other.m_impl); }
//! Returns the value associated with the key. //! Returns the value associated with the key.
const Value value(const Key &key) const { return m_impl.value(key); } const Value value(const Key &key) const { return m_impl.value(key); }
//! Returns the value associated with the key or if key is not found defaultValue //! Returns the value associated with the key or if key is not found defaultValue
const Value value(const Key &key, const Value &defaultValue) const { return m_impl.value(key, defaultValue); } const Value value(const Key &key, const Value &defaultValue) const { return m_impl.value(key, defaultValue); }
//! Return a range of all values (does not allocate a temporary container) //! Return a range of all values (does not allocate a temporary container)
CRange<const_iterator> values() const { return makeRange(begin(), end()); } CRange<const_iterator> values() const { return makeRange(begin(), end()); }
@@ -415,7 +416,7 @@ namespace BlackMisc
CDictionary &operator =(const CDictionary &other) { m_impl = other.m_impl; return *this; } CDictionary &operator =(const CDictionary &other) { m_impl = other.m_impl; return *this; }
//! Move assignment //! Move assignment
CDictionary &operator =(CDictionary && other) noexcept { m_impl = std::move(other.m_impl); return *this; } CDictionary &operator =(CDictionary &&other) noexcept { m_impl = std::move(other.m_impl); return *this; }
//! Return reference to the internal implementation object. //! Return reference to the internal implementation object.
friend impl_type &implementationOf(CDictionary &dict) { return dict.m_impl; } friend impl_type &implementationOf(CDictionary &dict) { return dict.m_impl; }
@@ -428,7 +429,7 @@ namespace BlackMisc
Value &operator [](const Key &key) { return m_impl[key]; } Value &operator [](const Key &key) { return m_impl[key]; }
//! Access an element by its key. //! Access an element by its key.
const Value operator [](const Key &key) const { return m_impl[key]; } const Value operator [](const Key &key) const { return m_impl[key]; }
//! Test for equality. //! Test for equality.
friend bool operator ==(const CDictionary &a, const CDictionary &b) { return a.m_impl == b.m_impl; } friend bool operator ==(const CDictionary &a, const CDictionary &b) { return a.m_impl == b.m_impl; }
@@ -453,7 +454,7 @@ namespace BlackMisc
//! \copydoc BlackMisc::CValueObject::marshallToDbus //! \copydoc BlackMisc::CValueObject::marshallToDbus
void marshallToDbus(QDBusArgument &argument) const void marshallToDbus(QDBusArgument &argument) const
{ {
argument << m_impl; argument << m_impl;
} }
//! \copydoc BlackMisc::CValueObject::unmarshallFromDbus //! \copydoc BlackMisc::CValueObject::unmarshallFromDbus
@@ -469,7 +470,7 @@ namespace BlackMisc
void unmarshalFromDataStream(QDataStream &stream) { stream >> m_impl; } void unmarshalFromDataStream(QDataStream &stream) { stream >> m_impl; }
private: private:
Impl<Key,Value> m_impl; Impl<Key, Value> m_impl;
}; };
/*! /*!

23
src/blackmisc/network/client.cpp
View File

@@ -110,18 +110,19 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexCapabilities: return CVariant::fromValue(m_capabilities); case IndexCapabilities: return CVariant::fromValue(m_capabilities);
case IndexCapabilitiesString: return CVariant(this->getCapabilitiesAsString()); case IndexCapabilitiesString: return CVariant(this->getCapabilitiesAsString());
case IndexCallsign: return this->getCallsign().propertyByIndex(index.copyFrontRemoved()); case IndexCallsign: return this->getCallsign().propertyByIndex(index.copyFrontRemoved());
case IndexUser: return this->getUser().propertyByIndex(index.copyFrontRemoved()); case IndexUser: return this->getUser().propertyByIndex(index.copyFrontRemoved());
case IndexModelString: return CVariant(m_modelString); case IndexModelString: return CVariant(m_modelString);
case IndexServer: return CVariant(m_server); case IndexServer: return CVariant(m_server);
case IndexVoiceCapabilities: return m_voiceCapabilities.propertyByIndex(index.copyFrontRemoved()); case IndexVoiceCapabilities: return m_voiceCapabilities.propertyByIndex(index.copyFrontRemoved());
case IndexVoiceCapabilitiesPixmap: return CVariant::from(m_voiceCapabilities.toPixmap()); case IndexVoiceCapabilitiesPixmap: return CVariant::from(m_voiceCapabilities.toPixmap());
case IndexVoiceCapabilitiesIcon: return CVariant::fromValue(m_voiceCapabilities.toIcon()); case IndexVoiceCapabilitiesIcon: return CVariant::fromValue(m_voiceCapabilities.toIcon());
case IndexVoiceCapabilitiesString: return CVariant(m_voiceCapabilities.toQString(true)); case IndexVoiceCapabilitiesString: return CVariant(m_voiceCapabilities.toQString(true));
default: return CValueObject::propertyByIndex(index); default: break;
} }
return CValueObject::propertyByIndex(index);
} }
void CClient::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant) void CClient::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
@@ -131,9 +132,9 @@ namespace BlackMisc
switch (i) switch (i)
{ {
case IndexCapabilities: m_capabilities = variant.toInt(); break; case IndexCapabilities: m_capabilities = variant.toInt(); break;
case IndexModelString: m_modelString = variant.toQString(); break; case IndexModelString: m_modelString = variant.toQString(); break;
case IndexServer: m_server = variant.toQString(); break; case IndexServer: m_server = variant.toQString(); break;
case IndexUser: m_user.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexUser: m_user.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexCallsign: m_user.setCallsign(variant.value<BlackMisc::Aviation::CCallsign>()); break; case IndexCallsign: m_user.setCallsign(variant.value<BlackMisc::Aviation::CCallsign>()); break;
case IndexVoiceCapabilities: m_voiceCapabilities.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexVoiceCapabilities: m_voiceCapabilities.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
default: CValueObject::setPropertyByIndex(index, variant); break; default: CValueObject::setPropertyByIndex(index, variant); break;