diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index e308a3eece..464728f7e0 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -30,7 +30,7 @@ link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(octree-server ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(particle-server ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(voxel-server ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(scriptengine ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(script-engine ${TARGET_NAME} ${ROOT_DIR}) #testing include_directories(${ROOT_DIR}/externals/civetweb/include) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index c447bfa1a5..9d56764ffa 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -96,7 +96,7 @@ link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(scriptengine ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(script-engine ${TARGET_NAME} ${ROOT_DIR}) # find required libraries find_package(Faceshift) diff --git a/libraries/scriptengine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt similarity index 96% rename from libraries/scriptengine/CMakeLists.txt rename to libraries/script-engine/CMakeLists.txt index 593feab014..59f41b8cbe 100644 --- a/libraries/scriptengine/CMakeLists.txt +++ b/libraries/script-engine/CMakeLists.txt @@ -6,7 +6,7 @@ set(MACRO_DIR ${ROOT_DIR}/cmake/macros) # setup for find modules set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/") -set(TARGET_NAME scriptengine) +set(TARGET_NAME script-engine) find_package(Qt5Widgets REQUIRED) diff --git a/libraries/scriptengine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp similarity index 97% rename from libraries/scriptengine/src/ScriptEngine.cpp rename to libraries/script-engine/src/ScriptEngine.cpp index 3bffa35929..35585ad6ef 100644 --- a/libraries/scriptengine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -24,7 +24,7 @@ int ScriptEngine::_scriptNumber = 1; -ScriptEngine::ScriptEngine(QString scriptContents, bool wantMenuItems, +ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const char* scriptMenuName, AbstractMenuInterface* menu) { _scriptContents = scriptContents; _isFinished = false; @@ -60,7 +60,7 @@ void ScriptEngine::cleanMenuItems() { } } -bool ScriptEngine::setScriptContents(QString scriptContents) { +bool ScriptEngine::setScriptContents(const QString& scriptContents) { if (_isRunning) { return false; } diff --git a/libraries/scriptengine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h similarity index 92% rename from libraries/scriptengine/src/ScriptEngine.h rename to libraries/script-engine/src/ScriptEngine.h index 605c4ce7e8..2e0d7fcc40 100644 --- a/libraries/scriptengine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -24,7 +24,7 @@ const QString NO_SCRIPT(""); class ScriptEngine : public QObject { Q_OBJECT public: - ScriptEngine(QString scriptContents = NO_SCRIPT, bool wantMenuItems = false, + ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false, const char* scriptMenuName = NULL, AbstractMenuInterface* menu = NULL); ~ScriptEngine(); @@ -36,7 +36,7 @@ public: ParticleScriptingInterface* getParticleScriptingInterface() { return &_particleScriptingInterface; } /// sets the script contents, will return false if failed, will fail if script is already running - bool setScriptContents(QString scriptContents); + bool setScriptContents(const QString& scriptContents); void setupMenuItems(); void cleanMenuItems();