summaryrefslogtreecommitdiff
authorfliplap <fliplap>2003-07-22 05:38:38 (UTC)
committer fliplap <fliplap>2003-07-22 05:38:38 (UTC)
commit059af0e82a14a32f068c2ad943dc918afca93587 (patch) (unidiff)
tree1e669194d65a5c9098434115f7b8e5ce3693b14d
parentd672a787dd122410063ac6cb721be8b5f8cd418e (diff)
downloadopie-059af0e82a14a32f068c2ad943dc918afca93587.zip
opie-059af0e82a14a32f068c2ad943dc918afca93587.tar.gz
opie-059af0e82a14a32f068c2ad943dc918afca93587.tar.bz2
getting all my stuff syncd up. Fixed scroll issue, added commands
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircmessageparser.cpp20
-rw-r--r--noncore/net/opieirc/ircperson.cpp2
-rw-r--r--noncore/net/opieirc/ircsettings.cpp2
3 files changed, 12 insertions, 12 deletions
diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index e8d3b1a..6b88f34 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -71,7 +71,7 @@ void IRCMessageParser::parse(IRCMessage *message) {
71 return; 71 return;
72 } 72 }
73 } 73 }
74 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled numeric command : ")+QString::number(message->commandNumber()))); 74 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled numeric command: %1").arg( QString::number(message->commandNumber()) )));
75 } else if (message->isCTCP()) { 75 } else if (message->isCTCP()) {
76 for (int i=0; ctcpParserProcTable[i].commandName; i++) { 76 for (int i=0; ctcpParserProcTable[i].commandName; i++) {
77 if (message->ctcpCommand() == ctcpParserProcTable[i].commandName) { 77 if (message->ctcpCommand() == ctcpParserProcTable[i].commandName) {
@@ -79,7 +79,7 @@ void IRCMessageParser::parse(IRCMessage *message) {
79 return; 79 return;
80 } 80 }
81 } 81 }
82 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled ctcp command : ")+message->ctcpCommand())); 82 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled ctcp command: %1").arg( message->ctcpCommand())) );
83 } else { 83 } else {
84 for (int i=0; literalParserProcTable[i].commandName; i++) { 84 for (int i=0; literalParserProcTable[i].commandName; i++) {
85 if (message->command() == literalParserProcTable[i].commandName) { 85 if (message->command() == literalParserProcTable[i].commandName) {
@@ -87,7 +87,7 @@ void IRCMessageParser::parse(IRCMessage *message) {
87 return; 87 return;
88 } 88 }
89 } 89 }
90 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled literal command : ")+message->command())); 90 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled literal command: %1").arg( message->command()) ));
91 } 91 }
92} 92}
93 93
@@ -128,7 +128,7 @@ void IRCMessageParser::parseLiteralJoin(IRCMessage *message) {
128 chanperson->flags = 0; 128 chanperson->flags = 0;
129 chanperson->person = person; 129 chanperson->person = person;
130 channel->addPerson(chanperson); 130 channel->addPerson(chanperson);
131 IRCOutput output(OUTPUT_OTHERJOIN, mask.nick() + tr(" joined channel ") + channelName); 131 IRCOutput output(OUTPUT_OTHERJOIN ,tr("%1 joined channel %2").arg( mask.nick() ).arg( channelName ));
132 output.addParam(channel); 132 output.addParam(channel);
133 output.addParam(chanperson); 133 output.addParam(chanperson);
134 emit outputReady(output); 134 emit outputReady(output);
@@ -148,7 +148,7 @@ void IRCMessageParser::parseLiteralPart(IRCMessage *message) {
148 if (channel) { 148 if (channel) {
149 if (mask.nick() == m_session->m_server->nick()) { 149 if (mask.nick() == m_session->m_server->nick()) {
150 m_session->removeChannel(channel); 150 m_session->removeChannel(channel);
151 IRCOutput output(OUTPUT_SELFPART, tr("You left channel ") + channelName); 151 IRCOutput output(OUTPUT_SELFPART, tr("You left channel %1").arg( channelName ));
152 output.addParam(channel); 152 output.addParam(channel);
153 emit outputReady(output); 153 emit outputReady(output);
154 delete channel; 154 delete channel;
@@ -156,7 +156,7 @@ void IRCMessageParser::parseLiteralPart(IRCMessage *message) {
156 IRCChannelPerson *person = channel->getPerson(mask.nick()); 156 IRCChannelPerson *person = channel->getPerson(mask.nick());
157 if (person) { 157 if (person) {
158 channel->removePerson(person); 158 channel->removePerson(person);
159 IRCOutput output(OUTPUT_OTHERPART, mask.nick() + tr(" left channel ") + channelName); 159 IRCOutput output(OUTPUT_OTHERPART, tr("%1 left channel %2").arg( mask.nick() ).arg( channelName) );
160 output.addParam(channel); 160 output.addParam(channel);
161 output.addParam(person); 161 output.addParam(person);
162 emit outputReady(output); 162 emit outputReady(output);
@@ -198,7 +198,7 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) {
198 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown sender"))); 198 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown sender")));
199 } 199 }
200 } else { 200 } else {
201 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel ") + message->param(0).lower())); 201 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel %1").arg(message->param(0).lower()) ));
202 } 202 }
203 } else { 203 } else {
204 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received PRIVMSG of unknown type"))); 204 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received PRIVMSG of unknown type")));
@@ -211,14 +211,14 @@ void IRCMessageParser::parseLiteralNick(IRCMessage *message) {
211 if (mask.nick() == m_session->m_server->nick()) { 211 if (mask.nick() == m_session->m_server->nick()) {
212 /* We are changing our nickname */ 212 /* We are changing our nickname */
213 m_session->m_server->setNick(message->param(0)); 213 m_session->m_server->setNick(message->param(0));
214 IRCOutput output(OUTPUT_NICKCHANGE, tr("You are now known as ")+message->param(0)); 214 IRCOutput output(OUTPUT_NICKCHANGE, tr("You are now known as %1").arg( message->param(0)));
215 output.addParam(0); 215 output.addParam(0);
216 emit outputReady(output); 216 emit outputReady(output);
217 } else { 217 } else {
218 /* Someone else is */ 218 /* Someone else is */
219 IRCPerson *person = m_session->getPerson(mask.nick()); 219 IRCPerson *person = m_session->getPerson(mask.nick());
220 if (person) { 220 if (person) {
221 IRCOutput output(OUTPUT_NICKCHANGE, mask.nick() + tr(" is now known as ") + message->param(0)); 221 IRCOutput output(OUTPUT_NICKCHANGE, tr("%1 is now known as %2").arg( mask.nick() ).arg( message->param(0 )));
222 output.addParam(person); 222 output.addParam(person);
223 emit outputReady(output); 223 emit outputReady(output);
224 } else { 224 } else {
@@ -240,7 +240,7 @@ void IRCMessageParser::parseLiteralQuit(IRCMessage *message) {
240 delete chanperson; 240 delete chanperson;
241 } 241 }
242 m_session->removePerson(person); 242 m_session->removePerson(person);
243 IRCOutput output(OUTPUT_QUIT, mask.nick() + tr(" has quit ") + "(" + message->param(0) + ")"); 243 IRCOutput output(OUTPUT_QUIT, tr("%1 has quit (%2)" ).arg( mask.nick() ).arg( message->param(0) ));
244 output.addParam(person); 244 output.addParam(person);
245 emit outputReady(output); 245 emit outputReady(output);
246 delete person; 246 delete person;
diff --git a/noncore/net/opieirc/ircperson.cpp b/noncore/net/opieirc/ircperson.cpp
index 2f5b435..1dd2679 100644
--- a/noncore/net/opieirc/ircperson.cpp
+++ b/noncore/net/opieirc/ircperson.cpp
@@ -41,7 +41,7 @@ void IRCPerson::setUser(QString user) {
41void IRCPerson::setHost(QString host) { 41void IRCPerson::setHost(QString host) {
42 m_host = host; 42 m_host = host;
43} 43}
44 44 // -- GETTER FUNCS --
45QString IRCPerson::nick() { 45QString IRCPerson::nick() {
46 return m_nick; 46 return m_nick;
47} 47}
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp
index b110a5b..70d5445 100644
--- a/noncore/net/opieirc/ircsettings.cpp
+++ b/noncore/net/opieirc/ircsettings.cpp
@@ -9,7 +9,7 @@
9#include "ircmisc.h" 9#include "ircmisc.h"
10 10
11IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) { 11IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
12 setCaption("Settings"); 12 setCaption(tr("Settings") );
13 m_config = new Config("OpieIRC"); 13 m_config = new Config("OpieIRC");
14 m_config->setGroup("OpieIRC"); 14 m_config->setGroup("OpieIRC");
15 QHBoxLayout *l = new QHBoxLayout(this, 2, 2); 15 QHBoxLayout *l = new QHBoxLayout(this, 2, 2);