diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 08:22:12 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 08:22:12 +0200 |
| commit | fe90bd5d6054c7c41c0a1a70fc3829f8e7ba39e8 (patch) | |
| tree | 1b03e42250173422d698fb88088097b517963dcc | |
| parent | fd8ca93b52061d34d7cdacf22bfca9a45576e090 (diff) | |
| parent | bc1959bf35ff220a292804d6aa8318d159e070eb (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1.0-integration
* '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia:
Add header guards to audio example headers.
| -rw-r--r-- | examples/audiodevices/audiodevices.h | 4 | ||||
| -rw-r--r-- | examples/audioinput/audioinput.h | 5 | ||||
| -rw-r--r-- | examples/audiooutput/audiooutput.h | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/examples/audiodevices/audiodevices.h b/examples/audiodevices/audiodevices.h index 2725debcc6..291b0c8a45 100644 --- a/examples/audiodevices/audiodevices.h +++ b/examples/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/audioinput/audioinput.h b/examples/audioinput/audioinput.h index be721de3d8..bc3d702c12 100644 --- a/examples/audioinput/audioinput.h +++ b/examples/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/audiooutput/audiooutput.h b/examples/audiooutput/audiooutput.h index 05f9c38555..a82a2afa7e 100644 --- a/examples/audiooutput/audiooutput.h +++ b/examples/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 + |