From 8a047ef087cebba5953ad3ed7b2d99df7966b695 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20Str=C3=B8mme?= Date: Mon, 7 Apr 2014 15:13:42 +0200 Subject: [PATCH] Android: Use Q_GLOBAL_STATIC instead of a static QMap Change-Id: I7b65e0874051c4ef504914a0bd66e8471ec34fa7 Reviewed-by: Yoann Lopes --- src/plugins/android/src/wrappers/jmediarecorder.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/src/wrappers/jmediarecorder.cpp b/src/plugins/android/src/wrappers/jmediarecorder.cpp index 81d5c11..0b1498d 100644 --- a/src/plugins/android/src/wrappers/jmediarecorder.cpp +++ b/src/plugins/android/src/wrappers/jmediarecorder.cpp @@ -48,18 +48,19 @@ QT_BEGIN_NAMESPACE static jclass g_qtMediaRecorderListenerClass = 0; -static QMap g_objectMap; +typedef QMap MediaRecorderMap; +Q_GLOBAL_STATIC(MediaRecorderMap, mediaRecorders) static void notifyError(JNIEnv* , jobject, jlong id, jint what, jint extra) { - JMediaRecorder *obj = g_objectMap.value(id, 0); + JMediaRecorder *obj = mediaRecorders->value(id, 0); if (obj) emit obj->error(what, extra); } static void notifyInfo(JNIEnv* , jobject, jlong id, jint what, jint extra) { - JMediaRecorder *obj = g_objectMap.value(id, 0); + JMediaRecorder *obj = mediaRecorders->value(id, 0); if (obj) emit obj->info(what, extra); } @@ -77,13 +78,13 @@ JMediaRecorder::JMediaRecorder() m_mediaRecorder.callMethod("setOnInfoListener", "(Landroid/media/MediaRecorder$OnInfoListener;)V", listener.object()); - g_objectMap.insert(m_id, this); + mediaRecorders->insert(m_id, this); } } JMediaRecorder::~JMediaRecorder() { - g_objectMap.remove(m_id); + mediaRecorders->remove(m_id); } void JMediaRecorder::release() -- 2.7.4