}
else if (s[pos+1] == 'R') { // Reverse colors
fgChar = (fgChar == 'f' ? 'b' : 'f');
- quint32 orig = static_cast<quint32>(curfmt.type & 0xffc00000);
+ auto orig = static_cast<quint32>(curfmt.type & 0xffc00000);
curfmt.type &= 0x003fffff;
curfmt.type |= (orig & 0x00400000) <<1;
curfmt.type |= (orig & 0x0f000000) <<4;
/***********************************************************************************/
-#if QT_VERSION < 0x050000
-uint qHash(UiStyle::ItemFormatType key)
-{
- return qHash(static_cast<quint32>(key));
-}
-
-#else
-
uint qHash(UiStyle::ItemFormatType key, uint seed)
{
return qHash(static_cast<quint32>(key), seed);
}
-#endif
+
UiStyle::FormatType operator|(UiStyle::FormatType lhs, UiStyle::FormatType rhs)
{
return static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) | static_cast<quint32>(rhs));
}
+
UiStyle::FormatType& operator|=(UiStyle::FormatType& lhs, UiStyle::FormatType rhs)
{
lhs = static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) | static_cast<quint32>(rhs));
QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList)
{
out << static_cast<quint16>(formatList.size());
- UiStyle::FormatList::const_iterator it = formatList.begin();
- while (it != formatList.end()) {
+ auto it = formatList.cbegin();
+ while (it != formatList.cend()) {
out << it->first
<< static_cast<quint32>(it->second.type)
<< it->second.foreground