Issue 1848 - Clean up local reference handling

jni/Utils.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef UTILS_H
 #define UTILS_H
 
 #include <string>
-#include <vector>
 #include <algorithm>
 #include <jni.h>
 #include <stdexcept>
 
 #include <AdblockPlus.h>
 #include <AdblockPlus/tr1_memory.h>
-
-#include "v8/v8stdint.h"
 
 #define PKG(x) "org/adblockplus/libadblockplus/" x
 #define TYP(x) "L" PKG(x) ";"
 
 #define ABP_JNI_VERSION JNI_VERSION_1_6
 
 void JniThrowException(JNIEnv* env, const std::string& message);
 
 void JniThrowException(JNIEnv* env, const std::exception& e);
 
 void JniThrowException(JNIEnv* env);
 
 class JNIEnvAcquire;
 
 /**
  * This class is _NOT_ thread safe!
  */
 template<typename T>
 class JniLocalReference
 {
 public:
-  explicit JniLocalReference(JNIEnv* jniEnv, T object)
-      : m_JNIEnv(jniEnv), m_Object(object)
+  JniLocalReference(JNIEnv* jniEnv, T object)
+      : jniEnv(jniEnv), object(object)
   {
 
   }
 
   JniLocalReference(const JniLocalReference<T>& other);
 
   ~JniLocalReference()
   {
-    m_JNIEnv->DeleteLocalRef(m_Object);
+    jniEnv->DeleteLocalRef(object);
   }
 
   T operator*()
   {
-    return m_Object;
+    return object;
   }
 
   T Get()
   {
-    return m_Object;
+    return object;
   }
 
 private:
-  JNIEnv* m_JNIEnv;
-  T m_Object;
+  JNIEnv* jniEnv;
+  T object;
 };
 
 class JNIEnvAcquire
 {
 public:
   JNIEnvAcquire(JavaVM* javaVM);
   ~JNIEnvAcquire();
 
   JNIEnv* operator*()
   {
@@ skipping 90 matching lines @@
 
 inline jobject NewJniFilter(JNIEnv* env, const AdblockPlus::FilterPtr& filter)
 {
   if (!filter.get())
   {
     return 0;
   }
 
   JniLocalReference<jclass> clazz(env, env->FindClass(PKG("Filter")));
   jmethodID method = env->GetMethodID(*clazz, "<init>", "(J)V");
-  return env->NewObject(*clazz, method, JniPtrToLong(new AdblockPlus::FilterPtr(filter)));
-}
-
-inline jobject NewJniSubscription(JNIEnv* env, const AdblockPlus::SubscriptionPtr& subscription)
+  return env->NewObject(*clazz, method,
+      JniPtrToLong(new AdblockPlus::FilterPtr(filter)));
+}
+
+inline jobject NewJniSubscription(JNIEnv* env,
+    const AdblockPlus::SubscriptionPtr& subscription)
 {
   if (!subscription.get())
   {
     return 0;
   }
 
   JniLocalReference<jclass> clazz(env, env->FindClass(PKG("Subscription")));
   jmethodID method = env->GetMethodID(*clazz, "<init>", "(J)V");
-  return env->NewObject(*clazz, method, JniPtrToLong(new AdblockPlus::SubscriptionPtr(subscription)));
+  return env->NewObject(*clazz, method,
+      JniPtrToLong(new AdblockPlus::SubscriptionPtr(subscription)));
 }
 
 #define CATCH_AND_THROW(jEnv) \
   catch (const std::exception& except) \
   { \
     JniThrowException(jEnv, except); \
   } \
   catch (...) \
   { \
     JniThrowException(jEnv); \
   }
 
 #define CATCH_THROW_AND_RETURN(jEnv, retVal) \
   catch (const std::exception& except) \
   { \
     JniThrowException(jEnv, except); \
     return retVal; \
   } \
   catch (...) \
   { \
     JniThrowException(jEnv); \
     return retVal; \
   }
 
 #endif