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

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

SVN commit 799760 by mkretz:

Qt signals and slots and namespaces don't like each other

 M  +6 -0      devicelisting.cpp  
 M  +5 -3      devicelisting.h  
 M  +2 -2      kdepluginfactory.cpp  
 M  +3 -3      kdepluginfactory.h  


--- trunk/KDE/kdelibs/phonon/platform_kde/devicelisting.cpp #799759:799760
@@ -29,6 +29,9 @@
 #include <klocale.h>
 #include <ksharedconfig.h>
 
+namespace Phonon
+{
+
 QList<int> DeviceListing::objectDescriptionIndexes(Phonon::ObjectDescriptionType \
type)  {
     switch (type) {
@@ -196,6 +199,7 @@
 {
     if (e->timerId() == m_signalTimer.timerId()) {
         m_signalTimer.stop();
+        kDebug(600) << "emitting objectDescriptionChanged for AudioOutputDeviceType \
and AudioCaptureDeviceType";  emit \
objectDescriptionChanged(Phonon::AudioOutputDeviceType);  emit \
objectDescriptionChanged(Phonon::AudioCaptureDeviceType);  }
@@ -266,3 +270,5 @@
         m_signalTimer.start(0, this);
     }
 }
+
+} // namespace Phonon
--- trunk/KDE/kdelibs/phonon/platform_kde/devicelisting.h #799759:799760
@@ -33,9 +33,9 @@
 
 namespace Phonon
 {
-    class AudioDevice;
-} // namespace Phonon
 
+class AudioDevice;
+
 class DeviceListing : public QObject
 {
     Q_OBJECT
@@ -50,7 +50,7 @@
         Q_SCRIPTABLE void ossSettingChanged(bool useOss);
 
     signals:
-        void objectDescriptionChanged(Phonon::ObjectDescriptionType);
+        void objectDescriptionChanged(ObjectDescriptionType);
 
     protected:
         void timerEvent(QTimerEvent *e);
@@ -70,4 +70,6 @@
         bool m_useOss : 1;
 };
 
+} // namespace Phonon
+
 #endif // DEVICELISTING_H
--- trunk/KDE/kdelibs/phonon/platform_kde/kdepluginfactory.cpp #799759:799760
@@ -264,8 +264,8 @@
 {
     if (!m_devList) {
         m_devList = new DeviceListing;
-        connect(m_devList, \
                SIGNAL(objectDescriptionChanged(Phonon::ObjectDescriptionType)),
-                SIGNAL(objectDescriptionChanged(Phonon::ObjectDescriptionType)));
+        connect(m_devList, SIGNAL(objectDescriptionChanged(ObjectDescriptionType)),
+                SIGNAL(objectDescriptionChanged(ObjectDescriptionType)));
     }
 }
 
--- trunk/KDE/kdelibs/phonon/platform_kde/kdepluginfactory.h #799759:799760
@@ -24,11 +24,11 @@
 #include <QtCore/QObject>
 #include <kservice.h>
 
-class DeviceListing;
-
 namespace Phonon
 {
 
+class DeviceListing;
+
 class KdePlatformPlugin : public QObject, public PlatformPlugin
 {
     Q_INTERFACES(Phonon::PlatformPlugin)
@@ -54,7 +54,7 @@
         virtual QHash<QByteArray, QVariant> \
objectDescriptionProperties(ObjectDescriptionType type, int index) const;  
     signals:
-        void objectDescriptionChanged(Phonon::ObjectDescriptionType);
+        void objectDescriptionChanged(ObjectDescriptionType);
 
     private:
         QObject *createBackend(KService::Ptr newService);


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