author | skyhusker <skyhusker> | 2005-01-16 02:13:15 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-01-16 02:13:15 (UTC) |
commit | e420e24bb1506e313cc38174111d424ba7274e33 (patch) (unidiff) | |
tree | 3bc3297f52c1e954df6669a5abb65902ad5605e4 | |
parent | 972d0500299d6bed8e0890810f9c120390268dcf (diff) | |
download | opie-e420e24bb1506e313cc38174111d424ba7274e33.zip opie-e420e24bb1506e313cc38174111d424ba7274e33.tar.gz opie-e420e24bb1506e313cc38174111d424ba7274e33.tar.bz2 |
Fixed some warnings
-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 @@ | |||
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 | ||
7 | /* | 8 | /* |
8 | * Create a new IRCMessage by evaluating | 9 | * Create a new IRCMessage by evaluating |
9 | * a received string | 10 | * a received string |
10 | */ | 11 | */ |
11 | 12 | ||
12 | IRCMessage::IRCMessage(QString line) { | 13 | IRCMessage::IRCMessage(QString line) { |
13 | /* Remove CRs from the message */ | 14 | /* Remove CRs from the message */ |
14 | while((line.right(1) == "\n") || (line.right(1) == "\r")) | 15 | while((line.right(1) == "\n") || (line.right(1) == "\r")) |
15 | line = line.left(line.length() - 1); | 16 | line = line.left(line.length() - 1); |
16 | QTextIStream stream(&line); | 17 | QTextIStream stream(&line); |
17 | QString temp; | 18 | QString temp; |
18 | 19 | ||
19 | stream >> temp; | 20 | stream >> temp; |
@@ -54,70 +55,70 @@ IRCMessage::IRCMessage(QString line) { | |||
54 | ctcpStream >> temp; | 55 | ctcpStream >> temp; |
55 | m_ctcpCommand = temp.upper().right(temp.length()-1); | 56 | m_ctcpCommand = temp.upper().right(temp.length()-1); |
56 | m_parameters.clear(); | 57 | m_parameters.clear(); |
57 | int length = m_allParameters.length() - m_ctcpCommand.length() - 1; | 58 | int length = m_allParameters.length() - m_ctcpCommand.length() - 1; |
58 | if (m_command == "PRIVMSG") | 59 | if (m_command == "PRIVMSG") |
59 | length -= m_ctcpDestination.length() + 1; | 60 | length -= m_ctcpDestination.length() + 1; |
60 | if (length <= 0) { | 61 | if (length <= 0) { |
61 | m_allParameters = ""; | 62 | m_allParameters = ""; |
62 | } else { | 63 | } else { |
63 | m_allParameters = m_allParameters.right(length); | 64 | m_allParameters = m_allParameters.right(length); |
64 | m_parameters << m_allParameters; | 65 | m_parameters << m_allParameters; |
65 | } | 66 | } |
66 | } else { | 67 | } else { |
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()); |
76 | printf("Allparameters : '%s'\n", m_allParameters.ascii()); | 77 | printf("Allparameters : '%s'\n", m_allParameters.ascii()); |
77 | for (unsigned int i=0; i<m_parameters.count(); i++) { | 78 | for (unsigned int i=0; i<m_parameters.count(); i++) { |
78 | printf("Parameter %i : '%s'\n", i, m_parameters[i].ascii()); | 79 | printf("Parameter %i : '%s'\n", i, m_parameters[i].ascii()); |
79 | } | 80 | } |
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) { |
88 | return m_parameters[param]; | 89 | return m_parameters[param]; |
89 | } | 90 | } |
90 | 91 | ||
91 | QStringList IRCMessage::params(const QString ¶mstring) const { | 92 | QStringList IRCMessage::params(const QString ¶mstring) const { |
92 | QStringList params, retvalue; | 93 | QStringList params, retvalue; |
93 | params = QStringList::split(',', paramstring); | 94 | params = QStringList::split(',', paramstring); |
94 | QStringList::Iterator end = params.end(); | 95 | QStringList::Iterator end = params.end(); |
95 | 96 | ||
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 | ||
103 | else { | 104 | else { |
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 | } |
111 | } | 112 | } |
112 | 113 | ||
113 | return retvalue; | 114 | return retvalue; |
114 | } | 115 | } |
115 | 116 | ||
116 | QString IRCMessage::prefix() { | 117 | QString IRCMessage::prefix() { |
117 | return m_prefix; | 118 | return m_prefix; |
118 | } | 119 | } |
119 | 120 | ||
120 | QString IRCMessage::command() { | 121 | QString IRCMessage::command() { |
121 | return m_command; | 122 | return m_command; |
122 | } | 123 | } |
123 | 124 | ||