getting all my stuff syncd up. Fixed scroll issue, added commands

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
@@ -72,5 +72,5 @@ void IRCMessageParser::parse(IRCMessage *message) {
             }
         }
-        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled numeric command : ")+QString::number(message->commandNumber())));
+        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled numeric command: %1").arg( QString::number(message->commandNumber()) )));
     } else if (message->isCTCP()) {
         for (int i=0; ctcpParserProcTable[i].commandName; i++) {
@@ -80,5 +80,5 @@ void IRCMessageParser::parse(IRCMessage *message) {
             }
         }
-        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled ctcp command : ")+message->ctcpCommand()));
+        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled ctcp command: %1").arg( message->ctcpCommand())) );
     } else {
         for (int i=0; literalParserProcTable[i].commandName; i++) {
@@ -88,5 +88,5 @@ void IRCMessageParser::parse(IRCMessage *message) {
             }
         }
-        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled literal command : ")+message->command()));
+        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled literal command: %1").arg( message->command()) ));
     }
 }
@@ -129,5 +129,5 @@ void IRCMessageParser::parseLiteralJoin(IRCMessage *message) {
                 chanperson->person = person;
                 channel->addPerson(chanperson);
-                IRCOutput output(OUTPUT_OTHERJOIN, mask.nick() + tr(" joined channel ") + channelName);
+                IRCOutput output(OUTPUT_OTHERJOIN ,tr("%1 joined channel %2").arg( mask.nick() ).arg( channelName ));
                 output.addParam(channel);
                 output.addParam(chanperson);
@@ -149,5 +149,5 @@ void IRCMessageParser::parseLiteralPart(IRCMessage *message) {
         if (mask.nick() == m_session->m_server->nick()) {
             m_session->removeChannel(channel);
-            IRCOutput output(OUTPUT_SELFPART, tr("You left channel ") + channelName);
+            IRCOutput output(OUTPUT_SELFPART, tr("You left channel %1").arg( channelName ));
             output.addParam(channel);
             emit outputReady(output);
@@ -157,5 +157,5 @@ void IRCMessageParser::parseLiteralPart(IRCMessage *message) {
             if (person) {
                 channel->removePerson(person);
-                IRCOutput output(OUTPUT_OTHERPART, mask.nick() + tr(" left channel ") + channelName);
+                IRCOutput output(OUTPUT_OTHERPART, tr("%1 left channel %2").arg( mask.nick() ).arg( channelName) );
                 output.addParam(channel);
                 output.addParam(person);
@@ -199,5 +199,5 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) {
             }
         } else {
-            emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel ") + message->param(0).lower()));
+            emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel %1").arg(message->param(0).lower()) ));
         }
     } else {
@@ -212,5 +212,5 @@ void IRCMessageParser::parseLiteralNick(IRCMessage *message) {
         /* We are changing our nickname */
         m_session->m_server->setNick(message->param(0));
-        IRCOutput output(OUTPUT_NICKCHANGE, tr("You are now known as ")+message->param(0));
+        IRCOutput output(OUTPUT_NICKCHANGE, tr("You are now known as %1").arg( message->param(0)));
         output.addParam(0);
         emit outputReady(output);
@@ -219,5 +219,5 @@ void IRCMessageParser::parseLiteralNick(IRCMessage *message) {
         IRCPerson *person = m_session->getPerson(mask.nick());
         if (person) {
-            IRCOutput output(OUTPUT_NICKCHANGE, mask.nick() + tr(" is now known as ") + message->param(0));
+            IRCOutput output(OUTPUT_NICKCHANGE, tr("%1 is now known as %2").arg( mask.nick() ).arg( message->param(0 )));
             output.addParam(person);
             emit outputReady(output);
@@ -241,5 +241,5 @@ void IRCMessageParser::parseLiteralQuit(IRCMessage *message) {
         }
         m_session->removePerson(person);
-        IRCOutput output(OUTPUT_QUIT, mask.nick() + tr(" has quit ") + "(" + message->param(0) + ")");
+        IRCOutput output(OUTPUT_QUIT, tr("%1 has quit (%2)" ).arg( mask.nick() ).arg( message->param(0) ));
         output.addParam(person);
         emit outputReady(output);
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
@@ -42,5 +42,5 @@ void IRCPerson::setHost(QString host) {
     m_host = host;
 }
-
+ // -- GETTER FUNCS --
 QString IRCPerson::nick() {
     return m_nick;
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
@@ -10,5 +10,5 @@
 
 IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
-    setCaption("Settings");
+    setCaption(tr("Settings") );
     m_config = new Config("OpieIRC");
     m_config->setGroup("OpieIRC");