diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-09-26 17:07:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-27 00:05:52 +0200 |
| commit | a24b8d3a61b1c8baa2f94457e7b842413b1b792c (patch) | |
| tree | 6917832914fb7f18fd68c4c52ad7121b78d456d3 /src | |
| parent | 136adad6522f96505830bbbb2cc55bcf8a632460 (diff) | |
Fix a few QT_BEGIN/END_HEADER pairs.
Change-Id: Ie723af34680222b939aeb0179df21d63cec3cf3b
Reviewed-on: http://codereview.qt-project.org/5514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimediakit/qmediaenumdebug.h | 3 | ||||
| -rw-r--r-- | src/multimediakit/qmediaplayer.h | 2 | ||||
| -rw-r--r-- | src/multimediakit/qtmultimediakitdefs.h | 5 | ||||
| -rw-r--r-- | src/multimediakitwidgets/qtmultimediakitwidgetdefs.h | 4 |
4 files changed, 12 insertions, 2 deletions
diff --git a/src/multimediakit/qmediaenumdebug.h b/src/multimediakit/qmediaenumdebug.h index 5110a1816..3fa7ee820 100644 --- a/src/multimediakit/qmediaenumdebug.h +++ b/src/multimediakit/qmediaenumdebug.h @@ -55,6 +55,8 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> +QT_BEGIN_HEADER + #ifndef QT_NO_DEBUG_STREAM #define Q_MEDIA_ENUM_DEBUG(Class,Enum) \ @@ -71,6 +73,7 @@ inline QDebug operator<<(QDebug dbg, Class::Enum value) \ #endif //QT_NO_DEBUG_STREAM +QT_END_HEADER #endif diff --git a/src/multimediakit/qmediaplayer.h b/src/multimediakit/qmediaplayer.h index af096147f..6bd318483 100644 --- a/src/multimediakit/qmediaplayer.h +++ b/src/multimediakit/qmediaplayer.h @@ -52,8 +52,6 @@ QT_BEGIN_HEADER -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) diff --git a/src/multimediakit/qtmultimediakitdefs.h b/src/multimediakit/qtmultimediakitdefs.h index 5ddc3e91c..c7ba7101d 100644 --- a/src/multimediakit/qtmultimediakitdefs.h +++ b/src/multimediakit/qtmultimediakitdefs.h @@ -55,6 +55,8 @@ #include <QtCore/qglobal.h> +QT_BEGIN_HEADER + #if defined(Q_OS_WIN) # if defined(QT_NODLL) # undef QT_MAKEDLL @@ -81,5 +83,8 @@ # endif #endif +QT_END_HEADER + + #endif // QMULTIMEDIAKIT_P_H diff --git a/src/multimediakitwidgets/qtmultimediakitwidgetdefs.h b/src/multimediakitwidgets/qtmultimediakitwidgetdefs.h index c9d3202a8..6001629c6 100644 --- a/src/multimediakitwidgets/qtmultimediakitwidgetdefs.h +++ b/src/multimediakitwidgets/qtmultimediakitwidgetdefs.h @@ -55,6 +55,8 @@ #include <QtCore/qglobal.h> +QT_BEGIN_HEADER + #if defined(Q_OS_WIN) # if defined(QT_NODLL) # undef QT_MAKEDLL @@ -81,5 +83,7 @@ # endif #endif +QT_END_HEADER + #endif // QMULTIMEDIAKITWIDGETS_P_H |