| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 #include <AdblockPlus/AppInfo.h> | 18 #include <AdblockPlus/AppInfo.h> |
| 19 #include <AdblockPlus/JsValue.h> | 19 #include <AdblockPlus/JsValue.h> |
| 20 | 20 |
| 21 #include "AppInfoJsObject.h" | 21 #include "AppInfoJsObject.h" |
| 22 #include "Utils.h" | 22 #include "Utils.h" |
| 23 | 23 |
| 24 using namespace AdblockPlus; | 24 using namespace AdblockPlus; |
| 25 | 25 |
| 26 JsValuePtr AppInfoJsObject::Setup(JsEnginePtr jsEngine, const AppInfo& appInfo, | 26 JsValuePtr AppInfoJsObject::Setup(const AppInfo& appInfo, const JsValuePtr& obj) |
| 27 JsValuePtr obj) | |
| 28 { | 27 { |
| 29 obj->SetProperty("version", appInfo.version); | 28 obj->SetProperty("version", appInfo.version); |
| 30 obj->SetProperty("name", appInfo.name); | 29 obj->SetProperty("name", appInfo.name); |
| 31 obj->SetProperty("application", appInfo.application); | 30 obj->SetProperty("application", appInfo.application); |
| 32 obj->SetProperty("applicationVersion", appInfo.applicationVersion); | 31 obj->SetProperty("applicationVersion", appInfo.applicationVersion); |
| 33 obj->SetProperty("locale", appInfo.locale); | 32 obj->SetProperty("locale", appInfo.locale); |
| 34 obj->SetProperty("developmentBuild", appInfo.developmentBuild); | 33 obj->SetProperty("developmentBuild", appInfo.developmentBuild); |
| 35 return obj; | 34 return obj; |
| 36 } | 35 } |
| OLD | NEW |