Usage of new API, cleanups (reduced)

jni/JniCallbacks.h

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * 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
  * 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
@@ skipping 24 matching lines @@
     return javaVM;
   }
 
   jobject GetCallbackObject() const
   {
     return callbackObject->Get();
   }
 
 private:
   JavaVM* javaVM;
-  JniGlobalReference<jobject>::Ptr callbackObject;
-  JniGlobalReference<jclass>::Ptr exceptionLoggerClass;
+  const JniGlobalReference<jobject>::Ptr callbackObject;
+  const JniGlobalReference<jclass>::Ptr exceptionLoggerClass;
 };
 
 class JniEventCallback : public JniCallbackBase
 {
 public:
   JniEventCallback(JNIEnv* env, jobject callbackObject);
   void Callback(AdblockPlus::JsValueList& params);
 };
 
 class JniUpdaterCallback : public JniCallbackBase
 {
 public:
   JniUpdaterCallback(JNIEnv* env, jobject callbackObject);
   void Callback(const std::string& arg);
 };
 
 class JniFilterChangeCallback : public JniCallbackBase
 {
 public:
   JniFilterChangeCallback(JNIEnv* env, jobject callbackObject);
   void Callback(const std::string& arg, const AdblockPlus::JsValuePtr jsValue);
 
 private:
-  JniGlobalReference<jclass>::Ptr jsValueClass;

[Felix Dahlke, 2014/04/16 15:24:25]

You seem to make everything const that can be, so why not this?

[René Jeschke, 2014/04/16 17:51:47]

Done.

+  const JniGlobalReference<jclass>::Ptr jsValueClass;
 };
 
 class JniLogSystemCallback : public JniCallbackBase, public AdblockPlus::LogSystem
 {
 public:
   JniLogSystemCallback(JNIEnv* env, jobject callbackObject);
   void operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message, const std::string& source);
 
 private:
-  JniGlobalReference<jclass>::Ptr logLevelClass;
+  const JniGlobalReference<jclass>::Ptr logLevelClass;
 };
 
 class JniWebRequest : public JniCallbackBase, public AdblockPlus::WebRequest
 {
 public:
   JniWebRequest(JNIEnv* env, jobject callbackObject);
   AdblockPlus::ServerResponse GET(const std::string& url, const AdblockPlus::HeaderList& requestHeaders) const;
 
 private:
   jobject NewTuple(JNIEnv* env, const std::string& a, const std::string& b) const;
 
-  JniGlobalReference<jclass>::Ptr tupleClass;
-  JniGlobalReference<jclass>::Ptr serverResponseClass;
+  const JniGlobalReference<jclass>::Ptr tupleClass;
+  const JniGlobalReference<jclass>::Ptr serverResponseClass;
 };
 
 #endif /* JNICALLBACKS_H */