X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=network%2Fmessage.cpp;h=2bfd915d2150dd36276f5382c044d24eb1905688;hp=d99e5ebc77511ef4cb45e47382613ac1ea18d201;hb=84516825d33a1b448a894eaf2e804cabb032f5f1;hpb=7bcf3798d7e4edb49345f40c7c543f7a9bb97805 diff --git a/network/message.cpp b/network/message.cpp index d99e5ebc..2bfd915d 100644 --- a/network/message.cpp +++ b/network/message.cpp @@ -35,17 +35,17 @@ Message::Message(Server *srv, Buffer *buf, QString _cmd, QString _prefix, QStrin CmdType c = cmdTypes[cmd]; recvHandler = ( c.recvHandler ? c.recvHandler : defaultRecvHandler); sendHandler = ( c.sendHandler ? c.sendHandler : defaultSendHandler); - type = - c.type; + cmdCode = - c.cmdCode; // named commands have a _negative_ code! } else { int t = cmd.toInt(); if(t) { - type = t; + cmdCode = t; recvHandler = defaultRecvHandler; sendHandler = defaultSendHandler; } else { // Unknown cmd! qWarning() << "Unknown command: " << cmd; - type = 0; + cmdCode = 0; } } } @@ -58,6 +58,7 @@ void Message::init(recvHandlerType _r, sendHandlerType _s) { for(int i = 0; ; i++) { if(builtins[i].cmd.isEmpty()) break; CmdType c; + c.cmdCode = builtins[i].cmdCode; c.cmd = builtins[i].cmd.toUpper(); c.cmdDescr = builtins[i].cmdDescr; c.args = builtins[i].args;