summaryrefslogtreecommitdiff
authorskyhusker <skyhusker>2005-01-23 21:10:39 (UTC)
committer skyhusker <skyhusker>2005-01-23 21:10:39 (UTC)
commitd3d14d324442d05a8f135590c70237657ef1bab0 (patch) (side-by-side diff)
tree9e8ec698557a9ef7387df064a17055af5590333c
parentbe26adf324ea0b723cabcd735b0833e16410ceea (diff)
downloadopie-d3d14d324442d05a8f135590c70237657ef1bab0.zip
opie-d3d14d324442d05a8f135590c70237657ef1bab0.tar.gz
opie-d3d14d324442d05a8f135590c70237657ef1bab0.tar.bz2
Removed some unnecesary castings, changed printf() to odebug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircmessage.cpp38
1 files changed, 20 insertions, 18 deletions
diff --git a/noncore/net/opieirc/ircmessage.cpp b/noncore/net/opieirc/ircmessage.cpp
index 41386ee..d19e9e6 100644
--- a/noncore/net/opieirc/ircmessage.cpp
+++ b/noncore/net/opieirc/ircmessage.cpp
@@ -1,24 +1,29 @@
+#include <opie2/odebug.h>
+
+using namespace Opie::Core;
+
+
#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;
if (temp.startsWith(":")) {
/* extract the prefix */
m_prefix = temp.right(temp.length()-1);
stream >> temp;
@@ -48,85 +53,82 @@ IRCMessage::IRCMessage(QString line) {
if ((m_command == "PRIVMSG" || m_command == "NOTICE") && m_trailing.length()>0 && m_trailing.left(1) == QChar(1)) {
m_ctcp = TRUE;
/* Strip CTCP \001 characters */
m_allParameters = m_allParameters.replace(QRegExp(QChar(1)), "");
QTextIStream ctcpStream(&m_allParameters);
if (m_command == "PRIVMSG")
ctcpStream >> m_ctcpDestination;
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());
+ odebug << "Parsed: " << line << oendl;
+ odebug << "Prefix: " << m_prefix << oendl;
+ odebug << "Command: " << m_command << oendl;
+ odebug << "Allparameters: " << m_allParameters << oendl;
for (unsigned int i=0; i<m_parameters.count(); i++) {
- printf("Parameter %i : '%s'\n", i, m_parameters[i].ascii());
+ odebug << "Parameter " << i << ":" << m_parameters[i] << oendl;
}
- 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());
- */
-
+ odebug << "CTCP Command: " << m_ctcpCommand << oendl;
+ odebug << "CTCP Destination: " << m_ctcpDestination << oendl;
+ odebug << "CTCP param count is: " << m_parameters.count() << oendl;
+
}
QString IRCMessage::param(int param) {
return m_parameters[param];
}
QStringList IRCMessage::params(const QString &paramstring) 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(static_cast<unsigned int>((*it).toInt()) < m_parameters.count())
- retvalue << m_parameters[(*it).toInt()];
+ if((*it).toUInt() < m_parameters.count())
+ retvalue << m_parameters[(*it).toUInt()];
}
else {
- int start, end;
- start = (*it).left(pos).toInt();
- end = (*it).mid(pos+1).toInt();
- for (int i=start;i<=end && i < static_cast<int>(m_parameters.count()) ;++i) {
+ unsigned int start, end;
+ start = (*it).left(pos).toUInt();
+ end = (*it).mid(pos+1).toUInt();
+ for (unsigned int i=start;i<=end && i < m_parameters.count() ;++i) {
retvalue << m_parameters[i];
}
}
}
return retvalue;
}
QString IRCMessage::prefix() {
return m_prefix;
}
QString IRCMessage::command() {
return m_command;
}
QString IRCMessage::ctcpCommand() {
return m_ctcpCommand;
}
QString IRCMessage::ctcpDestination() {
return m_ctcpDestination;
}