X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=8b7a4f0f59ae35ac5d734c5e75bea4e888a15da1;hp=f7edcbc88295718a9d794c0e3ad168f46162410a;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index f7edcbc8..8b7a4f0f 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -709,7 +709,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, FormatType baseFor } else if (s[pos+1] == 'R') { // Reverse colors fgChar = (fgChar == 'f' ? 'b' : 'f'); - quint32 orig = static_cast(curfmt.type & 0xffc00000); + auto orig = static_cast(curfmt.type & 0xffc00000); curfmt.type &= 0x003fffff; curfmt.type |= (orig & 0x00400000) <<1; curfmt.type |= (orig & 0x0f000000) <<4; @@ -1264,8 +1264,8 @@ UiStyle::ItemFormatType& operator|=(UiStyle::ItemFormatType &lhs, UiStyle::ItemF QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) { out << static_cast(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(it->second.type) << it->second.foreground