diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 15:50:36 +0200 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 15:50:36 +0200 |
commit | d5b4b11348ce270e95aa6e0012af1a161d238ab7 (patch) | |
tree | b76b027a57b87b1e88b8556dfb765899766b8ca1 | |
parent | 7165826d2e9ff77951a289c62746d6c87f725139 (diff) | |
parent | 43b67ba9d500af9de0594d7d2db3e3613dd00f22 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Examples: Fix compilation with namespaces.
-rw-r--r-- | demos/spectrum/app/engine.h | 5 | ||||
-rw-r--r-- | demos/spectrum/app/mainwidget.h | 3 | ||||
-rw-r--r-- | demos/spectrum/app/settingsdialog.h | 2 | ||||
-rw-r--r-- | demos/spectrum/app/spectrograph.h | 2 | ||||
-rw-r--r-- | demos/spectrum/app/spectrumanalyser.h | 3 | ||||
-rw-r--r-- | demos/spectrum/app/tonegenerator.h | 2 | ||||
-rw-r--r-- | demos/spectrum/app/tonegeneratordialog.h | 2 | ||||
-rw-r--r-- | demos/spectrum/app/utils.h | 2 | ||||
-rw-r--r-- | demos/spectrum/app/waveform.h | 2 |
9 files changed, 22 insertions, 1 deletions
diff --git a/demos/spectrum/app/engine.h b/demos/spectrum/app/engine.h index 16088b2e80..93733feaaa 100644 --- a/demos/spectrum/app/engine.h +++ b/demos/spectrum/app/engine.h @@ -61,10 +61,13 @@ #include <QDir> #endif +QT_BEGIN_NAMESPACE class QAudioInput; class QAudioOutput; -class FrequencySpectrum; class QFile; +QT_END_NAMESPACE + +class FrequencySpectrum; /** * This class interfaces with the QtMultimedia audio classes, and also with diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h index 846b97ac5b..c59dbd63fd 100644 --- a/demos/spectrum/app/mainwidget.h +++ b/demos/spectrum/app/mainwidget.h @@ -50,11 +50,14 @@ class Waveform; class LevelMeter; class SettingsDialog; class ToneGeneratorDialog; + +QT_BEGIN_NAMESPACE class QAudioFormat; class QLabel; class QPushButton; class QMenu; class QAction; +QT_END_NAMESPACE /** * Main application widget, responsible for connecting the various UI diff --git a/demos/spectrum/app/settingsdialog.h b/demos/spectrum/app/settingsdialog.h index 7215a50e03..fda518b7a7 100644 --- a/demos/spectrum/app/settingsdialog.h +++ b/demos/spectrum/app/settingsdialog.h @@ -42,11 +42,13 @@ #include <QDialog> #include <QtMultimedia/QAudioDeviceInfo> +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 diff --git a/demos/spectrum/app/spectrograph.h b/demos/spectrum/app/spectrograph.h index 6bfef3304a..a7790ffe8a 100644 --- a/demos/spectrum/app/spectrograph.h +++ b/demos/spectrum/app/spectrograph.h @@ -41,7 +41,9 @@ #include <QWidget> #include "frequencyspectrum.h" +QT_BEGIN_NAMESPACE class QMouseEvent; +QT_END_NAMESPACE /** * Widget which displays a spectrograph showing the frequency spectrum diff --git a/demos/spectrum/app/spectrumanalyser.h b/demos/spectrum/app/spectrumanalyser.h index caeb1c1e95..f10da636d6 100644 --- a/demos/spectrum/app/spectrumanalyser.h +++ b/demos/spectrum/app/spectrumanalyser.h @@ -55,8 +55,11 @@ #include "FFTRealFixLenParam.h" #endif +QT_BEGIN_NAMESPACE class QAudioFormat; class QThread; +QT_END_NAMESPACE + class FFTRealWrapper; class SpectrumAnalyserThreadPrivate; diff --git a/demos/spectrum/app/tonegenerator.h b/demos/spectrum/app/tonegenerator.h index 419f7e413b..d387768748 100644 --- a/demos/spectrum/app/tonegenerator.h +++ b/demos/spectrum/app/tonegenerator.h @@ -41,8 +41,10 @@ #include <QtCore/qglobal.h> #include "spectrum.h" +QT_BEGIN_NAMESPACE class QAudioFormat; class QByteArray; +QT_END_NAMESPACE /** * Generate a sine wave diff --git a/demos/spectrum/app/tonegeneratordialog.h b/demos/spectrum/app/tonegeneratordialog.h index 35d69c2350..d6fcffa55b 100644 --- a/demos/spectrum/app/tonegeneratordialog.h +++ b/demos/spectrum/app/tonegeneratordialog.h @@ -42,10 +42,12 @@ #include <QDialog> #include <QtMultimedia/QAudioDeviceInfo> +QT_BEGIN_NAMESPACE class QCheckBox; class QSlider; class QSpinBox; class QGridLayout; +QT_END_NAMESPACE /** * Dialog which controls the parameters of the tone generator. diff --git a/demos/spectrum/app/utils.h b/demos/spectrum/app/utils.h index 83467cd16c..548f8845e4 100644 --- a/demos/spectrum/app/utils.h +++ b/demos/spectrum/app/utils.h @@ -41,7 +41,9 @@ #include <QtCore/qglobal.h> #include <QDebug> +QT_BEGIN_NAMESPACE class QAudioFormat; +QT_END_NAMESPACE //----------------------------------------------------------------------------- // Miscellaneous utility functions diff --git a/demos/spectrum/app/waveform.h b/demos/spectrum/app/waveform.h index 4de527f1d3..909e5ee9b7 100644 --- a/demos/spectrum/app/waveform.h +++ b/demos/spectrum/app/waveform.h @@ -43,7 +43,9 @@ #include <QPixmap> #include <QScopedPointer> +QT_BEGIN_NAMESPACE class QByteArray; +QT_END_NAMESPACE /** * Widget which displays a section of the audio waveform. |