From c385a88c886ece592767a47bda0ceddddbcc294b Mon Sep 17 00:00:00 2001 From: Yves Date: Sat, 22 Nov 2014 19:46:24 +0000 Subject: [PATCH] Remove unused overload of GetSavedGameData This was SVN commit r16001. --- source/gui/GUIManager.cpp | 13 ------------- source/gui/GUIManager.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/source/gui/GUIManager.cpp b/source/gui/GUIManager.cpp index ce4f363c9c..6c171574a9 100644 --- a/source/gui/GUIManager.cpp +++ b/source/gui/GUIManager.cpp @@ -282,19 +282,6 @@ Status CGUIManager::ReloadAllPages() return INFO::OK; } -CScriptVal CGUIManager::GetSavedGameData(ScriptInterface*& pPageScriptInterface) -{ - JSContext* cx = top()->GetScriptInterface()->GetContext(); - JSAutoRequest rq(cx); - - JS::RootedValue global(cx, top()->GetGlobalObject()); - JS::RootedValue data(cx); - if (!top()->GetScriptInterface()->CallFunction(global, "getSavedGameData", &data)) - LOGERROR(L"Failed to call getSavedGameData() on the current GUI page"); - pPageScriptInterface = GetScriptInterface().get(); - return CScriptVal(data); -} - std::string CGUIManager::GetSavedGameData() { shared_ptr scriptInterface = top()->GetScriptInterface(); diff --git a/source/gui/GUIManager.h b/source/gui/GUIManager.h index bba6719410..75e9ac1760 100644 --- a/source/gui/GUIManager.h +++ b/source/gui/GUIManager.h @@ -134,9 +134,7 @@ public: /** * Calls the current page's script function getSavedGameData() and returns the result. - * The first overload also returns a pointer to the ScriptInterface the returned CScriptVal belongs to. */ - CScriptVal GetSavedGameData(ScriptInterface*& pPageScriptInterface); std::string GetSavedGameData(); void RestoreSavedGameData(std::string jsonData);