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

Style

Browse Source
This commit is contained in:
Mat Sutcliffe
2021-04-17 16:39:09 +01:00
parent 39d6100c87
commit 38328d536b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/models/listmodelbase.h
View File

@@ -198,8 +198,7 @@ namespace BlackGui
{ {
if (!tieBreakers.isEmpty()) if (!tieBreakers.isEmpty())
{ {
const std::integral_constant<bool, true> marker; return compareForModelSort<ObjectType>(a, b, order, tieBreakers.front(), tieBreakers.copyFrontRemoved(), std::true_type());
return compareForModelSort<ObjectType>(a, b, order, tieBreakers.front(), tieBreakers.copyFrontRemoved(), marker);
} }
return false; return false;
} }
@@ -214,8 +213,7 @@ namespace BlackGui
const BlackMisc::CVariant bQv = b.propertyByIndex(index); const BlackMisc::CVariant bQv = b.propertyByIndex(index);
if (!tieBreakers.isEmpty() && aQv == bQv) if (!tieBreakers.isEmpty() && aQv == bQv)
{ {
const std::integral_constant<bool, false> marker; return compareForModelSort<ObjectType>(a, b, order, tieBreakers.front(), tieBreakers.copyFrontRemoved(), std::false_type());
return compareForModelSort<ObjectType>(a, b, order, tieBreakers.front(), tieBreakers.copyFrontRemoved(), marker);
} }
return (order == Qt::AscendingOrder) ? (aQv < bQv) : (bQv < aQv); return (order == Qt::AscendingOrder) ? (aQv < bQv) : (bQv < aQv);
} }

4
src/blackmisc/optional.h
View File

@@ -19,7 +19,9 @@ namespace BlackMisc
{ {
/*! /*!
* Class which can directly contain zero or one object of type T, with pointer semantics. * Own implementation of std::optional.
*
* Needed to work around lack of C++20 copyable lambda functions.
*/ */
template <typename T> template <typename T>
class Optional class Optional

2
src/xswiftbus/service.cpp
View File

@@ -148,7 +148,7 @@ namespace XSwiftBus
static const CMessage::string ellipsis = u8"\u2026"; static const CMessage::string ellipsis = u8"\u2026";
const unsigned lineLength = m_messages.maxLineLength() - 1; const unsigned lineLength = m_messages.maxLineLength() - 1;
using U8It = Utf8Iterator<typename std::string::const_iterator>; using U8It = Utf8Iterator<std::string::const_iterator>;
U8It begin(text.begin(), text.end()); U8It begin(text.begin(), text.end());
auto characters = std::distance(begin, U8It(text.end(), text.end())); auto characters = std::distance(begin, U8It(text.end(), text.end()));
std::vector<CMessage::string> wrappedLines; std::vector<CMessage::string> wrappedLines;