diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-07-27 14:41:52 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-30 08:05:40 +0200 |
| commit | 802176ea8d5d971796aaa7e655dfff8d81813c40 (patch) | |
| tree | 285e64a5719b37090ac6575c7827dd7d2d118a16 /src | |
| parent | dfb2493aa2a5295e03b8517583f9ff31b64484aa (diff) | |
Fix a few header style violations.
Missing Q_MODULE or using moc keywords.
Change-Id: I3cb21799488c6f57c45d8e32862a49fadd083b99
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/controls/qmediaaudioprobecontrol.h | 2 | ||||
| -rw-r--r-- | src/multimedia/controls/qmediaavailabilitycontrol.h | 2 | ||||
| -rw-r--r-- | src/multimedia/controls/qmediavideoprobecontrol.h | 2 | ||||
| -rw-r--r-- | src/multimedia/qmediaenumdebug.h | 2 | ||||
| -rw-r--r-- | src/multimedia/qtmultimediadefs.h | 2 | ||||
| -rw-r--r-- | src/multimediawidgets/qtmultimediawidgetdefs.h | 2 |
6 files changed, 9 insertions, 3 deletions
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h index 42eccf0b3..c5e6fdaab 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.h +++ b/src/multimedia/controls/qmediaaudioprobecontrol.h @@ -57,7 +57,7 @@ class Q_MULTIMEDIA_EXPORT QMediaAudioProbeControl : public QMediaControl public: virtual ~QMediaAudioProbeControl(); -signals: +Q_SIGNALS: void audioBufferProbed(const QAudioBuffer &buffer); void flush(); diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index 7117d2a2f..e51a86db2 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -64,7 +64,7 @@ public: virtual QtMultimedia::AvailabilityStatus availability() const = 0; -signals: +Q_SIGNALS: void availabilityChanged(QtMultimedia::AvailabilityStatus availability); protected: diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h index ee7667e22..fabeeb15b 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.h +++ b/src/multimedia/controls/qmediavideoprobecontrol.h @@ -59,7 +59,7 @@ class Q_MULTIMEDIA_EXPORT QMediaVideoProbeControl : public QMediaControl public: virtual ~QMediaVideoProbeControl(); -signals: +Q_SIGNALS: void videoFrameProbed(const QVideoFrame &frame); void flush(); diff --git a/src/multimedia/qmediaenumdebug.h b/src/multimedia/qmediaenumdebug.h index 931f31eb4..87be7c806 100644 --- a/src/multimedia/qmediaenumdebug.h +++ b/src/multimedia/qmediaenumdebug.h @@ -57,6 +57,8 @@ QT_BEGIN_HEADER +QT_MODULE(Multimedia) + #ifndef QT_NO_DEBUG_STREAM #define Q_MEDIA_ENUM_DEBUG(Class,Enum) \ diff --git a/src/multimedia/qtmultimediadefs.h b/src/multimedia/qtmultimediadefs.h index b7cf655b3..157d27906 100644 --- a/src/multimedia/qtmultimediadefs.h +++ b/src/multimedia/qtmultimediadefs.h @@ -57,6 +57,8 @@ QT_BEGIN_HEADER +QT_MODULE(Multimedia) + #ifndef QT_STATIC # if defined(QT_BUILD_MULTIMEDIA_LIB) # define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetdefs.h index b3e78153f..c13529fbf 100644 --- a/src/multimediawidgets/qtmultimediawidgetdefs.h +++ b/src/multimediawidgets/qtmultimediawidgetdefs.h @@ -57,6 +57,8 @@ QT_BEGIN_HEADER +QT_MODULE(Multimedia) + #if defined(Q_OS_WIN) # if defined(QT_NODLL) # undef QT_MAKEDLL |