-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,6 +1,7 @@ | |||
1 | #include <qtextstream.h> | 1 | #include <qtextstream.h> |
2 | #include <qstring.h> | 2 | #include <qstring.h> |
3 | #include <qstringlist.h> | 3 | #include <qstringlist.h> |
4 | #include <qregexp.h> | ||
4 | 5 | ||
5 | #include "ircmessage.h" | 6 | #include "ircmessage.h" |
6 | 7 | ||
@@ -67,9 +68,9 @@ IRCMessage::IRCMessage(QString line) { | |||
67 | m_ctcp = FALSE; | 68 | m_ctcp = FALSE; |
68 | } | 69 | } |
69 | 70 | ||
70 | /* | 71 | |
71 | //-- Uncomment to debug -- | 72 | //-- Uncomment to debug -- |
72 | 73 | /* | |
73 | printf("Parsed : '%s'\n", line.ascii()); | 74 | printf("Parsed : '%s'\n", line.ascii()); |
74 | printf("Prefix : '%s'\n", m_prefix.ascii()); | 75 | printf("Prefix : '%s'\n", m_prefix.ascii()); |
75 | printf("Command : '%s'\n", m_command.ascii()); | 76 | printf("Command : '%s'\n", m_command.ascii()); |
@@ -80,8 +81,8 @@ IRCMessage::IRCMessage(QString line) { | |||
80 | printf("CTCP Command : '%s'\n", m_ctcpCommand.latin1()); | 81 | printf("CTCP Command : '%s'\n", m_ctcpCommand.latin1()); |
81 | printf("CTCP Destination : '%s'\n", m_ctcpDestination.latin1()); | 82 | printf("CTCP Destination : '%s'\n", m_ctcpDestination.latin1()); |
82 | printf("CTCP param count is : '%i'\n", m_parameters.count()); | 83 | printf("CTCP param count is : '%i'\n", m_parameters.count()); |
83 | |||
84 | */ | 84 | */ |
85 | |||
85 | } | 86 | } |
86 | 87 | ||
87 | QString IRCMessage::param(int param) { | 88 | QString IRCMessage::param(int param) { |
@@ -96,7 +97,7 @@ QStringList IRCMessage::params(const QString ¶mstring) const { | |||
96 | for (QStringList::Iterator it = params.begin(); it != end; ++it) { | 97 | for (QStringList::Iterator it = params.begin(); it != end; ++it) { |
97 | int pos = (*it).find(':'); | 98 | int pos = (*it).find(':'); |
98 | if(pos < 0) { | 99 | if(pos < 0) { |
99 | if((*it).toInt() < m_parameters.count()) | 100 | if(static_cast<unsigned int>((*it).toInt()) < m_parameters.count()) |
100 | retvalue << m_parameters[(*it).toInt()]; | 101 | retvalue << m_parameters[(*it).toInt()]; |
101 | } | 102 | } |
102 | 103 | ||
@@ -104,7 +105,7 @@ QStringList IRCMessage::params(const QString ¶mstring) const { | |||
104 | int start, end; | 105 | int start, end; |
105 | start = (*it).left(pos).toInt(); | 106 | start = (*it).left(pos).toInt(); |
106 | end = (*it).mid(pos+1).toInt(); | 107 | end = (*it).mid(pos+1).toInt(); |
107 | for (int i=start;i<=end && i < m_parameters.count() ;++i) { | 108 | for (int i=start;i<=end && i < static_cast<int>(m_parameters.count()) ;++i) { |
108 | retvalue << m_parameters[i]; | 109 | retvalue << m_parameters[i]; |
109 | } | 110 | } |
110 | } | 111 | } |