From 802176ea8d5d971796aaa7e655dfff8d81813c40 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Fri, 27 Jul 2012 14:41:52 +1000 Subject: [PATCH] Fix a few header style violations. Missing Q_MODULE or using moc keywords. Change-Id: I3cb21799488c6f57c45d8e32862a49fadd083b99 Reviewed-by: Laszlo Papp Reviewed-by: Dmytro Poplavskiy --- src/multimedia/controls/qmediaaudioprobecontrol.h | 2 +- src/multimedia/controls/qmediaavailabilitycontrol.h | 2 +- src/multimedia/controls/qmediavideoprobecontrol.h | 2 +- src/multimedia/qmediaenumdebug.h | 2 ++ src/multimedia/qtmultimediadefs.h | 2 ++ 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 42eccf0..c5e6fda 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 7117d2a..e51a86d 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 ee7667e..fabeeb1 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 931f31e..87be7c8 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 b7cf655..157d279 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 b3e7815..c13529f 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 -- 2.7.4