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

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Colin Guthrie <cguthrie () mandriva ! org>
Date:       2011-04-03 11:51:52
Message-ID: 20110403115152.3E4DBAC8D2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1226945 by cguthrie:

kmix: Avoid the use of QString.sprintf().

This is generally discouraged and also doesn't deal gracefully with UTF8
encoded data (due to explicityly calling toAscii()) so use the
more modern QString().arg(..) construct and leave the data encoding
as is. This may result in writing some UTF8 data into the config files
but this should be handled gracefully.

CCBUG: 265317
CCBUG: 237239
CCBUG: 264835

 M  +3 -4      core/mixdevice.cpp  
 M  +7 -7      gui/viewbase.cpp  


--- trunk/KDE/kdemultimedia/kmix/core/mixdevice.cpp #1226944:1226945
@@ -120,6 +120,7 @@
         kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it \
might not contain spaces" << endl;  _id.replace(' ', '_');
     }
+    kDebug(67100) << "MixDevice::init() _id=" << _id;
 }
 
 void MixDevice::addPlaybackVolume(Volume &playbackVol)
@@ -219,8 +220,7 @@
     if ( isEthereal() || isArtificial() ) {
         kDebug(67100) << "MixDevice::read(): This MixDevice does not permit volume \
restoration (i.e. because it is handled lower down in the audio stack). Ignoring.";  \
                } else {
-        QString devgrp;
-        devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() );
+        QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id);
         KConfigGroup cg = config->group( devgrp );
         //kDebug(67100) << "MixDevice::read() of group devgrp=" << devgrp;
 
@@ -267,8 +267,7 @@
     if (isEthereal() || isArtificial()) {
         kDebug(67100) << "MixDevice::write(): This MixDevice does not permit volume \
saving (i.e. because it is handled lower down in the audio stack). Ignoring.";  } \
                else {
-        QString devgrp;
-        devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() );
+        QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id);
         KConfigGroup cg = config->group(devgrp);
         // kDebug(67100) << "MixDevice::write() of group devgrp=" << devgrp;
 
--- trunk/KDE/kdemultimedia/kmix/gui/viewbase.cpp #1226944:1226945
@@ -320,12 +320,12 @@
            Workaround: If found, write back correct group name.
         */
          MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw;
-         QString devgrp;
-         devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), \
mdw->mixDevice()->mixer()->id().toAscii().data(), \
mdw->mixDevice()->id().toAscii().data() ); +         MixDevice* md = \
mdw->mixDevice(); +
+         QString devgrp = \
QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id());  KConfigGroup \
devcg  = config->group( devgrp );  
-         QString buggyDevgrp;
-         buggyDevgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), \
view->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() ); +         \
QString buggyDevgrp = QString("%1.%2.%3").arg(grp).arg(view->id()).arg(md->id());  \
KConfigGroup buggyDevgrpCG = config->group( buggyDevgrp );  if ( \
buggyDevgrpCG.exists() ) {  buggyDevgrpCG.copyTo(&devcg);
@@ -387,20 +387,20 @@
    QString grp = "View.";
    grp += view->id();
 //   KConfigGroup cg = config->group( grp );
-   kDebug(67100) << "KMixToolBox::saveView() grp=" << grp.toAscii();
+   kDebug(67100) << "KMixToolBox::saveView() grp=" << grp;
 
    for (int i=0; i < view->_mdws.count(); ++i ){
       QWidget *qmdw = view->_mdws[i];
       if ( qmdw->inherits("MixDeviceWidget") )
       {
          MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw;
+         MixDevice* md = mdw->mixDevice();
 
          //kDebug(67100) << "  grp=" << grp.toAscii();
          //kDebug(67100) << "  mixer=" << view->id().toAscii();
          //kDebug(67100) << "  mdwPK=" << mdw->mixDevice()->id().toAscii();
 
-         QString devgrp;
-         devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), \
mdw->mixDevice()->mixer()->id().toAscii().data(), \
mdw->mixDevice()->id().toAscii().data() ); +         QString devgrp = \
QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id());  KConfigGroup \
devcg = config->group( devgrp );  
          if ( mdw->inherits("MDWSlider") )


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