Multimedia: examples coding style unification

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

1 files changed, 17 insertions, 15 deletions

diff --git a/examples/spectrum/app/settingsdialog.h b/examples/spectrum/app/settingsdialog.h
index 1d262d981..0ce114dc9 100644
--- a/examples/spectrum/app/settingsdialog.h
+++ b/examples/spectrum/app/settingsdialog.h
@@ -43,29 +43,33 @@
 
 #include "spectrum.h"
 #include <QDialog>
-#include <QtMultimedia/QAudioDeviceInfo>
+#include <QAudioDeviceInfo>
 
-QT_FORWARD_DECLARE_CLASS(QComboBox)
-QT_FORWARD_DECLARE_CLASS(QCheckBox)
-QT_FORWARD_DECLARE_CLASS(QSlider)
-QT_FORWARD_DECLARE_CLASS(QSpinBox)
-QT_FORWARD_DECLARE_CLASS(QGridLayout)
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QCheckBox;
+class QSlider;
+class QSpinBox;
+class QGridLayout;
+QT_END_NAMESPACE
 
 /**
  * Dialog used to control settings such as the audio input / output device
  * and the windowing function.
  */
-class SettingsDialog : public QDialog {
+class SettingsDialog : public QDialog
+{
     Q_OBJECT
+
 public:
     SettingsDialog(const QList<QAudioDeviceInfo> &availableInputDevices,
                    const QList<QAudioDeviceInfo> &availableOutputDevices,
                    QWidget *parent = 0);
     ~SettingsDialog();
 
-    WindowFunction windowFunction() const           { return m_windowFunction; }
-    const QAudioDeviceInfo& inputDevice() const     { return m_inputDevice; }
-    const QAudioDeviceInfo& outputDevice() const    { return m_outputDevice; }
+    WindowFunction windowFunction() const { return m_windowFunction; }
+    const QAudioDeviceInfo &inputDevice() const { return m_inputDevice; }
+    const QAudioDeviceInfo &outputDevice() const { return m_outputDevice; }
 
 private slots:
     void windowFunctionChanged(int index);
@@ -77,11 +81,9 @@ private:
     QAudioDeviceInfo m_inputDevice;
     QAudioDeviceInfo m_outputDevice;
 
-    QComboBox*      m_inputDeviceComboBox;
-    QComboBox*      m_outputDeviceComboBox;
-
-    QComboBox*      m_windowFunctionComboBox;
-
+    QComboBox *m_inputDeviceComboBox;
+    QComboBox *m_outputDeviceComboBox;
+    QComboBox *m_windowFunctionComboBox;
 };
 
 #endif // SETTINGSDIALOG_H