1 files changed, 7 insertions, 3 deletions

diff --git a/noncore/net/opieirc/ircmessageparser.h b/noncore/net/opieirc/ircmessageparser.h
index 5412f5f..2fca61e 100644
--- a/noncore/net/opieirc/ircmessageparser.h
+++ b/noncore/net/opieirc/ircmessageparser.h
@@ -25,71 +25,75 @@
 
 /* Macro to facilitate the parser table's creation */
 #define FUNC(__proc) &IRCMessageParser::__proc
 
 class IRCMessageParser;
 
 /* Typedef representing a parser function */
 typedef void (IRCMessageParser::*IRCMessageParseProc)(IRCMessage *);
 
 /* Struct representing a literal command handler */
 typedef struct IRCLiteralMessageParserStruct {
     char *commandName;
     IRCMessageParseProc proc;
 };
 
 /* Struct representing a ctcp command handler */
 typedef struct IRCCTCPMessageParserStruct {
     char *commandName;
     IRCMessageParseProc proc;
 };
 
 /* Struct representing a numerical command handler */
 typedef struct IRCNumericalMessageParserStruct {
     unsigned short commandNumber; 
+    char *message;
+    char *params;
     IRCMessageParseProc proc;
 };
 
 class IRCMessageParser : public QObject {
     Q_OBJECT
 public:
     /* Create an IRCMessageParser object */
     IRCMessageParser(IRCSession *session);
     /* Parse a server message and take the appropriate actions */
     void parse(IRCMessage *message);
 signals:
     /* Used to send commands to the UI (such as displaying text etc) */
     void outputReady(IRCOutput output);
 private:
     /* Parser functions */
-    void nullFunc(IRCMessage *message);
     void parseLiteralPing(IRCMessage *message);
     void parseLiteralNotice(IRCMessage *message);
     void parseLiteralJoin(IRCMessage *message);
     void parseLiteralPrivMsg(IRCMessage *message);
     void parseLiteralNick(IRCMessage *message);
     void parseLiteralPart(IRCMessage *message);
     void parseLiteralQuit(IRCMessage *message);
     void parseLiteralError(IRCMessage *message);
     void parseLiteralMode(IRCMessage *message);
     void parseLiteralKick(IRCMessage *message);
     void parseLiteralTopic(IRCMessage *message);
-    void parseNumericalSecondParam(IRCMessage *message);
-    void parseNumericalAllParams(IRCMessage *message);
+    void parseNumerical(IRCMessage *message, int position);
+    void parseNumericalServerName(IRCMessage *message);
+    void parseNumericalServerFeatures(IRCMessage *message);
+    void parseNumericalServerProtocol(IRCMessage *message);
+    void parseNumericalWhoisIdle(IRCMessage *message);
     void parseNumericalNames(IRCMessage *message);
     void parseNumericalEndOfNames(IRCMessage *message);
     void parseNumericalNicknameInUse(IRCMessage *message);
     void parseNumericalNoSuchNick(IRCMessage *message);
     void parseNumericalTopic(IRCMessage *message);
     void parseNumericalTopicWhoTime(IRCMessage *message);
     void parseCTCPPing(IRCMessage *message);
     void parseCTCPVersion(IRCMessage *message);
     void parseCTCPAction(IRCMessage *message);
 protected:
     IRCSession *m_session;
     /* Parser tables */
     static IRCLiteralMessageParserStruct literalParserProcTable[];
     static IRCNumericalMessageParserStruct numericalParserProcTable[];
     static IRCCTCPMessageParserStruct ctcpParserProcTable[];
 };
 
 #endif /* __IRCMESSAGEPARSER_H */