New JNI bindings

jni/JniFilterChangeCallback.cpp

Index: jni/JniFilterChangeCallback.cpp
diff --git a/jni/JniFilterChangeCallback.cpp b/jni/JniFilterChangeCallback.cpp
index 9e2cb4b18f2ad13afc1761bd9f7cc8f3806615ae..f67629817a8dd4e038a95a2bd1796977d7480f52 100644
--- a/jni/JniFilterChangeCallback.cpp
+++ b/jni/JniFilterChangeCallback.cpp
@@ -17,18 +17,18 @@
 
 #include "JniCallbacks.h"
 
-AdblockPlus::Android::JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env, jobject callbackObject) :
-    JniCallbackBase(env, callbackObject)
+JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env, jobject callbackObject)
+  : JniCallbackBase(env, callbackObject)
 {
 }
 
-AdblockPlus::Android::JniFilterChangeCallback::~JniFilterChangeCallback()
+JniFilterChangeCallback::~JniFilterChangeCallback()
 {
 }
 
-void AdblockPlus::Android::JniFilterChangeCallback::Callback(const std::string& arg, const AdblockPlus::JsValuePtr jsValue)
+void JniFilterChangeCallback::Callback(const std::string& arg, const AdblockPlus::JsValuePtr jsValue)
 {
-  AdblockPlus::Android::JNIEnvAcquire env(GetJavaVM());
+  JNIEnvAcquire env(GetJavaVM());
 
   jclass clazz = env->GetObjectClass(GetCallbackObject());
   jmethodID method = env->GetMethodID(clazz, "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V");
@@ -36,7 +36,7 @@ void AdblockPlus::Android::JniFilterChangeCallback::Callback(const std::string&
   if (method)
   {
     jstring jArg = env->NewStringUTF(arg.c_str());
-    jobject jJsValue = AdblockPlus::Android::NewJniJsValue(*env, jsValue);
+    jobject jJsValue = NewJniJsValue(*env, jsValue);
     env->CallVoidMethod(GetCallbackObject(), method, jArg, jJsValue);
   }
 
@@ -47,20 +47,21 @@ static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
 {
   TRY
   {
-    return AdblockPlus::Android::JniPtr2Long(new AdblockPlus::Android::JniFilterChangeCallback(env, callbackObject));
+    return JniPtrToLong(new JniFilterChangeCallback(env, callbackObject));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  delete AdblockPlus::Android::JniLong2TypePtr<AdblockPlus::Android::JniFilterChangeCallback>(ptr);
+  delete JniLongToTypePtr<JniFilterChangeCallback>(ptr);
 }
 
 static JNINativeMethod methods[] =
 {
-{ (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
-{ (char*)"dtor", (char*)"(J)V", (void*)JniDtor }, };
+  { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
+  { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
+};
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_FilterChangeCallback_registerNatives(JNIEnv *env, jclass clazz)
 {