Multimedia: examples coding style unification

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

2 files changed, 16 insertions, 18 deletions

diff --git a/examples/audiodevices/audiodevices.cpp b/examples/audiodevices/audiodevices.cpp
index a765d2e04..2892e981f 100644
--- a/examples/audiodevices/audiodevices.cpp
+++ b/examples/audiodevices/audiodevices.cpp
@@ -38,14 +38,11 @@
 **
 ****************************************************************************/
 
-
-#include <qaudiodeviceinfo.h>
-
 #include "audiodevices.h"
 
 // Utility functions for converting QAudioFormat fields into text
 
-QString toString(QAudioFormat::SampleType sampleType)
+static QString toString(QAudioFormat::SampleType sampleType)
 {
     QString result("Unknown");
     switch (sampleType) {
@@ -64,7 +61,7 @@ QString toString(QAudioFormat::SampleType sampleType)
     return result;
 }
 
-QString toString(QAudioFormat::Endian endian)
+static QString toString(QAudioFormat::Endian endian)
 {
     QString result("Unknown");
     switch (endian) {
@@ -79,8 +76,8 @@ QString toString(QAudioFormat::Endian endian)
 }
 
 
-AudioDevicesBase::AudioDevicesBase(QWidget *parent, Qt::WindowFlags f)
-    : QMainWindow(parent, f)
+AudioDevicesBase::AudioDevicesBase(QWidget *parent)
+    : QMainWindow(parent)
 {
     setupUi(this);
 }
@@ -88,8 +85,8 @@ AudioDevicesBase::AudioDevicesBase(QWidget *parent, Qt::WindowFlags f)
 AudioDevicesBase::~AudioDevicesBase() {}
 
 
-AudioTest::AudioTest(QWidget *parent, Qt::WindowFlags f)
-    : AudioDevicesBase(parent, f)
+AudioTest::AudioTest(QWidget *parent)
+    : AudioDevicesBase(parent)
 {
     mode = QAudio::AudioOutput;
 
@@ -186,11 +183,11 @@ void AudioTest::deviceChanged(int idx)
         settings.setChannelCount(chz.at(0));
 
     codecsBox->clear();
-    QStringList codecz = deviceInfo.supportedCodecs();
-    for (int i = 0; i < codecz.size(); ++i)
-        codecsBox->addItem(QString("%1").arg(codecz.at(i)));
-    if (codecz.size())
-        settings.setCodec(codecz.at(0));
+    QStringList codecs = deviceInfo.supportedCodecs();
+    for (int i = 0; i < codecs.size(); ++i)
+        codecsBox->addItem(QString("%1").arg(codecs.at(i)));
+    if (codecs.size())
+        settings.setCodec(codecs.at(0));
     // Add false to create failed condition!
     codecsBox->addItem("audio/test");
 
diff --git a/examples/audiodevices/audiodevices.h b/examples/audiodevices/audiodevices.h
index fd359c00f..d1a1cd2cd 100644
--- a/examples/audiodevices/audiodevices.h
+++ b/examples/audiodevices/audiodevices.h
@@ -41,24 +41,25 @@
 #ifndef AUDIODEVICES_H
 #define AUDIODEVICES_H
 
-#include <QObject>
+#include <QAudioDeviceInfo>
 #include <QMainWindow>
-#include <qaudiodeviceinfo.h>
+#include <QObject>
 
 #include "ui_audiodevicesbase.h"
 
 class AudioDevicesBase : public QMainWindow, public Ui::AudioDevicesBase
 {
 public:
-    AudioDevicesBase(QWidget *parent = 0, Qt::WindowFlags f = 0);
+    AudioDevicesBase(QWidget *parent = 0);
     virtual ~AudioDevicesBase();
 };
 
 class AudioTest : public AudioDevicesBase
 {
     Q_OBJECT
+
 public:
-    AudioTest(QWidget *parent = 0, Qt::WindowFlags f = 0);
+    AudioTest(QWidget *parent = 0);
     virtual ~AudioTest();
 
     QAudioDeviceInfo deviceInfo;