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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon
From:       Andreas Hartmetz <ahartmetz () gmail ! com>
Date:       2010-09-10 2:40:47
Message-ID: 20100910024047.0BAD8AC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173672 by ahartmetz:

Fix the build.
It *seems* that PhononDeviceAccess clashes with Phonon::DeviceAccess in the
Qt metatype system, most likely because they are typedefs that resolve to the
same thing.
In any case the duplication of Phonon::DeviceAccess vs. PhononDeviceAccess
is unnecessary now that *something* happened that brought Phonon::DeviceAccess
into the scope of the affected source files.
Apologies in advance if something else is broken now.


 M  +4 -7      kded-module/phononserver.cpp  
 M  +2 -5      platform_kde/devicelisting.cpp  
 M  +2 -7      platform_kde/kdeplatformplugin.cpp  


--- trunk/KDE/kdebase/runtime/phonon/kded-module/phononserver.cpp #1173671:1173672
@@ -55,9 +55,6 @@
         )
 K_EXPORT_PLUGIN(PhononServerFactory("phononserver"))
 
-typedef QList<QPair<QByteArray, QString> > PhononDeviceAccessList;
-Q_DECLARE_METATYPE(PhononDeviceAccessList)
-
 PhononServer::PhononServer(QObject *parent, const QList<QVariant> &)
     : KDEDModule(parent),
     m_config(KSharedConfig::openConfig("phonondevicesrc", KConfig::SimpleConfig))
@@ -65,8 +62,8 @@
     findDevices();
     connect(Solid::DeviceNotifier::instance(), SIGNAL(deviceAdded(const QString &)), \
                SLOT(deviceAdded(const QString &)));
     connect(Solid::DeviceNotifier::instance(), SIGNAL(deviceRemoved(const QString \
                &)), SLOT(deviceRemoved(const QString &)));
-    qRegisterMetaType<PhononDeviceAccessList>();
-    qRegisterMetaTypeStreamOperators<PhononDeviceAccessList>("PhononDeviceAccessList");
 +    qRegisterMetaType<Phonon::DeviceAccessList>();
+    qRegisterMetaTypeStreamOperators<Phonon::DeviceAccessList>("Phonon::DeviceAccessList");
  }
 
 PhononServer::~PhononServer()
@@ -691,7 +688,7 @@
         properties.insert("initialPreference", dev.initialPreference());
         properties.insert("isAdvanced", dev.isAdvanced());
         properties.insert("icon", dev.icon());
-        PhononDeviceAccessList deviceAccessList;
+        Phonon::DeviceAccessList deviceAccessList;
         bool first = true;
         QStringList oldDeviceIds;
         PS::AudioDeviceAccess::AudioDriver driverId = \
PS::AudioDeviceAccess::InvalidDriver; @@ -729,7 +726,7 @@
         properties.insert("initialPreference", dev.initialPreference());
         properties.insert("isAdvanced", dev.isAdvanced());
         properties.insert("icon", dev.icon());
-        PhononDeviceAccessList deviceAccessList;
+        Phonon::DeviceAccessList deviceAccessList;
         foreach (const PS::AudioDeviceAccess &access, dev.accessList()) {
             const QByteArray &driver = nameForDriver(access.driver());
             foreach (const QString &deviceId, access.deviceIds()) {
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/devicelisting.cpp #1173671:1173672
@@ -34,9 +34,6 @@
 #include <alsa/asoundlib.h>
 #endif // HAVE_ALSA_ASOUNDLIB_H
 
-typedef QList<QPair<QByteArray, QString> > PhononDeviceAccessList;
-Q_DECLARE_METATYPE(PhononDeviceAccessList)
-
 static void installAlsaPhononDeviceHandle()
 {
 #ifdef HAVE_LIBASOUND2
@@ -114,8 +111,8 @@
             QLatin1String("/modules/phononserver"),
             QLatin1String("org.kde.PhononServer"))
 {
-    qRegisterMetaType<PhononDeviceAccessList>();
-    qRegisterMetaTypeStreamOperators<PhononDeviceAccessList>("PhononDeviceAccessList");
 +    qRegisterMetaType<Phonon::DeviceAccessList>();
+    qRegisterMetaTypeStreamOperators<Phonon::DeviceAccessList>("Phonon::DeviceAccessList");
  
     KSharedConfigPtr config;
     config = KSharedConfig::openConfig("phonon_platform_kde");
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/kdeplatformplugin.cpp \
#1173671:1173672 @@ -41,11 +41,6 @@
 #include <kstandarddirs.h>
 #include "devicelisting.h"
 
-typedef QPair<QByteArray, QString> PhononDeviceAccess;
-typedef QList<PhononDeviceAccess> PhononDeviceAccessList;
-#ifndef KDE_USE_FINAL
-Q_DECLARE_METATYPE(PhononDeviceAccessList)
-#endif
 namespace Phonon
 {
 
@@ -302,9 +297,9 @@
 {
     const QVariant &deviceAccessListVariant = \
deviceDesc.property("deviceAccessList");  if (deviceAccessListVariant.isValid()) {
-        return qvariant_cast<PhononDeviceAccessList>(deviceAccessListVariant);
+        return qvariant_cast<Phonon::DeviceAccessList>(deviceAccessListVariant);
     }
-    PhononDeviceAccessList ret;
+    Phonon::DeviceAccessList ret;
     const QVariant &v = deviceDesc.property("driver");
     if (v.isValid()) {
         const QByteArray &driver = v.toByteArray();


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