summaryrefslogtreecommitdiffstats
path: root/src/multimedia/qml/wavedecoder_p.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-24 00:00:19 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-24 00:00:19 (GMT)
commit56fe1454fe08ec7cc258cbbd38486e721d088c99 (patch)
tree597051d1f3b73595f48bcad5a5acb24026c6ba66 /src/multimedia/qml/wavedecoder_p.cpp
parente26db74521e063a1513731eb14581d93a3d77481 (diff)
parentaf4f30abb88d242d1e310914b53bc91b24e45a59 (diff)
downloadQt-56fe1454fe08ec7cc258cbbd38486e721d088c99.zip
Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.gz
Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
Diffstat (limited to 'src/multimedia/qml/wavedecoder_p.cpp')
-rw-r--r--src/multimedia/qml/wavedecoder_p.cpp4
1 files changed, 4 insertions, 0 deletions
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