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

List:       kde-commits
Subject:    KDE/kdelibs/phonon
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-04-24 22:59:46
Message-ID: 1209077986.268266.16005.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 800831 by mkretz:

add update code to remove index 0 and multiply all hardware device indexes with -1

 M  +2 -2      globalconfig.cpp  
 M  +6 -0      kcm/CMakeLists.txt  
 M  +8 -8      kcm/devicepreference.cpp  
 A             kcm/devicepreference.upd  
 A             kcm/devicepreference_update.cpp   [License: LGPL (v2/3)]
 M  +0 -1      qsettingsgroup_p.h  


--- trunk/KDE/kdelibs/phonon/globalconfig.cpp #800830:800831
@@ -91,10 +91,10 @@
         }
     }
 
-    QString categoryKey = QLatin1String("Category") + \
QString::number(static_cast<int>(category)); +    QString categoryKey = \
QLatin1String("Category_") + QString::number(static_cast<int>(category));  if \
(!backendConfig.hasKey(categoryKey)) {  // no list in config for the given category
-        categoryKey = QLatin1String("Category") + \
QString::number(static_cast<int>(Phonon::NoCategory)); +        categoryKey = \
QLatin1String("Category_") + QString::number(static_cast<int>(Phonon::NoCategory));  \
if (!backendConfig.hasKey(categoryKey)) {  // no list in config for NoCategory
             return defaultList;
--- trunk/KDE/kdelibs/phonon/kcm/CMakeLists.txt #800830:800831
@@ -12,3 +12,9 @@
 ########### install files ###############
 install( FILES kcm_phonon.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 install(FILES listview-background.png DESTINATION ${DATA_INSTALL_DIR}/kcm_phonon)
+install(FILES devicepreference.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update)
+
+########### update helper ###############
+kde4_add_executable(phonon_devicepreference_update devicepreference_update.cpp)
+target_link_libraries(phonon_devicepreference_update ${KDE4_KDECORE_LIBS})
+install(TARGETS phonon_devicepreference_update DESTINATION \
                ${LIB_INSTALL_DIR}/kconf_update_bin)
--- trunk/KDE/kdelibs/phonon/kcm/devicepreference.cpp #800830:800831
@@ -413,7 +413,7 @@
             hash.insert(dev.index(), dev);
         }
         for (int i = 0; i <= Phonon::LastCategory; ++i) {
-            const QString configKey(QLatin1String("Category") + QString::number(i));
+            const QString configKey(QLatin1String("Category_") + \
QString::number(i));  if (!outputDeviceGroup.hasKey(configKey)) {
                 m_outputModel[i]->setModelData(list); // use the NoCategory order
                 continue;
@@ -450,7 +450,7 @@
         }
         for (int i = 1; i < captureCategoriesCount; ++i) { // i == 1 to skip \
NoCategory  const Phonon::Category cat = captureCategories[i];
-            const QString configKey(QLatin1String("Category") + \
QString::number(cat)); +            const QString \
configKey(QLatin1String("Category_") + QString::number(cat));  if \
                (!captureDeviceGroup.hasKey(configKey)) {
                 m_captureModel[cat]->setModelData(list); // use the NoCategory order
                 continue;
@@ -490,29 +490,29 @@
     {
         QSettingsGroup globalGroup(&config, QLatin1String("AudioOutputDevice"));
         const QList<int> noCategoryOrder = \
                m_outputModel.value(Phonon::NoCategory)->tupleIndexOrder();
-        globalGroup.setValue(QLatin1String("Category") + \
QString::number(Phonon::NoCategory), noCategoryOrder); +        \
globalGroup.setValue(QLatin1String("Category_") + \
QString::number(Phonon::NoCategory), noCategoryOrder);  for (int i = 0; i <= \
Phonon::LastCategory; ++i) {  Q_ASSERT(m_outputModel.value(i));
             const QList<int> order = m_outputModel.value(i)->tupleIndexOrder();
             if (order == noCategoryOrder) {
-                globalGroup.removeEntry(QLatin1String("Category") + \
QString::number(i)); +                \
globalGroup.removeEntry(QLatin1String("Category_") + QString::number(i));  } else {
-                globalGroup.setValue(QLatin1String("Category") + QString::number(i), \
order); +                globalGroup.setValue(QLatin1String("Category_") + \
QString::number(i), order);  }
         }
     }
     {
         QSettingsGroup globalGroup(&config, QLatin1String("AudioCaptureDevice"));
         const QList<int> noCategoryOrder = \
                m_captureModel.value(Phonon::NoCategory)->tupleIndexOrder();
-        globalGroup.setValue(QLatin1String("Category") + \
QString::number(Phonon::NoCategory), noCategoryOrder); +        \
globalGroup.setValue(QLatin1String("Category_") + \
QString::number(Phonon::NoCategory), noCategoryOrder);  for (int i = 1; i < \
captureCategoriesCount; ++i) {  const Phonon::Category cat = captureCategories[i];
             Q_ASSERT(m_captureModel.value(cat));
             const QList<int> order = m_captureModel.value(cat)->tupleIndexOrder();
             if (order == noCategoryOrder) {
-                globalGroup.removeEntry(QLatin1String("Category") + \
QString::number(cat)); +                \
globalGroup.removeEntry(QLatin1String("Category_") + QString::number(cat));  } else {
-                globalGroup.setValue(QLatin1String("Category") + \
QString::number(cat), order); +                \
globalGroup.setValue(QLatin1String("Category_") + QString::number(cat), order);  }
         }
     }
--- trunk/KDE/kdelibs/phonon/qsettingsgroup_p.h #800830:800831
@@ -24,7 +24,6 @@
 #include <QtCore/QSettings>
 #include <QtCore/QString>
 #include <QtCore/QVariant>
-#include "phonon_export.h"
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


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