Android: Fix namespace usage.

Make it possible to build multimedia with a Qt namespace

Change-Id: Ibaeaf7edb38f8d784b8d0fcb9a26ca712488c23b
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

5 files changed, 12 insertions, 6 deletions

diff --git a/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h b/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h
index 23e397d4d..7dcc884a9 100644
--- a/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h
@@ -69,4 +69,6 @@ private:
     QList<QSize> m_supportedResolutions;
 };
 
+QT_END_NAMESPACE
+
 #endif // QANDROIDIMAGEENCODERCONTROL_H
diff --git a/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.cpp b/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.cpp
index a4ebc8fe4..8e0cf6d16 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.cpp
@@ -43,6 +43,8 @@
 #include "qandroidmediavideoprobecontrol.h"
 #include <qvideoframe.h>
 
+QT_BEGIN_NAMESPACE
+
 QAndroidMediaVideoProbeControl::QAndroidMediaVideoProbeControl(QObject *parent) :
     QMediaVideoProbeControl(parent)
 {
@@ -57,3 +59,5 @@ void QAndroidMediaVideoProbeControl::newFrameProbed(const QVideoFrame &frame)
 {
     emit videoFrameProbed(frame);
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.h b/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.h
index 7bb34d883..0a0007c9f 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.h
@@ -45,6 +45,8 @@
 
 #include <qmediavideoprobecontrol.h>
 
+QT_BEGIN_NAMESPACE
+
 class QAndroidMediaVideoProbeControl : public QMediaVideoProbeControl
 {
     Q_OBJECT
@@ -56,4 +58,6 @@ public:
 
 };
 
+QT_END_NAMESPACE
+
 #endif // QANDROIDMEDIAVIDEOPROBECONTROL_H
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp
index 0af43210f..6c1515308 100644
--- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp
+++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp
@@ -147,9 +147,11 @@ int QAndroidMediaServicePlugin::cameraOrientation(const QByteArray &device) cons
     return QAndroidCameraInfoControl::orientation(device);
 }
 
+QT_END_NAMESPACE
 
 Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
 {
+    QT_USE_NAMESPACE
     typedef union {
         JNIEnv *nativeEnvironment;
         void *venv;
@@ -173,5 +175,3 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
 
     return JNI_VERSION_1_4;
 }
-
-QT_END_NAMESPACE
diff --git a/src/plugins/android/src/wrappers/jmediaplayer.cpp b/src/plugins/android/src/wrappers/jmediaplayer.cpp
index de86cd041..98ccbfd5a 100644
--- a/src/plugins/android/src/wrappers/jmediaplayer.cpp
+++ b/src/plugins/android/src/wrappers/jmediaplayer.cpp
@@ -155,8 +155,6 @@ void JMediaPlayer::setDisplay(jobject surfaceHolder)
     mMediaPlayer.callMethod<void>("setDisplay", "(Landroid/view/SurfaceHolder;)V", surfaceHolder);
 }
 
-QT_END_NAMESPACE
-
 static void onErrorNative(JNIEnv *env, jobject thiz, jint what, jint extra, jlong id)
 {
     Q_UNUSED(env);
@@ -238,8 +236,6 @@ static void onVideoSizeChangedNative(JNIEnv *env,
     Q_EMIT mp->videoSizeChanged(width, height);
 }
 
-QT_BEGIN_NAMESPACE
-
 bool JMediaPlayer::initJNI(JNIEnv *env)
 {
     jclass jClass = env->FindClass("org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer");