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

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Laurent Montel <montel () kde ! org>
Date:       2010-09-29 7:40:57
Message-ID: 20100929074057.C0592AC88E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1180839 by mlaurent:

start to fix compile


 M  +2 -2      apps/kmix.cpp  
 M  +2 -2      apps/kmixd.cpp  
 M  +1 -1      backends/mixer_oss4.cpp  
 M  +1 -1      core/kmixdevicemanager.cpp  
 M  +1 -1      core/mixertoolbox.cpp  


--- trunk/KDE/kdemultimedia/kmix/apps/kmix.cpp #1180838:1180839
@@ -355,7 +355,7 @@
 void KMixWindow::saveVolumes()
 {
     kDebug() << "About to save config (Volume)";
-    KConfig *cfg = new KConfig( "kmixctrlrc" );
+    KConfig *cfg = new KConfig( QLatin1String(  "kmixctrlrc" ) );
     for ( int i=0; i<Mixer::mixers().count(); ++i)
     {
         Mixer *mixer = (Mixer::mixers())[i];
@@ -434,7 +434,7 @@
 void
 KMixWindow::loadVolumes()
 {
-    KConfig *cfg = new KConfig( "kmixctrlrc", true );
+    KConfig *cfg = new KConfig( QLatin1String(  "kmixctrlrc" ), true );
     for ( int i=0; i<Mixer::mixers().count(); ++i)
     {
         Mixer *mixer = (Mixer::mixers())[i];
--- trunk/KDE/kdemultimedia/kmix/apps/kmixd.cpp #1180838:1180839
@@ -184,7 +184,7 @@
 void KMixD::saveVolumes()
 {
    kDebug() << "About to save config (Volume)";
-   KConfig *cfg = new KConfig( "kmixctrlrc" );
+   KConfig *cfg = new KConfig( QLatin1String(  "kmixctrlrc" ) );
    for ( int i=0; i<Mixer::mixers().count(); ++i)
    {
       Mixer *mixer = (Mixer::mixers())[i];
@@ -235,7 +235,7 @@
 void
 KMixD::loadVolumes()
 {
-    KConfig *cfg = new KConfig( "kmixctrlrc", true );
+    KConfig *cfg = new KConfig( QLatin1String(  "kmixctrlrc" ), true );
     for ( int i=0; i<Mixer::mixers().count(); ++i)
     {
         Mixer *mixer = (Mixer::mixers())[i];
--- trunk/KDE/kdemultimedia/kmix/backends/mixer_oss4.cpp #1180838:1180839
@@ -73,7 +73,7 @@
 MixDevice::ChannelType Mixer_OSS4::classifyAndRename(QString &name, int flags)
 {
 	MixDevice::ChannelType cType = MixDevice::UNKNOWN;
-	QStringList classes = name.split (QRegExp( "[-,.]" ));
+	QStringList classes = name.split (QRegExp( QLatin1String(  "[-,.]" ) ));
 
 
 	if ( flags & MIXF_PCMVOL  ||
--- trunk/KDE/kdemultimedia/kmix/core/kmixdevicemanager.cpp #1180838:1180839
@@ -126,7 +126,7 @@
    Solid::AudioInterface *audiohw = device.as<Solid::AudioInterface>();
    if (audiohw && (audiohw->deviceType() & ( Solid::AudioInterface::AudioControl))) {
        QString dev;
-       QRegExp devExpr("^\\D+(\\d+)$");
+       QRegExp devExpr( QLatin1String( "^\\D+(\\d+)$" ));
         switch (audiohw->driver()) {
            case Solid::AudioInterface::Alsa:
                if ( _hotpluggingBackend == "ALSA" || _hotpluggingBackend == "*" ) {
--- trunk/KDE/kdemultimedia/kmix/core/mixertoolbox.cpp #1180838:1180839
@@ -36,7 +36,7 @@
 
 
 MixerToolBox* MixerToolBox::s_instance      = 0;
-QRegExp MixerToolBox::s_ignoreMixerExpression("Modem");
+QRegExp MixerToolBox::s_ignoreMixerExpression( QLatin1String( "Modem" ));
 //KLocale* MixerToolBox::s_whatsthisLocale = 0;
 
 /***********************************************************************************
[prev in list] [next in list] [prev in thread] [next in thread]