diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-11 04:10:41 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-11 04:10:41 +0200 |
| commit | b892a9a83181baabc755919b86feaed83677384e (patch) | |
| tree | 9d555823a17be462b4bc51d8b8fa05a6d3662fd5 | |
| parent | f4a7f53b3ccf72e336c598286422b18ca960cf57 (diff) | |
| parent | 75152fecdcfef4a5eaad4e2bd914710aafcf1e9a (diff) | |
| download | qt4-tools-b892a9a83181baabc755919b86feaed83677384e.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Add header guards to audio example headers.
| -rw-r--r-- | examples/multimedia/audiodevices/audiodevices.h | 4 | ||||
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.h | 5 | ||||
| -rw-r--r-- | examples/multimedia/audiooutput/audiooutput.h | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h index b5b52047f5..d448a41858 100644 --- a/examples/multimedia/audiodevices/audiodevices.h +++ b/examples/multimedia/audiodevices/audiodevices.h @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#ifndef AUDIODEVICES_H +#define AUDIODEVICES_H #include <QObject> #include <QMainWindow> @@ -78,3 +80,5 @@ private slots: }; +#endif + diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h index be721de3d8..bc3d702c12 100644 --- a/examples/multimedia/audioinput/audioinput.h +++ b/examples/multimedia/audioinput/audioinput.h @@ -39,6 +39,9 @@ ** ****************************************************************************/ +#ifndef AUDIOINPUT_H +#define AUDIOINPUT_H + #include <QPixmap> #include <QWidget> #include <QObject> @@ -133,3 +136,5 @@ private: static const QString ResumeLabel; }; +#endif + diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h index 889482b0c1..bfcbf62aaf 100644 --- a/examples/multimedia/audiooutput/audiooutput.h +++ b/examples/multimedia/audiooutput/audiooutput.h @@ -39,6 +39,9 @@ ** ****************************************************************************/ +#ifndef AUDIOOUTPUT_H +#define AUDIOOUTPUT_H + #include <math.h> #include <QObject> @@ -116,3 +119,5 @@ private slots: void deviceChanged(int index); }; +#endif + |