Multimedia: examples coding style unification

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

examples/audioinput/audioinput.cpp

@@ -42,15 +42,12 @@
 #include <math.h>
 
 #include <QDateTime>
-
 #include <QDebug>
 #include <QPainter>
 #include <QVBoxLayout>
-
-#include <qaudiodeviceinfo.h>
-#include <qaudioinput.h>
-
-#include <QtCore/qendian.h>
+#include <QAudioDeviceInfo>
+#include <QAudioInput>
+#include <qendian.h>
 
 #include "audioinput.h"
 
@@ -331,15 +328,14 @@ void InputTest::notified()
 
 void InputTest::readMore()
 {
-    if(!m_audioInput)
+    if (!m_audioInput)
         return;
     qint64 len = m_audioInput->bytesReady();
-    if(len > BufferSize)
+    if (len > BufferSize)
         len = BufferSize;
     qint64 l = m_input->read(m_buffer.data(), len);
-    if(l > 0) {
+    if (l > 0)
         m_audioInfo->write(m_buffer.constData(), l);
-    }
 }
 
 void InputTest::toggleMode()
@@ -364,7 +360,7 @@ void InputTest::toggleMode()
 void InputTest::toggleSuspend()
 {
     // toggle suspend/resume
-    if(m_audioInput->state() == QAudio::SuspendedState) {
+    if (m_audioInput->state() == QAudio::SuspendedState) {
         qWarning() << "status: Suspended, resume()";
         m_audioInput->resume();
         m_suspendResumeButton->setText(tr(SUSPEND_LABEL));

examples/audioinput/audioinput.h

@@ -41,20 +41,20 @@
 #ifndef AUDIOINPUT_H
 #define AUDIOINPUT_H
 
-#include <QPixmap>
-#include <QWidget>
-#include <QObject>
-#include <QMainWindow>
-#include <QPushButton>
-#include <QComboBox>
+#include <QAudioInput>
 #include <QByteArray>
+#include <QComboBox>
+#include <QMainWindow>
+#include <QObject>
+#include <QPixmap>
+#include <QPushButton>
 #include <QSlider>
-
-#include <qaudioinput.h>
+#include <QWidget>
 
 class AudioInfo : public QIODevice
 {
     Q_OBJECT
+
 public:
     AudioInfo(const QAudioFormat &format, QObject *parent);
     ~AudioInfo();
@@ -94,9 +94,11 @@ private:
     QPixmap m_pixmap;
 };
 
+
 class InputTest : public QMainWindow
 {
     Q_OBJECT
+
 public:
     InputTest();
     ~InputTest();
@@ -133,5 +135,4 @@ private:
     QByteArray m_buffer;
 };
 
-#endif
-
+#endif // AUDIOINPUT_H

examples/audioinput/audioinput.pro

@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = audioinput
 
-QT += multimedia
+QT += multimedia widgets
 
 HEADERS       = audioinput.h
 
@@ -13,5 +13,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
 
 INSTALLS += target sources
-
-QT+=widgets