diff --git a/apps/code/editor_controller.cpp b/apps/code/editor_controller.cpp index 704b814f5..8ffb0f4c6 100644 --- a/apps/code/editor_controller.cpp +++ b/apps/code/editor_controller.cpp @@ -37,7 +37,7 @@ void EditorController::setScript(Script script, int scriptIndex) { * */ size_t newScriptSize = Ion::Storage::sharedStorage()->putAvailableSpaceAtEndOfRecord(m_script); - m_editorView.setText(const_cast(m_script.scriptContent()), newScriptSize - Script::InformationSize()); + m_editorView.setText(const_cast(m_script.content()), newScriptSize - Script::InformationSize()); } void EditorController::willExitApp() { @@ -155,7 +155,7 @@ void EditorController::cleanStorageEmptySpace() { Ion::Storage::Record::Data scriptValue = m_script.value(); Ion::Storage::sharedStorage()->getAvailableSpaceFromEndOfRecord( m_script, - scriptValue.size - Script::InformationSize() - (strlen(m_script.scriptContent()) + 1)); // TODO optimize number of script fetches + scriptValue.size - Script::InformationSize() - (strlen(m_script.content()) + 1)); // TODO optimize number of script fetches } diff --git a/apps/code/script.cpp b/apps/code/script.cpp index 15a9419f5..f74e4e367 100644 --- a/apps/code/script.cpp +++ b/apps/code/script.cpp @@ -78,7 +78,7 @@ void Script::toggleAutoimportationStatus() { setValue(d); } -const char * Script::scriptContent() const { +const char * Script::content() const { Data d = value(); return ((const char *)d.buffer) + InformationSize(); } diff --git a/apps/code/script.h b/apps/code/script.h index 36dbe9ea6..c1d5e3664 100644 --- a/apps/code/script.h +++ b/apps/code/script.h @@ -29,7 +29,7 @@ public: Script(Ion::Storage::Record r = Ion::Storage::Record()) : Record(r) {} bool autoImportationStatus() const; void toggleAutoimportationStatus(); - const char * scriptContent() const; + const char * content() const; bool contentFetchedFromConsole() const; void setContentFetchedFromConsole(bool fetch); }; diff --git a/apps/code/script_store.cpp b/apps/code/script_store.cpp index 37fd45cbf..80fdb523d 100644 --- a/apps/code/script_store.cpp +++ b/apps/code/script_store.cpp @@ -33,7 +33,7 @@ const char * ScriptStore::contentOfScript(const char * name, bool markAsFetched) if (markAsFetched) { script.setContentFetchedFromConsole(true); } - return script.scriptContent(); + return script.content(); } void ScriptStore::clearFetchInformation() { diff --git a/apps/code/variable_box_controller.cpp b/apps/code/variable_box_controller.cpp index 61bb7e7f7..e01bcbfb3 100644 --- a/apps/code/variable_box_controller.cpp +++ b/apps/code/variable_box_controller.cpp @@ -176,7 +176,7 @@ void VariableBoxController::loadFunctionsAndVariables(int scriptIndex, const cha loadBuiltinNodes(textToAutocomplete, textToAutocompleteLength); Script script = m_scriptStore->scriptAtIndex(scriptIndex); assert(!script.isNull()); - const char * scriptContent = script.scriptContent(); + const char * scriptContent = script.content(); assert(scriptContent != nullptr); loadImportedVariablesInScript(scriptContent, textToAutocomplete, textToAutocompleteLength); loadCurrentVariablesInScript(scriptContent, textToAutocomplete, textToAutocompleteLength); @@ -235,7 +235,7 @@ void VariableBoxController::loadVariablesImportedFromScripts() { for (int i = 0; i < scriptsCount; i++) { Script script = m_scriptStore->scriptAtIndex(i); if (script.contentFetchedFromConsole()) { - loadGlobalAndImportedVariablesInScriptAsImported(script.fullName(), script.scriptContent(), nullptr, -1, false); // TODO optimize number of script fetches + loadGlobalAndImportedVariablesInScriptAsImported(script.fullName(), script.content(), nullptr, -1, false); // TODO optimize number of script fetches } } } @@ -773,7 +773,7 @@ bool VariableBoxController::addNodesFromImportMaybe(mp_parse_node_struct_t * par Script importedScript; const char * scriptFullName; if (importationSourceIsScript(importationSourceName, &scriptFullName, &importedScript)) { - const char * scriptContent = importedScript.scriptContent(); + const char * scriptContent = importedScript.content(); assert(scriptContent != nullptr); loadGlobalAndImportedVariablesInScriptAsImported(scriptFullName, scriptContent, textToAutocomplete, textToAutocompleteLength); }