X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=f7edcbc88295718a9d794c0e3ad168f46162410a;hp=038dc8abbd97b3be952d47c854e1a674adae6bf6;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hpb=c55df5f2d765b100b7a1ead5a72202f969aa9581 diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 038dc8ab..f7edcbc8 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -1150,25 +1150,18 @@ quint8 UiStyle::StyledMessage::senderHash() const /***********************************************************************************/ -#if QT_VERSION < 0x050000 -uint qHash(UiStyle::ItemFormatType key) -{ - return qHash(static_cast(key)); -} - -#else - uint qHash(UiStyle::ItemFormatType key, uint seed) { return qHash(static_cast(key), seed); } -#endif + UiStyle::FormatType operator|(UiStyle::FormatType lhs, UiStyle::FormatType rhs) { return static_cast(static_cast(lhs) | static_cast(rhs)); } + UiStyle::FormatType& operator|=(UiStyle::FormatType& lhs, UiStyle::FormatType rhs) { lhs = static_cast(static_cast(lhs) | static_cast(rhs));