diff options
| -rw-r--r-- | patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch | 119 |
1 files changed, 119 insertions, 0 deletions
diff --git a/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch b/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch new file mode 100644 index 0000000..4000960 --- /dev/null +++ b/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch @@ -0,0 +1,119 @@ +From 8d00beb1ef8b0710366769beb92bedf9331ecb96 Mon Sep 17 00:00:00 2001 +From: axis <qt-info@nokia.com> +Date: Fri, 1 Apr 2011 11:21:36 +0200 +Subject: [PATCH] Switched to more explicit signal/slot definitions (Q_SIGNALS/SLOTS). + +This is required for public headers. +--- + .../3rdparty/phonon/gstreamer/audiodataoutput.h | 2 +- + .../src/3rdparty/phonon/gstreamer/devicemanager.h | 4 ++-- + phonon/src/3rdparty/phonon/mmf/download.h | 4 ++-- + phonon/src/3rdparty/phonon/phonon/pulsesupport.h | 2 +- + phonon/src/3rdparty/phonon/qt7/audiooutput.h | 4 ++-- + phonon/src/3rdparty/phonon/qt7/mediaobject.h | 2 +- + 6 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/phonon/src/3rdparty/phonon/gstreamer/audiodataoutput.h b/phonon/src/3rdparty/phonon/gstreamer/audiodataoutput.h +index cd5ef49..9b868f0 100644 +--- a/phonon/src/3rdparty/phonon/gstreamer/audiodataoutput.h ++++ b/phonon/src/3rdparty/phonon/gstreamer/audiodataoutput.h +@@ -67,7 +67,7 @@ namespace Gstreamer + void mediaNodeEvent(const MediaNodeEvent *event); + + +- signals: ++ Q_SIGNALS: + void dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > &data); + void dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<float> > &data); + void endOfMedia(int remainingSamples); +diff --git a/phonon/src/3rdparty/phonon/gstreamer/devicemanager.h b/phonon/src/3rdparty/phonon/gstreamer/devicemanager.h +index 9c6aa8d..56ed63e 100644 +--- a/phonon/src/3rdparty/phonon/gstreamer/devicemanager.h ++++ b/phonon/src/3rdparty/phonon/gstreamer/devicemanager.h +@@ -60,11 +60,11 @@ public: + GstElement *createAudioSink(Category category = NoCategory); + AbstractRenderer *createVideoRenderer(VideoWidget *parent); + +-signals: ++Q_SIGNALS: + void deviceAdded(int); + void deviceRemoved(int); + +-public slots: ++public Q_SLOTS: + void updateDeviceList(); + + private: +diff --git a/phonon/src/3rdparty/phonon/mmf/download.h b/phonon/src/3rdparty/phonon/mmf/download.h +index 2ce54a8..e2acdb5 100644 +--- a/phonon/src/3rdparty/phonon/mmf/download.h ++++ b/phonon/src/3rdparty/phonon/mmf/download.h +@@ -45,7 +45,7 @@ public: + ~DownloadPrivate(); + bool start(int iap); + void resume(); +-signals: ++Q_SIGNALS: + void error(); + void targetFileNameChanged(); + void lengthChanged(qint64 length); +@@ -80,7 +80,7 @@ public: + Error + }; + +-signals: ++Q_SIGNALS: + void lengthChanged(qint64 length); + void stateChanged(Download::State state); + +diff --git a/phonon/src/3rdparty/phonon/phonon/pulsesupport.h b/phonon/src/3rdparty/phonon/phonon/pulsesupport.h +index c38bece..9907bd3 100644 +--- a/phonon/src/3rdparty/phonon/phonon/pulsesupport.h ++++ b/phonon/src/3rdparty/phonon/phonon/pulsesupport.h +@@ -60,7 +60,7 @@ namespace Phonon + bool setCaptureDevice(QString streamUuid, int device); + void clearStreamCache(QString streamUuid); + +- signals: ++ Q_SIGNALS: + void objectDescriptionChanged(ObjectDescriptionType); + void usingDevice(QString streamUuid, int device); + +diff --git a/phonon/src/3rdparty/phonon/qt7/audiooutput.h b/phonon/src/3rdparty/phonon/qt7/audiooutput.h +index c4a0526..d615434 100644 +--- a/phonon/src/3rdparty/phonon/qt7/audiooutput.h ++++ b/phonon/src/3rdparty/phonon/qt7/audiooutput.h +@@ -44,7 +44,7 @@ namespace QT7 + ComponentDescription getAudioNodeDescription() const; + void initializeAudioUnit(); + +- signals: ++ Q_SIGNALS: + void volumeChanged(qreal newVolume); + void audioDeviceFailed(); + +@@ -69,7 +69,7 @@ namespace QT7 + int outputDevice() const; + bool setOutputDevice(int); + +- signals: ++ Q_SIGNALS: + void volumeChanged(qreal newVolume); + void audioDeviceFailed(); + +diff --git a/phonon/src/3rdparty/phonon/qt7/mediaobject.h b/phonon/src/3rdparty/phonon/qt7/mediaobject.h +index 27949ec..62c885c 100644 +--- a/phonon/src/3rdparty/phonon/qt7/mediaobject.h ++++ b/phonon/src/3rdparty/phonon/qt7/mediaobject.h +@@ -92,7 +92,7 @@ namespace QT7 + + int videoOutputCount(); + +- signals: ++ Q_SIGNALS: + void stateChanged(Phonon::State,Phonon::State); + void tick(qint64); + void seekableChanged(bool); +-- +1.7.3.1.msysgit.0 + |