From 1b80c9971f34dba39c4e05ac74a649474f4435f9 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 27 Sep 2012 11:33:42 +0200 Subject: [PATCH] Add missing QT_{BEGIN,END}_NAMESPACE Change-Id: I85bbd4f711191c14d6f58f098fced7336c66308f Reviewed-by: Caroline Chao --- src/multimedia/qmediaenumdebug.h | 2 ++ src/multimedia/qtmultimediadefs.h | 2 ++ src/multimediawidgets/qtmultimediawidgetdefs.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/multimedia/qmediaenumdebug.h b/src/multimedia/qmediaenumdebug.h index 77d40116..6b2e54e9 100644 --- a/src/multimedia/qmediaenumdebug.h +++ b/src/multimedia/qmediaenumdebug.h @@ -56,6 +56,7 @@ #include QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) @@ -75,6 +76,7 @@ inline QDebug operator<<(QDebug dbg, Class::Enum value) \ #endif //QT_NO_DEBUG_STREAM +QT_END_NAMESPACE QT_END_HEADER #endif diff --git a/src/multimedia/qtmultimediadefs.h b/src/multimedia/qtmultimediadefs.h index 7def50b5..37560d01 100644 --- a/src/multimedia/qtmultimediadefs.h +++ b/src/multimedia/qtmultimediadefs.h @@ -56,6 +56,7 @@ #include QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) @@ -69,6 +70,7 @@ QT_MODULE(Multimedia) # define Q_MULTIMEDIA_EXPORT #endif +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetdefs.h index a02b579d..ceda5319 100644 --- a/src/multimediawidgets/qtmultimediawidgetdefs.h +++ b/src/multimediawidgets/qtmultimediawidgetdefs.h @@ -56,6 +56,7 @@ #include QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) @@ -69,6 +70,7 @@ QT_MODULE(Multimedia) # define Q_MULTIMEDIAWIDGETS_EXPORT #endif +QT_END_NAMESPACE QT_END_HEADER #endif // QMULTIMEDIAWIDGETS_P_H