-rw-r--r-- | noncore/net/opieirc/ircmessage.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/noncore/net/opieirc/ircmessage.cpp b/noncore/net/opieirc/ircmessage.cpp index d0b2652..41386ee 100644 --- a/noncore/net/opieirc/ircmessage.cpp +++ b/noncore/net/opieirc/ircmessage.cpp @@ -1,19 +1,20 @@ #include <qtextstream.h> #include <qstring.h> #include <qstringlist.h> +#include <qregexp.h> #include "ircmessage.h" /* * Create a new IRCMessage by evaluating * a received string */ IRCMessage::IRCMessage(QString line) { /* Remove CRs from the message */ while((line.right(1) == "\n") || (line.right(1) == "\r")) line = line.left(line.length() - 1); QTextIStream stream(&line); QString temp; stream >> temp; @@ -54,70 +55,70 @@ IRCMessage::IRCMessage(QString line) { ctcpStream >> temp; m_ctcpCommand = temp.upper().right(temp.length()-1); m_parameters.clear(); int length = m_allParameters.length() - m_ctcpCommand.length() - 1; if (m_command == "PRIVMSG") length -= m_ctcpDestination.length() + 1; if (length <= 0) { m_allParameters = ""; } else { m_allParameters = m_allParameters.right(length); m_parameters << m_allParameters; } } else { m_ctcp = FALSE; } - /* + //-- Uncomment to debug -- - + /* printf("Parsed : '%s'\n", line.ascii()); printf("Prefix : '%s'\n", m_prefix.ascii()); printf("Command : '%s'\n", m_command.ascii()); printf("Allparameters : '%s'\n", m_allParameters.ascii()); for (unsigned int i=0; i<m_parameters.count(); i++) { printf("Parameter %i : '%s'\n", i, m_parameters[i].ascii()); } printf("CTCP Command : '%s'\n", m_ctcpCommand.latin1()); printf("CTCP Destination : '%s'\n", m_ctcpDestination.latin1()); printf("CTCP param count is : '%i'\n", m_parameters.count()); - */ + } QString IRCMessage::param(int param) { return m_parameters[param]; } QStringList IRCMessage::params(const QString ¶mstring) const { QStringList params, retvalue; params = QStringList::split(',', paramstring); QStringList::Iterator end = params.end(); for (QStringList::Iterator it = params.begin(); it != end; ++it) { int pos = (*it).find(':'); if(pos < 0) { - if((*it).toInt() < m_parameters.count()) + if(static_cast<unsigned int>((*it).toInt()) < m_parameters.count()) retvalue << m_parameters[(*it).toInt()]; } else { int start, end; start = (*it).left(pos).toInt(); end = (*it).mid(pos+1).toInt(); - for (int i=start;i<=end && i < m_parameters.count() ;++i) { + for (int i=start;i<=end && i < static_cast<int>(m_parameters.count()) ;++i) { retvalue << m_parameters[i]; } } } return retvalue; } QString IRCMessage::prefix() { return m_prefix; } QString IRCMessage::command() { return m_command; } |