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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-11-01 12:00:50
Message-ID: 1225540850.237625.8897.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 878486 by mkretz:

no need to try to merge with something that cannot exist

 M  +1 -1      kcm/deviceuids_update.cpp  
 M  +1 -1      kded-module/phononserver.cpp  


--- trunk/KDE/kdebase/runtime/phonon/kcm/deviceuids_update.cpp #878485:878486
@@ -39,7 +39,7 @@
     // 4. remove udi key
     // 5. remove driver key
     // 6. add deviceNumber key
-    KConfig kconfig("phonondevicesrc", KConfig::NoGlobals);
+    KConfig kconfig("phonondevicesrc", KConfig::SimpleConfig);
     KConfigGroup globalGroup(&kconfig, "Globals");
     int nextIndex = globalGroup.readEntry("nextIndex", 1);
 
--- trunk/KDE/kdebase/runtime/phonon/kded-module/phononserver.cpp #878485:878486
@@ -58,7 +58,7 @@
 
 PhononServer::PhononServer(QObject *parent, const QList<QVariant> &)
     : KDEDModule(parent),
-    m_config(KSharedConfig::openConfig("phonondevicesrc", KConfig::NoGlobals))
+    m_config(KSharedConfig::openConfig("phonondevicesrc", KConfig::SimpleConfig))
 {
     findDevices();
     connect(Solid::DeviceNotifier::instance(), SIGNAL(deviceAdded(const QString &)), \
SLOT(deviceAdded(const QString &)));


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