Multimedia: examples coding style unification

Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce
Reviewed-by: David Schulz <david.schulz@digia.com>

examples/audiodecoder/audiodecoder.cpp

@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "audiodecoder.h"
-#include <iostream>
+#include <stdio.h>
 
 AudioDecoder::AudioDecoder(bool isPlayback, bool isDelete)
     : m_cout(stdout, QIODevice::WriteOnly)

examples/audiodecoder/audiodecoder.h

@@ -41,16 +41,16 @@
 #ifndef AUDIODECODER_H
 #define AUDIODECODER_H
 
-#include <qaudiodecoder.h>
 #include "wavefilewriter.h"
+
+#include <QAudioDecoder>
 #include <QSoundEffect>
 #include <QTextStream>
 
-QT_USE_NAMESPACE
-
 class AudioDecoder : public QObject
 {
     Q_OBJECT
+
 public:
     AudioDecoder(bool isPlayback, bool isDelete);
     ~AudioDecoder() { }
@@ -61,7 +61,7 @@ public:
 
     void setTargetFilename(const QString &fileName);
 
-Q_SIGNALS:
+signals:
     void done();
 
 public slots:

examples/audiodecoder/main.cpp

@@ -38,14 +38,15 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QCoreApplication>
-#include <QTextStream>
-#include <iostream>
-
-#include <qfileinfo.h>
-#include <qdir.h>
 #include "audiodecoder.h"
 
+#include <QCoreApplication>
+#include <QDir>
+#include <QFileInfo>
+#include <QTextStream>
+
+#include <stdio.h>
+
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
@@ -90,4 +91,4 @@ int main(int argc, char *argv[])
     decoder.start();
 
     return app.exec();
-};
+}

examples/audiodecoder/wavefilewriter.cpp

@@ -107,12 +107,12 @@ bool WaveFileWriter::open(const QString& fileName, const QAudioFormat& format)
     return true;
 }
 
-bool WaveFileWriter::write(const QAudioBuffer& buffer)
+bool WaveFileWriter::write(const QAudioBuffer &buffer)
 {
     if (buffer.format() != m_format)
         return false; // buffer format has changed
 
-    qint64 written = file.write((const char*)buffer.constData(), buffer.byteCount());
+    qint64 written = file.write((const char *)buffer.constData(), buffer.byteCount());
     m_dataLength += written;
     return written == buffer.byteCount();
 }
@@ -130,7 +130,7 @@ bool WaveFileWriter::close()
     return result;
 }
 
-bool WaveFileWriter::writeHeader(const QAudioFormat& format)
+bool WaveFileWriter::writeHeader(const QAudioFormat &format)
 {
     // check if format is supported
     if (format.byteOrder() == QAudioFormat::BigEndian || format.sampleType() != QAudioFormat::SignedInt)

examples/audiodecoder/wavefilewriter.h

@@ -41,24 +41,25 @@
 #ifndef WAVEFILEWRITER_H
 #define WAVEFILEWRITER_H
 
+#include <QAudioBuffer>
+#include <QFile>
 #include <QObject>
-#include <qfile.h>
-#include <qaudiobuffer.h>
 
 class WaveFileWriter : public QObject
 {
     Q_OBJECT
+
 public:
     explicit WaveFileWriter(QObject *parent = 0);
     ~WaveFileWriter();
 
-    bool open(const QString& fileName, const QAudioFormat& format);
-    bool write(const QAudioBuffer& buffer);
+    bool open(const QString &fileName, const QAudioFormat &format);
+    bool write(const QAudioBuffer &buffer);
     bool close();
     bool isOpen() const { return file.isOpen(); }
 
 private:
-    bool writeHeader(const QAudioFormat& format);
+    bool writeHeader(const QAudioFormat &format);
     bool writeDataLength();
 
     QFile file;