refs #802 Fixed internal compiler errors with Clang on Windows.

This commit is contained in:
Mathew Sutcliffe
2016-11-12 23:37:39 +00:00
committed by Klaus Basan
parent 10ca2026a9
commit 3c40c1026e
4 changed files with 12 additions and 3 deletions

View File

@@ -29,6 +29,10 @@ namespace BlackGui
{ {
namespace Models namespace Models
{ {
CDefaultFormatter::CDefaultFormatter(int alignment, bool i18n, const QList<int> &supportedRoles) :
m_supportedRoles(supportedRoles), m_alignment(alignment), m_useI18n(i18n)
{}
Qt::ItemFlags CDefaultFormatter::flags(Qt::ItemFlags flags, bool editable) const Qt::ItemFlags CDefaultFormatter::flags(Qt::ItemFlags flags, bool editable) const
{ {
return editable ? (flags | Qt::ItemIsEditable) : (flags & ~Qt::ItemIsEditable); return editable ? (flags | Qt::ItemIsEditable) : (flags & ~Qt::ItemIsEditable);

View File

@@ -39,8 +39,8 @@ namespace BlackGui
{ {
public: public:
//! Constructor //! Constructor
CDefaultFormatter(int alignment = alignDefault(), bool i18n = true, const QList<int> &supportedRoles = { Qt::DisplayRole }) : //! \fixme Defining this inline causes ICE in Clang on Windows
m_supportedRoles(supportedRoles), m_alignment(alignment), m_useI18n(i18n) {} CDefaultFormatter(int alignment = alignDefault(), bool i18n = true, const QList<int> &supportedRoles = { Qt::DisplayRole });
//! Virtual destructor //! Virtual destructor
virtual ~CDefaultFormatter() {} virtual ~CDefaultFormatter() {}

View File

@@ -74,6 +74,10 @@ namespace BlackMisc
// CValueCachePacket // CValueCachePacket
//////////////////////////////// ////////////////////////////////
CValueCachePacket::CValueCachePacket(bool saved, bool valuesChanged) :
m_saved(saved), m_valuesChanged(valuesChanged)
{}
CValueCachePacket::CValueCachePacket(const CVariantMap &values, qint64 timestamp, bool saved, bool valuesChanged) : CValueCachePacket::CValueCachePacket(const CVariantMap &values, qint64 timestamp, bool saved, bool valuesChanged) :
m_saved(saved), m_valuesChanged(valuesChanged) m_saved(saved), m_valuesChanged(valuesChanged)
{ {

View File

@@ -73,7 +73,8 @@ namespace BlackMisc
using base_type = CDictionary; using base_type = CDictionary;
//! Constructor. //! Constructor.
CValueCachePacket(bool saved = false, bool valuesChanged = true) : m_saved(saved), m_valuesChanged(valuesChanged) {} //! \fixme Defining this inline causes ICE in Clang on Windows
CValueCachePacket(bool saved = false, bool valuesChanged = true);
//! Construct from CVariantMap and a timestamp. //! Construct from CVariantMap and a timestamp.
CValueCachePacket(const CVariantMap &values, qint64 timestamp, bool saved = false, bool valuesChanged = true); CValueCachePacket(const CVariantMap &values, qint64 timestamp, bool saved = false, bool valuesChanged = true);