author | fliplap <fliplap> | 2003-07-22 05:38:38 (UTC) |
---|---|---|
committer | fliplap <fliplap> | 2003-07-22 05:38:38 (UTC) |
commit | 059af0e82a14a32f068c2ad943dc918afca93587 (patch) (unidiff) | |
tree | 1e669194d65a5c9098434115f7b8e5ce3693b14d /noncore/net/opieirc | |
parent | d672a787dd122410063ac6cb721be8b5f8cd418e (diff) | |
download | opie-059af0e82a14a32f068c2ad943dc918afca93587.zip opie-059af0e82a14a32f068c2ad943dc918afca93587.tar.gz opie-059af0e82a14a32f068c2ad943dc918afca93587.tar.bz2 |
getting all my stuff syncd up. Fixed scroll issue, added commands
-rw-r--r-- | noncore/net/opieirc/ircmessageparser.cpp | 20 | ||||
-rw-r--r-- | noncore/net/opieirc/ircperson.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/ircsettings.cpp | 2 |
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 | |||
@@ -62,41 +62,41 @@ IRCMessageParser::IRCMessageParser(IRCSession *session) { | |||
62 | } | 62 | } |
63 | 63 | ||
64 | void IRCMessageParser::parse(IRCMessage *message) { | 64 | void IRCMessageParser::parse(IRCMessage *message) { |
65 | /* Find out what kind of message we have here and call the appropriate handler using | 65 | /* Find out what kind of message we have here and call the appropriate handler using |
66 | the parser tables. If no handler can be found, print out an error message */ | 66 | the parser tables. If no handler can be found, print out an error message */ |
67 | if (message->isNumerical()) { | 67 | if (message->isNumerical()) { |
68 | for (int i=0; i<numericalParserProcTable[i].commandNumber; i++) { | 68 | for (int i=0; i<numericalParserProcTable[i].commandNumber; i++) { |
69 | if (message->commandNumber() == numericalParserProcTable[i].commandNumber) { | 69 | if (message->commandNumber() == numericalParserProcTable[i].commandNumber) { |
70 | (this->*(numericalParserProcTable[i].proc))(message); | 70 | (this->*(numericalParserProcTable[i].proc))(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) { |
78 | (this->*(ctcpParserProcTable[i].proc))(message); | 78 | (this->*(ctcpParserProcTable[i].proc))(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) { |
86 | (this->*(literalParserProcTable[i].proc))(message); | 86 | (this->*(literalParserProcTable[i].proc))(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 | ||
94 | void IRCMessageParser::nullFunc(IRCMessage *) { | 94 | void IRCMessageParser::nullFunc(IRCMessage *) { |
95 | /* Do nothing */ | 95 | /* Do nothing */ |
96 | } | 96 | } |
97 | 97 | ||
98 | void IRCMessageParser::parseLiteralPing(IRCMessage *message) { | 98 | void IRCMessageParser::parseLiteralPing(IRCMessage *message) { |
99 | m_session->m_connection->sendLine("PONG " + message->allParameters()); | 99 | m_session->m_connection->sendLine("PONG " + message->allParameters()); |
100 | } | 100 | } |
101 | 101 | ||
102 | void IRCMessageParser::parseLiteralNotice(IRCMessage *message) { | 102 | void IRCMessageParser::parseLiteralNotice(IRCMessage *message) { |
@@ -119,53 +119,53 @@ void IRCMessageParser::parseLiteralJoin(IRCMessage *message) { | |||
119 | /* Someone else joined */ | 119 | /* Someone else joined */ |
120 | if (mask.nick() != m_session->m_server->nick()) { | 120 | if (mask.nick() != m_session->m_server->nick()) { |
121 | if (!channel->getPerson(mask.nick())) { | 121 | if (!channel->getPerson(mask.nick())) { |
122 | IRCChannelPerson *chanperson = new IRCChannelPerson(); | 122 | IRCChannelPerson *chanperson = new IRCChannelPerson(); |
123 | IRCPerson *person = m_session->getPerson(mask.nick()); | 123 | IRCPerson *person = m_session->getPerson(mask.nick()); |
124 | if (!person) { | 124 | if (!person) { |
125 | person = new IRCPerson(message->prefix()); | 125 | person = new IRCPerson(message->prefix()); |
126 | m_session->addPerson(person); | 126 | m_session->addPerson(person); |
127 | } | 127 | } |
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); |
135 | } else { | 135 | } else { |
136 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Person has already joined the channel - desynchronized?"))); | 136 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Person has already joined the channel - desynchronized?"))); |
137 | } | 137 | } |
138 | } else { | 138 | } else { |
139 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("You already joined the channel - desynchronized?"))); | 139 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("You already joined the channel - desynchronized?"))); |
140 | } | 140 | } |
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | void IRCMessageParser::parseLiteralPart(IRCMessage *message) { | 144 | void IRCMessageParser::parseLiteralPart(IRCMessage *message) { |
145 | QString channelName = message->param(0).lower(); | 145 | QString channelName = message->param(0).lower(); |
146 | IRCChannel *channel = m_session->getChannel(channelName); | 146 | IRCChannel *channel = m_session->getChannel(channelName); |
147 | IRCPerson mask(message->prefix()); | 147 | IRCPerson mask(message->prefix()); |
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; |
155 | } else { | 155 | } else { |
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); |
163 | delete person; | 163 | delete person; |
164 | } else { | 164 | } else { |
165 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Parting person not found - desynchronized?"))); | 165 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Parting person not found - desynchronized?"))); |
166 | } | 166 | } |
167 | } | 167 | } |
168 | } else { | 168 | } else { |
169 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel for part not found - desynchronized?"))); | 169 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel for part not found - desynchronized?"))); |
170 | } | 170 | } |
171 | } | 171 | } |
@@ -189,67 +189,67 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) { | |||
189 | if (channel) { | 189 | if (channel) { |
190 | IRCPerson mask(message->prefix()); | 190 | IRCPerson mask(message->prefix()); |
191 | IRCChannelPerson *person = channel->getPerson(mask.nick()); | 191 | IRCChannelPerson *person = channel->getPerson(mask.nick()); |
192 | if (person) { | 192 | if (person) { |
193 | IRCOutput output(OUTPUT_CHANPRIVMSG, message->param(1)); | 193 | IRCOutput output(OUTPUT_CHANPRIVMSG, message->param(1)); |
194 | output.addParam(channel); | 194 | output.addParam(channel); |
195 | output.addParam(person); | 195 | output.addParam(person); |
196 | emit outputReady(output); | 196 | emit outputReady(output); |
197 | } else { | 197 | } else { |
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"))); |
205 | } | 205 | } |
206 | } | 206 | } |
207 | 207 | ||
208 | void IRCMessageParser::parseLiteralNick(IRCMessage *message) { | 208 | void IRCMessageParser::parseLiteralNick(IRCMessage *message) { |
209 | IRCPerson mask(message->prefix()); | 209 | IRCPerson mask(message->prefix()); |
210 | 210 | ||
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 { |
225 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Nickname change of an unknown person"))); | 225 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Nickname change of an unknown person"))); |
226 | } | 226 | } |
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | void IRCMessageParser::parseLiteralQuit(IRCMessage *message) { | 230 | void IRCMessageParser::parseLiteralQuit(IRCMessage *message) { |
231 | IRCPerson mask(message->prefix()); | 231 | IRCPerson mask(message->prefix()); |
232 | IRCPerson *person = m_session->getPerson(mask.nick()); | 232 | IRCPerson *person = m_session->getPerson(mask.nick()); |
233 | if (person) { | 233 | if (person) { |
234 | QList<IRCChannel> channels; | 234 | QList<IRCChannel> channels; |
235 | m_session->getChannelsByPerson(person, channels); | 235 | m_session->getChannelsByPerson(person, channels); |
236 | QListIterator<IRCChannel> it(channels); | 236 | QListIterator<IRCChannel> it(channels); |
237 | for (;it.current(); ++it) { | 237 | for (;it.current(); ++it) { |
238 | IRCChannelPerson *chanperson = it.current()->getPerson(mask.nick()); | 238 | IRCChannelPerson *chanperson = it.current()->getPerson(mask.nick()); |
239 | it.current()->removePerson(chanperson); | 239 | it.current()->removePerson(chanperson); |
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; |
247 | } else { | 247 | } else { |
248 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person quit - desynchronized?"))); | 248 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person quit - desynchronized?"))); |
249 | } | 249 | } |
250 | } | 250 | } |
251 | 251 | ||
252 | void IRCMessageParser::parseLiteralTopic(IRCMessage *message) { | 252 | void IRCMessageParser::parseLiteralTopic(IRCMessage *message) { |
253 | IRCPerson mask(message->prefix()); | 253 | IRCPerson mask(message->prefix()); |
254 | IRCChannel *channel = m_session->getChannel(message->param(0).lower()); | 254 | IRCChannel *channel = m_session->getChannel(message->param(0).lower()); |
255 | if (channel) { | 255 | if (channel) { |
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 | |||
@@ -32,24 +32,24 @@ QString IRCPerson::toMask() { | |||
32 | 32 | ||
33 | void IRCPerson::setNick(QString nick) { | 33 | void IRCPerson::setNick(QString nick) { |
34 | m_nick = nick; | 34 | m_nick = nick; |
35 | } | 35 | } |
36 | 36 | ||
37 | void IRCPerson::setUser(QString user) { | 37 | void IRCPerson::setUser(QString user) { |
38 | m_user = user; | 38 | m_user = user; |
39 | } | 39 | } |
40 | 40 | ||
41 | void IRCPerson::setHost(QString host) { | 41 | void IRCPerson::setHost(QString host) { |
42 | m_host = host; | 42 | m_host = host; |
43 | } | 43 | } |
44 | 44 | // -- GETTER FUNCS -- | |
45 | QString IRCPerson::nick() { | 45 | QString IRCPerson::nick() { |
46 | return m_nick; | 46 | return m_nick; |
47 | } | 47 | } |
48 | 48 | ||
49 | QString IRCPerson::user() { | 49 | QString IRCPerson::user() { |
50 | return m_user; | 50 | return m_user; |
51 | } | 51 | } |
52 | 52 | ||
53 | QString IRCPerson::host() { | 53 | QString IRCPerson::host() { |
54 | return m_host; | 54 | return m_host; |
55 | } | 55 | } |
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 | |||
@@ -1,24 +1,24 @@ | |||
1 | #include <opie/ocolorbutton.h> | 1 | #include <opie/ocolorbutton.h> |
2 | #include <opie/otabwidget.h> | 2 | #include <opie/otabwidget.h> |
3 | #include <qlayout.h> | 3 | #include <qlayout.h> |
4 | #include <qvalidator.h> | 4 | #include <qvalidator.h> |
5 | #include <qscrollview.h> | 5 | #include <qscrollview.h> |
6 | #include <qwhatsthis.h> | 6 | #include <qwhatsthis.h> |
7 | #include "ircsettings.h" | 7 | #include "ircsettings.h" |
8 | #include "irctab.h" | 8 | #include "irctab.h" |
9 | #include "ircmisc.h" | 9 | #include "ircmisc.h" |
10 | 10 | ||
11 | IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) { | 11 | IRCSettings::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); |
16 | OTabWidget *tw = new OTabWidget(this); | 16 | OTabWidget *tw = new OTabWidget(this); |
17 | l->addWidget(tw); | 17 | l->addWidget(tw); |
18 | /* General Configuration */ | 18 | /* General Configuration */ |
19 | QWidget *genwidget = new QWidget(tw); | 19 | QWidget *genwidget = new QWidget(tw); |
20 | QGridLayout *layout = new QGridLayout(genwidget, 1, 2, 5, 0); | 20 | QGridLayout *layout = new QGridLayout(genwidget, 1, 2, 5, 0); |
21 | QLabel *label = new QLabel(tr("Lines displayed :"), genwidget); | 21 | QLabel *label = new QLabel(tr("Lines displayed :"), genwidget); |
22 | layout->addWidget(label, 0, 0); | 22 | layout->addWidget(label, 0, 0); |
23 | m_lines = new QLineEdit(m_config->readEntry("Lines", "100"), genwidget); | 23 | m_lines = new QLineEdit(m_config->readEntry("Lines", "100"), genwidget); |
24 | QWhatsThis::add(m_lines, tr("Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don't need this")); | 24 | QWhatsThis::add(m_lines, tr("Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don't need this")); |