flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 12:35:43 +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; }

5
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)

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

@@ -120,8 +120,9 @@ namespace BlackMisc
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)