New JNI bindings

jni/Utils.cpp

Index: jni/Utils.cpp
diff --git a/jni/Utils.cpp b/jni/Utils.cpp
index c148c9527b4e0be7ce237daba83a30e2b4a85022..4eea2bec4d2f4384a5f4a6e3faad22b8468dbac2 100644
--- a/jni/Utils.cpp
+++ b/jni/Utils.cpp
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 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
@@ -39,7 +39,7 @@ const std::string GetString(JNIEnv *pEnv, jstring str)
   return value;
 }
 
-std::string AdblockPlus::Android::JniJava2StdString(JNIEnv* env, jstring str)
+std::string JniJava2StdString(JNIEnv* env, jstring str)
 {
   if (!str)
   {
@@ -53,31 +53,31 @@ std::string AdblockPlus::Android::JniJava2StdString(JNIEnv* env, jstring str)
   return ret;
 }
 
-jobject AdblockPlus::Android::NewJniArrayList(JNIEnv* env)
+jobject NewJniArrayList(JNIEnv* env)
 {
   jclass clazz = env->FindClass("java/util/ArrayList");
   jmethodID ctor = env->GetMethodID(clazz, "<init>", "()V");
   return env->NewObject(clazz, ctor);
 }
 
-void AdblockPlus::Android::JniAddObjectToList(JNIEnv* env, jobject list, jobject value)
+void JniAddObjectToList(JNIEnv* env, jobject list, jobject value)
 {
   jmethodID add = env->GetMethodID(env->GetObjectClass(list), "add", "(Ljava/lang/Object;)Z");
   env->CallBooleanMethod(list, add, value);
 }
 
-void AdblockPlus::Android::JniThrowException(JNIEnv* env, const std::string& message)
+void JniThrowException(JNIEnv* env, const std::string& message)
 {
   jclass clazz = env->FindClass(PKG("AdblockPlusException"));
   env->ThrowNew(clazz, message.c_str());
 }
 
-void AdblockPlus::Android::JniThrowException(JNIEnv* env, const std::exception& e)
+void JniThrowException(JNIEnv* env, const std::exception& e)
 {
   JniThrowException(env, e.what());
 }
 
-void AdblockPlus::Android::JniThrowException(JNIEnv* env)
+void JniThrowException(JNIEnv* env)
 {
   JniThrowException(env, "Unknown exception from libAdblockPlus");
 }