diff options
Diffstat (limited to 'src')
6 files changed, 36 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp b/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp index 30dabdf..802cb18 100644 --- a/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp +++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp @@ -29,6 +29,9 @@ #include <QtCore/QMap> #include <phonon/audiooutput.h> +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + namespace Phonon { namespace Gstreamer @@ -138,6 +141,9 @@ void AudioDataOutput::mediaNodeEvent(const MediaNodeEvent *event) }} //namespace Phonon::Gstreamer +QT_END_NAMESPACE +QT_END_HEADER + #include "moc_audiodataoutput.cpp" // vim: sw=4 ts=4 diff --git a/src/3rdparty/phonon/gstreamer/audiodataoutput.h b/src/3rdparty/phonon/gstreamer/audiodataoutput.h index 5e30a1d..cd5ef49 100644 --- a/src/3rdparty/phonon/gstreamer/audiodataoutput.h +++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.h @@ -29,6 +29,9 @@ #include <phonon/audiodataoutput.h> #include <phonon/audiodataoutputinterface.h> +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + namespace Phonon { namespace Gstreamer @@ -80,5 +83,8 @@ namespace Gstreamer }; }} //namespace Phonon::Gstreamer +QT_END_NAMESPACE +QT_END_HEADER + // vim: sw=4 ts=4 tw=80 #endif // Phonon_FAKE_AUDIODATAOUTPUT_H diff --git a/src/3rdparty/phonon/phonon/audiodataoutput.cpp b/src/3rdparty/phonon/phonon/audiodataoutput.cpp index 3a7d3a1..fa8ec0d 100644 --- a/src/3rdparty/phonon/phonon/audiodataoutput.cpp +++ b/src/3rdparty/phonon/phonon/audiodataoutput.cpp @@ -26,6 +26,9 @@ #define PHONON_CLASSNAME AudioDataOutput +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + namespace Phonon { @@ -62,5 +65,8 @@ void AudioDataOutputPrivate::setupBackendObject() } // namespace Phonon +QT_END_NAMESPACE +QT_END_HEADER + #undef PHONON_CLASSNAME // vim: sw=4 ts=4 tw=80 diff --git a/src/3rdparty/phonon/phonon/audiodataoutput.h b/src/3rdparty/phonon/phonon/audiodataoutput.h index 8e8f8e0..7a559b3 100644 --- a/src/3rdparty/phonon/phonon/audiodataoutput.h +++ b/src/3rdparty/phonon/phonon/audiodataoutput.h @@ -26,6 +26,9 @@ #include "abstractaudiooutput.h" #include "phonondefs.h" +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + #ifndef DOXYGEN_SHOULD_SKIP_THIS template<typename T> class QVector; template<typename Key, typename T> class QMap; @@ -125,5 +128,8 @@ namespace Phonon }; } // namespace Phonon +QT_END_NAMESPACE +QT_END_HEADER + // vim: sw=4 ts=4 tw=80 #endif // Phonon_AUDIODATAOUTPUT_H diff --git a/src/3rdparty/phonon/phonon/audiodataoutput_p.h b/src/3rdparty/phonon/phonon/audiodataoutput_p.h index 91103a9..5fd4f80 100644 --- a/src/3rdparty/phonon/phonon/audiodataoutput_p.h +++ b/src/3rdparty/phonon/phonon/audiodataoutput_p.h @@ -26,6 +26,9 @@ #include "audiodataoutput.h" #include "abstractaudiooutput_p.h" +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + namespace Phonon { @@ -44,5 +47,8 @@ class AudioDataOutputPrivate : public AbstractAudioOutputPrivate } // namespace Phonon +QT_END_NAMESPACE +QT_END_HEADER + #endif // AUDIODATAOUTPUT_P_H // vim: sw=4 ts=4 tw=80 diff --git a/src/3rdparty/phonon/phonon/audiodataoutputinterface.h b/src/3rdparty/phonon/phonon/audiodataoutputinterface.h index bc1aad0..08bc7fc 100644 --- a/src/3rdparty/phonon/phonon/audiodataoutputinterface.h +++ b/src/3rdparty/phonon/phonon/audiodataoutputinterface.h @@ -23,6 +23,9 @@ #ifndef PHONON_AUDIODATAOUTPUTINTERFACE_H #define PHONON_AUDIODATAOUTPUTINTERFACE_H +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + namespace Phonon { @@ -41,4 +44,7 @@ class AudioDataOutputInterface Q_DECLARE_INTERFACE(Phonon::AudioDataOutputInterface, "0AudioDataOutputInterface.phonon.kde.org") +QT_END_NAMESPACE +QT_END_HEADER + #endif // PHONON_AUDIODATAOUTPUTINTERFACE_H |