Issue 5013 - Use const JsValue and pass reference where applicable

src/FileSystemJsObject.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 15 matching lines @@
 #include "Thread.h"
 #include "Utils.h"
 
 using namespace AdblockPlus;
 
 namespace
 {
   class IoThread : public Thread
   {
   public:
-    IoThread(JsEnginePtr jsEngine, JsValuePtr callback)
+    IoThread(const JsEnginePtr& jsEngine, const JsConstValuePtr& callback)
       : Thread(true), jsEngine(jsEngine), fileSystem(jsEngine->GetFileSystem()),
         callback(callback)
     {
     }
 
   protected:
     JsEnginePtr jsEngine;
     FileSystemPtr fileSystem;
-    JsValuePtr callback;
+    JsConstValuePtr callback;
   };
 
   class ReadThread : public IoThread
   {
   public:
-    ReadThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    ReadThread(const JsEnginePtr& jsEngine, const JsConstValuePtr& callback,
                const std::string& path)
       : IoThread(jsEngine, callback), path(path)
     {
     }
 
     void Run()
     {
       std::string content;
       std::string error;
       try
@@ skipping 19 matching lines @@
       callback->Call(params);
     }
 
   private:
     std::string path;
   };
 
   class WriteThread : public IoThread
   {
   public:
-    WriteThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    WriteThread(const JsEnginePtr& jsEngine, const JsConstValuePtr& callback,
                 const std::string& path, const std::string& content)
       : IoThread(jsEngine, callback), path(path), content(content)
     {
     }
 
     void Run()
     {
       std::string error;
       try
       {
@@ skipping 18 matching lines @@
     }
 
   private:
     std::string path;
     std::string content;
   };
 
   class MoveThread : public IoThread
   {
   public:
-    MoveThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    MoveThread(const JsEnginePtr& jsEngine, const JsConstValuePtr& callback,
                const std::string& fromPath, const std::string& toPath)
       : IoThread(jsEngine, callback), fromPath(fromPath), toPath(toPath)
     {
     }
 
     void Run()
     {
       std::string error;
       try
       {
@@ skipping 16 matching lines @@
     }
 
   private:
     std::string fromPath;
     std::string toPath;
   };
 
   class RemoveThread : public IoThread
   {
   public:
-    RemoveThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    RemoveThread(const JsEnginePtr& jsEngine, const JsConstValuePtr& callback,
                  const std::string& path)
       : IoThread(jsEngine, callback), path(path)
     {
     }
 
     void Run()
     {
       std::string error;
       try
       {
@@ skipping 16 matching lines @@
     }
 
   private:
     std::string path;
   };
 
 
   class StatThread : public IoThread
   {
   public:
-    StatThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    StatThread(const JsEnginePtr& jsEngine, const JsConstValuePtr& callback,
                const std::string& path)
       : IoThread(jsEngine, callback), path(path)
     {
     }
 
     void Run()
     {
       std::string error;
       FileSystem::StatResult statResult;
       try
@@ skipping 22 matching lines @@
       callback->Call(params);
     }
 
   private:
     std::string path;
   };
 
   v8::Handle<v8::Value> ReadCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
-    AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
+    AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 2)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.read requires 2 parameters"));
     if (!converted[1]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Second argument to _fileSystem.read must be a function"));
     ReadThread* const readThread = new ReadThread(jsEngine, converted[1],
         converted[0]->AsString());
     readThread->Start();
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> WriteCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
-    AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
+    AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 3)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.write requires 3 parameters"));
     if (!converted[2]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Third argument to _fileSystem.write must be a function"));
     WriteThread* const writeThread = new WriteThread(jsEngine, converted[2],
         converted[0]->AsString(), converted[1]->AsString());
     writeThread->Start();
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> MoveCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
-    AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
+    AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 3)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.move requires 3 parameters"));
     if (!converted[2]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Third argument to _fileSystem.move must be a function"));
     MoveThread* const moveThread = new MoveThread(jsEngine, converted[2],
         converted[0]->AsString(), converted[1]->AsString());
     moveThread->Start();
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> RemoveCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
-    AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
+    AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 2)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.remove requires 2 parameters"));
     if (!converted[1]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Second argument to _fileSystem.remove must be a function"));
     RemoveThread* const removeThread = new RemoveThread(jsEngine, converted[1],
         converted[0]->AsString());
     removeThread->Start();
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> StatCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
-    AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
+    AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 2)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.stat requires 2 parameters"));
     if (!converted[1]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Second argument to _fileSystem.stat must be a function"));
     StatThread* const statThread = new StatThread(jsEngine, converted[1],
         converted[0]->AsString());
     statThread->Start();
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> ResolveCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
-    AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
+    AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 1)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.resolve requires 1 parameter"));
 
     std::string resolved = jsEngine->GetFileSystem()->Resolve(converted[0]->AsString());
 
     return Utils::ToV8String(isolate, resolved);
   }
 
 }
 
 
-JsValuePtr FileSystemJsObject::Setup(JsEngine& jsEngine, const JsValuePtr& obj)
+JsValue& FileSystemJsObject::Setup(JsEngine& jsEngine, JsValue& obj)
 {
-  obj->SetProperty("read", jsEngine.NewCallback(::ReadCallback));
-  obj->SetProperty("write", jsEngine.NewCallback(::WriteCallback));
-  obj->SetProperty("move", jsEngine.NewCallback(::MoveCallback));
-  obj->SetProperty("remove", jsEngine.NewCallback(::RemoveCallback));
-  obj->SetProperty("stat", jsEngine.NewCallback(::StatCallback));
-  obj->SetProperty("resolve", jsEngine.NewCallback(::ResolveCallback));
+  obj.SetProperty("read", *jsEngine.NewCallback(::ReadCallback));
+  obj.SetProperty("write", *jsEngine.NewCallback(::WriteCallback));
+  obj.SetProperty("move", *jsEngine.NewCallback(::MoveCallback));
+  obj.SetProperty("remove", *jsEngine.NewCallback(::RemoveCallback));
+  obj.SetProperty("stat", *jsEngine.NewCallback(::StatCallback));
+  obj.SetProperty("resolve", *jsEngine.NewCallback(::ResolveCallback));
   return obj;
 }