X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Fuistyle.cpp;h=975c79df82bd37edd28cec97f86a95637b822fc7;hb=40601ae070413b727a68e35e5b8c619176c661b1;hp=0e00d512c3291a704d709eb98dedb65c2801479a;hpb=9d54503555534a2c554f09a33df6afa33d6308ec;p=quassel.git diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 0e00d512..975c79df 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -491,12 +491,16 @@ QList UiStyle::toTextLayoutList(const FormatList &form UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat) { QString s = s_; + StyledString result; + result.formatList.append(qMakePair((quint16)0, baseFormat)); + if (s.length() > 65535) { + // We use quint16 for indexes qWarning() << QString("String too long to be styled: %1").arg(s); - return StyledString(); + result.plainText = s; + return result; } - StyledString result; - result.formatList.append(qMakePair((quint16)0, baseFormat)); + quint32 curfmt = baseFormat; int pos = 0; quint16 length = 0; for (;;) { @@ -858,7 +862,7 @@ quint8 UiStyle::StyledMessage::senderHash() const if (chopCount < nick.size()) nick.chop(chopCount); } - quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size()); + quint16 hash = qChecksum(nick.toLatin1().data(), nick.toLatin1().size()); return (_senderHash = (hash & 0xf) + 1); }