[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/irc
From:       Jason Keirstead <jason () keirstead ! org>
Date:       2005-02-17 2:04:23
Message-ID: 20050217020423.7FF231B3BC () office ! kde ! org
[Download RAW message or body]

CVS commit by brunes: 

Support > 1 arg to whois
--debug in color parser
Hopefully improve action parsing


  M +3 -3      ircprotocol.cpp   1.206
  M +1 -10     ksparser.cpp   1.20
  M +4 -5      libkirc/kircmessage.cpp   1.34


--- kdenetwork/kopete/protocols/irc/ircprotocol.cpp  #1.205:1.206
@@ -178,7 +178,8 @@ IRCProtocol::IRCProtocol( QObject *paren
                 i18n("USAGE: /topic [<topic>] - Sets and/or displays the topic for \
the active channel.") );  
+        //FIXME: Update help text
         Kopete::CommandHandler::commandHandler()->registerCommand( this, \
                QString::fromLatin1("whois"),
                 SLOT( slotWhoisCommand( const QString &, Kopete::ChatSession*) ),
-                i18n("USAGE: /whois <nickname> - Display whois info on this user."), \
1, 1 ); +                i18n("USAGE: /whois <nickname> - Display whois info on this \
user."), 1 );  
         Kopete::CommandHandler::commandHandler()->registerCommand( this, \
QString::fromLatin1("whowas"), @@ -577,6 +578,5 @@ void \
IRCProtocol::slotQueryCommand( cons  void IRCProtocol::slotWhoisCommand( const \
QString &args, Kopete::ChatSession *manager )  {
-        QStringList argsList = Kopete::CommandHandler::parseArguments( args );
-        static_cast<IRCAccount*>( manager->account() )->engine()->whoisUser( \
argsList.first() ); +        static_cast<IRCAccount*>( manager->account() \
)->engine()->whoisUser( args );  m_commandInProgress = true;
 }

--- kdenetwork/kopete/protocols/irc/ksparser.cpp  #1.19:1.20
@@ -113,20 +113,11 @@ QCString KSParser::_parse(const QCString
                                         QString tagStyle;
 
-                                        kdDebug(14120)  << k_funcinfo
-                                                << "fg:" << colorsModeRegexp.cap(1)
-                                                << "\tbg:" << \
                colorsModeRegexp.cap(2) << endl;
-
                                         fgColor = ircColor(colorsModeRegexp.cap(1));
                                         bgColor = ircColor(colorsModeRegexp.cap(2));
 
-                                        kdDebug(14120)  << k_funcinfo
-                                                << "fg:" << fgColor.name()
-                                                << "\tbg:" << bgColor.name() << \
                endl;
-
                                         toAppend = pushColorTag(fgColor, bgColor);
                                 }
                                 else
                                 {
-                                        kdDebug(14120)  << k_funcinfo << "reverting \
                colors" << endl;
                                         toAppend = \
popTag(QString::fromLatin1("span"));  }

--- kdenetwork/kopete/protocols/irc/libkirc/kircmessage.cpp  #1.33:1.34
@@ -103,5 +103,5 @@ void Message::writeRawMessage(Engine *en
 
         QCString s(codec->fromUnicode(txt));
-        kdDebug(14120) << "Message is " << s.length() << "chars" << endl;
+        kdDebug(14120) << "Message is " << s.length() << " chars" << endl;
         // FIXME: Should check the amount of data really writen.
         int wrote = engine->socket()->writeBlock(s.data(), s.length());
@@ -327,10 +327,9 @@ bool Message::isValid() const
 bool Message::extractCtcpCommand(QCString &message, QString &ctcpline, const \
QTextCodec *codec)  {
-        QString msg = Kopete::Message::decodeString(message, codec);
-        uint len = msg.length();
+        uint len = message.length();
 
-        if( msg[0] == 1 && msg[len-1] == 1 )
+        if( message[0] == 1 && message[len-1] == 1 )
         {
-                ctcpline = ctcpUnquote( unquote( msg.mid(1, len-2) ) );
+                ctcpline = ctcpUnquote( unquote( \
Kopete::Message::decodeString(message.mid(1,len-2), codec) ) );  message.truncate(0);
 


[prev in list] [next in list] [prev in thread] [next in thread]