projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b0a1b40
)
Note to myself: QByteArray("\000") != QByteArray (1, '\000')
author
Marcus Eggenberger
<egs@quassel-irc.org>
Sat, 25 Oct 2008 22:01:27 +0000
(
00:01
+0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Sat, 25 Oct 2008 22:03:25 +0000
(
00:03
+0200)
src/core/ctcphandler.cpp
patch
|
blob
|
history
diff --git
a/src/core/ctcphandler.cpp
b/src/core/ctcphandler.cpp
index
4089578
..
b7fe6c9
100644
(file)
--- a/
src/core/ctcphandler.cpp
+++ b/
src/core/ctcphandler.cpp
@@
-30,9
+30,9
@@
CtcpHandler::CtcpHandler(NetworkConnection *parent)
{
QByteArray MQUOTE = QByteArray("\020");
{
QByteArray MQUOTE = QByteArray("\020");
- ctcpMDequoteHash[MQUOTE + '0'] = QByteArray(
"\000"
);
- ctcpMDequoteHash[MQUOTE + 'n'] = QByteArray(
"\n"
);
- ctcpMDequoteHash[MQUOTE + 'r'] = QByteArray(
"\r"
);
+ ctcpMDequoteHash[MQUOTE + '0'] = QByteArray(
1, '\000'
);
+ ctcpMDequoteHash[MQUOTE + 'n'] = QByteArray(
1, '\n'
);
+ ctcpMDequoteHash[MQUOTE + 'r'] = QByteArray(
1, '\r'
);
ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE;
QByteArray XQUOTE = QByteArray("\134");
ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE;
QByteArray XQUOTE = QByteArray("\134");
@@
-42,8
+42,14
@@
CtcpHandler::CtcpHandler(NetworkConnection *parent)
QByteArray CtcpHandler::lowLevelQuote(const QByteArray &message) {
QByteArray quotedMessage = message;
QByteArray CtcpHandler::lowLevelQuote(const QByteArray &message) {
QByteArray quotedMessage = message;
- QHash<QByteArray, QByteArray>::const_iterator quoteIter = ctcpMDequoteHash.constBegin();
- while(quoteIter != ctcpMDequoteHash.constEnd()) {
+
+ QHash<QByteArray, QByteArray> quoteHash = ctcpMDequoteHash;
+ QByteArray MQUOTE = QByteArray("\020");
+ quoteHash.remove(MQUOTE + MQUOTE);
+ quotedMessage.replace(MQUOTE, MQUOTE + MQUOTE);
+
+ QHash<QByteArray, QByteArray>::const_iterator quoteIter = quoteHash.constBegin();
+ while(quoteIter != quoteHash.constEnd()) {
quotedMessage.replace(quoteIter.value(), quoteIter.key());
quoteIter++;
}
quotedMessage.replace(quoteIter.value(), quoteIter.key());
quoteIter++;
}