projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Avoid confusing log message when legacy client connects
[quassel.git]
/
src
/
common
/
util.cpp
diff --git
a/src/common/util.cpp
b/src/common/util.cpp
index
a59db8f
..
e3c1159
100644
(file)
--- a/
src/common/util.cpp
+++ b/
src/common/util.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-73,7
+73,7
@@
bool isChannelName(const QString &str)
QString stripFormatCodes(QString message)
{
QString stripFormatCodes(QString message)
{
- static QRegExp regEx{"\x03(\\d\\d?(,\\d\\d?)?)?|
[\x02\x0f\x12\x16\x1d
\x1f]"};
+ static QRegExp regEx{"\x03(\\d\\d?(,\\d\\d?)?)?|
\x04([\\da-fA-F]{6}(,[\\da-fA-F]{6})?)?|[\x02\x0f\x11\x12\x16\x1d\x1e
\x1f]"};
return message.remove(regEx);
}
return message.remove(regEx);
}