Issue 3589 - Change return type of AdblockPlus::JsValue::Call from pointer to r-value object.

src/Notification.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 46 matching lines @@
 Notification::Notification(JsValue&& jsValue)
   : JsValue(std::move(jsValue))
 {
 }
 
 NotificationType Notification::GetType() const
 {
   return StringToNotificationType(GetProperty("type")->AsString());
 }
 
-NotificationTexts Notification::GetTexts()
+NotificationTexts Notification::GetTexts() const
 {
-  JsValueList params;
-  params.push_back(shared_from_this());
-  JsValue jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(params);
+  JsValue jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(*this);
   NotificationTexts notificationTexts;
   JsValuePtr jsTitle = jsTexts.GetProperty("title");
   if (jsTitle->IsString())
   {
     notificationTexts.title = jsTitle->AsString();
   }
   JsValuePtr jsMessage = jsTexts.GetProperty("message");
   if (jsMessage->IsString())
   {
     notificationTexts.message = jsMessage->AsString();
   }
   return notificationTexts;
 }
 
 std::vector<std::string> Notification::GetLinks() const
 {
   std::vector<std::string> retValue;
   JsValuePtr jsLinks = GetProperty("links");
   if (!jsLinks->IsArray())
   {
     return retValue;
   }
   JsValueList urlLinksList = jsLinks->AsList();
-  for (JsValueList::const_iterator linkIterator = urlLinksList.begin();
-    linkIterator != urlLinksList.end(); ++linkIterator)
+  for (const auto& link : urlLinksList)
   {
-    retValue.push_back((*linkIterator)->AsString());
+    retValue.push_back(link->AsString());
   }
   return retValue;
 }
 
 void Notification::MarkAsShown()
 {
-  JsValueList params;
-  params.push_back(GetProperty("id"));
-  jsEngine->Evaluate("API.markNotificationAsShown")->Call(params);
-}
+  jsEngine->Evaluate("API.markNotificationAsShown")->Call(*GetProperty("id"));
+}