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

List:       kde-commits
Subject:    kdenetwork/kopete/libkopete/private
From:       lØyvind Vågen Jægtnes <tyfon () broadpark ! no>
Date:       2005-04-07 12:36:01
Message-ID: 20050407123601.3AD6363E () office ! kde ! org
[Download RAW message or body]

CVS commit by tyfon: 



BUGS: 85752
Adding support for %n token replacement (expands to nickname)


  M +11 -8     kopetecommand.cpp   1.22


--- kdenetwork/kopete/libkopete/private/kopetecommand.cpp  #1.21:1.22
@@ -100,8 +100,12 @@ void Kopete::Command::processCommand( co
                 {
                         QString formatString = m_formatString;
-                        if( formatString.contains( QString::fromLatin1("%s") ) )
+
+                        // Translate %s to the whole string and %n to current \
nickname +
+                        formatString.replace( QString::fromLatin1("%n"), \
                manager->myself()->nickName() );
                                 formatString.replace( QString::fromLatin1("%s"), \
                args );
-                        else
-                        {
+
+                        // Translate %1..%N to word1..wordN
+
                                 while( mArgs.count() > 0 )
                                 {
@@ -109,5 +113,4 @@ void Kopete::Command::processCommand( co
                                         mArgs.pop_front();
                                 }
-                        }
 
                         kdDebug(14010) << "New Command after processing alias: " << \
formatString << endl;


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