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

refs #467 Worked around a QtDBus bug which prevented CLogPattern from being marshalled.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-20 18:50:45 +01:00
parent 9d19e091fe
commit 785df80935
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackmisc/logpattern.cpp
View File

@@ -267,18 +267,24 @@ namespace BlackMisc
void CLogPattern::marshallToDbus(QDBusArgument &argument) const
{
auto begin = Iterators::makeTransformIterator(m_severities.begin(), [](CStatusMessage::StatusSeverity s) { return static_cast<int>(s); });
QList<int> severities = makeRange(begin, m_severities.end());
// a bug in QtDBus prevents us from marshalling m_severities as a list
quint8 severities = 0;
for (auto s : m_severities) { severities |= (1 << static_cast<int>(s)); }
argument << severities << m_strategy << m_strings.toList();
}
void CLogPattern::unmarshallFromDbus(const QDBusArgument &argument)
{
QList<int> severities;
quint8 severities;
QStringList strings;
argument >> severities >> m_strategy >> strings;
auto begin = Iterators::makeTransformIterator(severities.begin(), [](int i) { return static_cast<CStatusMessage::StatusSeverity>(i); });
m_severities = QSet<CStatusMessage::StatusSeverity>::fromList(makeRange(begin, severities.end()));
m_strings = strings.toSet();
m_severities.clear();
for (int s : { 0, 1, 2, 3 })
{
if (severities & (1 << s)) { m_severities.insert(static_cast<CStatusMessage::StatusSeverity>(s)); }
}
}
}