summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircchannellist.cpp26
-rw-r--r--noncore/net/opieirc/ircchannellist.h1
-rw-r--r--noncore/net/opieirc/ircmessageparser.cpp61
-rw-r--r--noncore/net/opieirc/ircmessageparser.h8
4 files changed, 50 insertions, 46 deletions
diff --git a/noncore/net/opieirc/ircchannellist.cpp b/noncore/net/opieirc/ircchannellist.cpp
index 4e13dee..6bef318 100644
--- a/noncore/net/opieirc/ircchannellist.cpp
+++ b/noncore/net/opieirc/ircchannellist.cpp
@@ -15,14 +15,15 @@ void IRCChannelList::update() {
IRCChannelPerson *person = it.current();
if (person->flags & PERSON_FLAG_OP) {
- insertItem(op, person->person->nick());
+ insertItem(op, "1" + person->person->nick());
} else if (person->flags & PERSON_FLAG_HALFOP) {
- insertItem(op, person->person->nick());
+ insertItem(op, "2" + person->person->nick());
} else if (person->flags & PERSON_FLAG_VOICE) {
- insertItem(voice, person->person->nick());
+ insertItem(voice, "3" + person->person->nick());
} else {
- insertItem(person->person->nick());
+ insertItem("4" + person->person->nick());
}
}
sort();
+ adjustNicks();
}
@@ -46,2 +47,19 @@ bool IRCChannelList::removePerson(QString nick) {
}
+void IRCChannelList::adjustNicks() {
+ QString txt;
+ QPixmap pm;
+
+ for(unsigned int i=0; i<count(); i++) {
+ txt = text(i).remove(0,1);
+ if(pixmap(i)) {
+ pm = *pixmap(i);
+ removeItem(i);
+ insertItem(pm, txt, i);
+ }
+ else {
+ removeItem(i);
+ insertItem(txt,i);
+ }
+ }
+}
diff --git a/noncore/net/opieirc/ircchannellist.h b/noncore/net/opieirc/ircchannellist.h
index deab649..b4e46eb 100644
--- a/noncore/net/opieirc/ircchannellist.h
+++ b/noncore/net/opieirc/ircchannellist.h
@@ -29,4 +29,5 @@ public:
IRCChannelList(IRCChannel *channel, QWidget *parent = 0, const char *name = 0, WFlags f = 0);
void update();
+ void adjustNicks();
bool hasPerson(QString nick);
bool removePerson(QString nick);
diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index ecc7e9a..f8ccbb6 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -30,32 +30,35 @@ IRCCTCPMessageParserStruct IRCMessageParser::ctcpParserProcTable[] = {
/* Lookup table for numerical commands */
IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = {
- { 1, FUNC(parseNumerical001) }, // RPL_WELCOME
- { 2, FUNC(parseNumerical002) }, // RPL_YOURHOST
- { 3, FUNC(parseNumerical003) }, // RPL_CREATED
- { 4, FUNC(parseNumerical004) }, // RPL_MYINFO
- { 5, FUNC(parseNumerical005) }, // RPL_BOUNCE, RPL_PROTOCTL
- { 251, FUNC(parseNumericalStats) }, // RPL_LUSERCLIENT
- { 252, FUNC(parseNumericalStats) }, // RPL_LUSEROP
- { 265, FUNC(parseNumericalStats) }, // RPL_LOCALUSERS
- { 266, FUNC(parseNumericalStats) }, // RPL_GLOBALUSERS
- { 250, FUNC(parseNumericalStats) }, // RPL_STATSCONN
- { 254, FUNC(nullFunc)}, // RPL_LUSERCHANNELS
- { 255, FUNC(parseNumericalStats) }, // RPL_LUSERNAME
+ { 1, FUNC(parseNumericalSecondParam) }, // RPL_WELCOME
+ { 2, FUNC(parseNumericalSecondParam) }, // RPL_YOURHOST
+ { 3, FUNC(parseNumericalSecondParam) }, // RPL_CREATED
+ { 4, FUNC(parseNumericalAllParams) }, // RPL_MYINFO
+ { 5, FUNC(parseNumericalSecondParam) }, // RPL_BOUNCE, RPL_PROTOCTL
+ { 250, FUNC(parseNumericalAllParams) }, // RPL_STATSCONN
+ { 251, FUNC(parseNumericalSecondParam) }, // RPL_LUSERCLIENT
+ { 252, FUNC(parseNumericalAllParams) }, // RPL_LUSEROP
+ { 253, FUNC(parseNumericalAllParams) }, // RPL_LUSERUNKNOWN
+ { 254, FUNC(parseNumericalAllParams) }, // RPL_LUSERCHANNELS
+ { 255, FUNC(parseNumericalSecondParam) }, // RPL_LUSERME
+ { 265, FUNC(parseNumericalAllParams) }, // RPL_LOCALUSERS
+ { 266, FUNC(parseNumericalAllParams) }, // RPL_GLOBALUSERS
{ 332, FUNC(parseNumericalTopic) }, // RPL_TOPIC
{ 333, FUNC(parseNumericalTopicWhoTime) }, // RPL_TOPICWHOTIME
{ 353, FUNC(parseNumericalNames) }, // RPL_NAMREPLY
{ 366, FUNC(parseNumericalEndOfNames) }, // RPL_ENDOFNAMES
- { 375, FUNC(parseNumericalStats) }, // RPL_MOTDSTART
- { 372, FUNC(parseNumericalStats) }, // RPL_MOTD
- { 376, FUNC(parseNumericalStats) }, // RPL_ENDOFMOTD
- { 377, FUNC(parseNumericalStats) }, // RPL_MOTD2
- { 378, FUNC(parseNumericalStats) }, // RPL_MOTD3
+ { 372, FUNC(parseNumericalSecondParam) }, // RPL_MOTD
+ { 375, FUNC(parseNumericalSecondParam) }, // RPL_MOTDSTART
+ { 376, FUNC(parseNumericalSecondParam) }, // RPL_ENDOFMOTD
+ { 377, FUNC(parseNumericalSecondParam) }, // RPL_MOTD2
+ { 378, FUNC(parseNumericalSecondParam) }, // RPL_MOTD3
{ 401, FUNC(parseNumericalNoSuchNick) }, // ERR_NOSUCHNICK
{ 406, FUNC(parseNumericalNoSuchNick) }, // ERR_WASNOSUCHNICK
- { 412, FUNC(parseNumericalStats) }, // ERR_NOTEXTTOSEND
+ { 412, FUNC(parseNumericalSecondParam) }, // ERR_NOTEXTTOSEND
+ { 422, FUNC(parseNumericalSecondParam) }, // ERR_NOMOTD
{ 433, FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE
{ 0, 0 }
};
+
IRCMessageParser::IRCMessageParser(IRCSession *session) {
m_session = session;
@@ -461,29 +464,13 @@ void IRCMessageParser::parseLiteralKick(IRCMessage *message) {
}
-void IRCMessageParser::parseNumerical001(IRCMessage *message) {
- /* Welcome to IRC message, display */
- emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
-}
-void IRCMessageParser::parseNumerical002(IRCMessage *message) {
+void IRCMessageParser::parseNumericalSecondParam(IRCMessage *message) {
emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
}
-void IRCMessageParser::parseNumerical003(IRCMessage *message) {
- emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
-}
-
-void IRCMessageParser::parseNumerical004(IRCMessage *message) {
+void IRCMessageParser::parseNumericalAllParams(IRCMessage *message) {
emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters()));
}
-void IRCMessageParser::parseNumerical005(IRCMessage *message) {
- emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters()));
-}
-
-void IRCMessageParser::parseNumericalStats(IRCMessage *message) {
- emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
-}
-
void IRCMessageParser::parseNumericalNames(IRCMessage *message) {
/* Name list sent when joining a channel */
@@ -569,2 +556,4 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) {
}
+
+
diff --git a/noncore/net/opieirc/ircmessageparser.h b/noncore/net/opieirc/ircmessageparser.h
index c4dd96c..5412f5f 100644
--- a/noncore/net/opieirc/ircmessageparser.h
+++ b/noncore/net/opieirc/ircmessageparser.h
@@ -74,10 +74,6 @@ private:
void parseLiteralKick(IRCMessage *message);
void parseLiteralTopic(IRCMessage *message);
- void parseNumerical001(IRCMessage *message);
- void parseNumerical002(IRCMessage *message);
- void parseNumerical003(IRCMessage *message);
- void parseNumerical004(IRCMessage *message);
- void parseNumerical005(IRCMessage *message);
- void parseNumericalStats(IRCMessage *message);
+ void parseNumericalSecondParam(IRCMessage *message);
+ void parseNumericalAllParams(IRCMessage *message);
void parseNumericalNames(IRCMessage *message);
void parseNumericalEndOfNames(IRCMessage *message);