diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 06:43:41 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 06:43:41 (GMT) |
commit | 3db40b0be40c946f547f238ed3f0af813892115e (patch) | |
tree | ced28fa59d5d99e26635776264d7dfef28c395b6 /src/multimedia | |
parent | 127df63bbce367e7e2d77ae9f219feb5a4a2560e (diff) | |
parent | 57cc5c50df4fc3673c948e8a55b4bab991e9cb7f (diff) | |
download | Qt-3db40b0be40c946f547f238ed3f0af813892115e.zip Qt-3db40b0be40c946f547f238ed3f0af813892115e.tar.gz Qt-3db40b0be40c946f547f238ed3f0af813892115e.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
clean up x11 desktop detection
avoid double reallocations in inserting operations
create temporaries more intelligently
do not protect against self-assignment in QList::replace()
make queues to which only lists are appended not blow the memory
optimize queue-like structures
remove more pointless recalculations
Fix compilation with namespace.
Fix compilation with namespace.
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/base/qmediaserviceprovider.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 7 | ||||
-rw-r--r-- | src/multimedia/qml/qsoundeffect.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qml/qsoundeffect_qsound_p.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qml/wavedecoder_p.cpp | 4 |
5 files changed, 15 insertions, 4 deletions
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp index 8d1e0fa..eb97e16 100644 --- a/src/multimedia/base/qmediaserviceprovider.cpp +++ b/src/multimedia/base/qmediaserviceprovider.cpp @@ -48,7 +48,7 @@ #include "qmediapluginloader_p.h" #include <QtMultimedia/qmediaplayer.h> - +QT_BEGIN_NAMESPACE class QMediaServiceProviderHintPrivate : public QSharedData { @@ -594,6 +594,8 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() #endif } +QT_END_NAMESPACE + /*! \class QMediaServiceProviderPlugin \preliminary diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 5f50fdb..0684bd1 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -947,9 +947,10 @@ QStringList QMediaPlayer::supportedMimeTypes(Flags flags) Such playback service can be used for beeps, ringtones, etc. */ -#include "moc_qmediaplayer.cpp" - QT_END_NAMESPACE -QT_END_NAMESPACE +QT_END_HEADER + +#include "moc_qmediaplayer.cpp" + diff --git a/src/multimedia/qml/qsoundeffect.cpp b/src/multimedia/qml/qsoundeffect.cpp index f0c9659..df9af7b 100644 --- a/src/multimedia/qml/qsoundeffect.cpp +++ b/src/multimedia/qml/qsoundeffect.cpp @@ -52,6 +52,7 @@ #include "qsoundeffect_qsound_p.h" #endif +QT_BEGIN_NAMESPACE /*! \qmlclass SoundEffect QSoundEffect @@ -250,3 +251,4 @@ void QSoundEffect::repeat() } } +QT_END_NAMESPACE diff --git a/src/multimedia/qml/qsoundeffect_qsound_p.cpp b/src/multimedia/qml/qsoundeffect_qsound_p.cpp index 33f5bd4..0292d26 100644 --- a/src/multimedia/qml/qsoundeffect_qsound_p.cpp +++ b/src/multimedia/qml/qsoundeffect_qsound_p.cpp @@ -65,6 +65,7 @@ #include "qsoundeffect_qsound_p.h" +QT_BEGIN_NAMESPACE QSoundEffectPrivate::QSoundEffectPrivate(QObject* parent): QObject(parent), @@ -221,3 +222,4 @@ void QSoundEffectPrivate::unloadSample() m_sound = 0; } +QT_END_NAMESPACE diff --git a/src/multimedia/qml/wavedecoder_p.cpp b/src/multimedia/qml/wavedecoder_p.cpp index 5fc5a96..b7d6101 100644 --- a/src/multimedia/qml/wavedecoder_p.cpp +++ b/src/multimedia/qml/wavedecoder_p.cpp @@ -44,6 +44,8 @@ #include <QtCore/qtimer.h> #include <QtCore/qendian.h> +QT_BEGIN_NAMESPACE + WaveDecoder::WaveDecoder(QIODevice *s, QObject *parent): QIODevice(parent), haveFormat(false), @@ -134,3 +136,5 @@ void WaveDecoder::handleData() emit formatKnown(); } } + +QT_END_NAMESPACE |