projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix support for CMake < 3
[quassel.git]
/
src
/
uisupport
/
uistyle.cpp
diff --git
a/src/uisupport/uistyle.cpp
b/src/uisupport/uistyle.cpp
index
dd530bd
..
3ed50c1
100644
(file)
--- a/
src/uisupport/uistyle.cpp
+++ b/
src/uisupport/uistyle.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-491,12
+491,16
@@
QList<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &form
UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat)
{
QString s = s_;
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) {
if (s.length() > 65535) {
+ // We use quint16 for indexes
qWarning() << QString("String too long to be styled: %1").arg(s);
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 (;;) {
quint32 curfmt = baseFormat;
int pos = 0; quint16 length = 0;
for (;;) {
@@
-661,14
+665,11
@@
void UiStyle::StyledMessage::style() const
QString t;
switch (type()) {
case Message::Plain:
QString t;
switch (type()) {
case Message::Plain:
- //: Plain Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::Notice:
case Message::Notice:
- //: Notice Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::Action:
case Message::Action:
- //: Action Message
- t = tr("%DN%1%DN %2").arg(nick).arg(txt);
+ t = QString("%DN%1%DN %2").arg(nick).arg(txt);
break;
case Message::Nick:
//: Nick Message
break;
case Message::Nick:
//: Nick Message
@@
-705,14
+706,11
@@
void UiStyle::StyledMessage::style() const
//case Message::Kill: FIXME
case Message::Server:
//case Message::Kill: FIXME
case Message::Server:
- //: Server Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::Info:
case Message::Info:
- //: Info Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::Error:
case Message::Error:
- //: Error Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::DayChange:
{
//: Day Change Message
case Message::DayChange:
{
//: Day Change Message
@@
-720,8
+718,7
@@
void UiStyle::StyledMessage::style() const
}
break;
case Message::Topic:
}
break;
case Message::Topic:
- //: Topic Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::NetsplitJoin:
{
QStringList users = txt.split("#:#");
case Message::NetsplitJoin:
{
QStringList users = txt.split("#:#");
@@
-754,10
+751,9
@@
void UiStyle::StyledMessage::style() const
}
break;
case Message::Invite:
}
break;
case Message::Invite:
- //: Invite Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
default:
default:
- t =
tr
("[%1]").arg(txt);
+ t =
QString
("[%1]").arg(txt);
}
_contents = UiStyle::styleString(t, UiStyle::formatType(type()));
}
}
_contents = UiStyle::styleString(t, UiStyle::formatType(type()));
}
@@
-803,9
+799,9
@@
QString UiStyle::StyledMessage::decoratedSender() const
{
switch (type()) {
case Message::Plain:
{
switch (type()) {
case Message::Plain:
- return
tr
("<%1>").arg(plainSender()); break;
+ return
QString
("<%1>").arg(plainSender()); break;
case Message::Notice:
case Message::Notice:
- return
tr
("[%1]").arg(plainSender()); break;
+ return
QString
("[%1]").arg(plainSender()); break;
case Message::Action:
return "-*-"; break;
case Message::Nick:
case Message::Action:
return "-*-"; break;
case Message::Nick:
@@
-858,7
+854,7
@@
quint8 UiStyle::StyledMessage::senderHash() const
if (chopCount < nick.size())
nick.chop(chopCount);
}
if (chopCount < nick.size())
nick.chop(chopCount);
}
- quint16 hash = qChecksum(nick.to
Ascii().data(), nick.toAscii
().size());
+ quint16 hash = qChecksum(nick.to
Latin1().data(), nick.toLatin1
().size());
return (_senderHash = (hash & 0xf) + 1);
}
return (_senderHash = (hash & 0xf) + 1);
}