Showing the changes to libraries/script-engine/src/ScriptManagerScriptingInterface.h (1 of 2 files). Show all
Unified · Split
| @@ -51,26 +51,11 @@ · 50 unmodified lines | ||
| 51 | 51 | class ScriptManagerScriptingInterface : public QObject { |
| 52 | 52 | Q_OBJECT |
| 53 | 53 | public: |
| 54 | − ScriptManagerScriptingInterface(ScriptManager *parent) : QObject(parent), _manager(parent) { | |
| 55 | − | |
| 56 | − connect(_manager, &ScriptManager::scriptLoaded, this, &ScriptManagerScriptingInterface::scriptLoaded); | |
| 57 | − connect(_manager, &ScriptManager::errorLoadingScript, this, &ScriptManagerScriptingInterface::errorLoadingScript); | |
| 58 | − connect(_manager, &ScriptManager::update, this, &ScriptManagerScriptingInterface::update); | |
| 59 | − connect(_manager, &ScriptManager::scriptEnding, this, &ScriptManagerScriptingInterface::scriptEnding); | |
| 60 | − connect(_manager, &ScriptManager::finished, this, &ScriptManagerScriptingInterface::finished); | |
| 61 | − connect(_manager, &ScriptManager::printedMessage, this, &ScriptManagerScriptingInterface::printedMessage); | |
| 62 | − connect(_manager, &ScriptManager::errorMessage, this, &ScriptManagerScriptingInterface::errorMessage); | |
| 63 | − connect(_manager, &ScriptManager::warningMessage, this, &ScriptManagerScriptingInterface::warningMessage); | |
| 64 | − connect(_manager, &ScriptManager::infoMessage, this, &ScriptManagerScriptingInterface::infoMessage); | |
| 65 | − connect(_manager, &ScriptManager::runningStateChanged, this, &ScriptManagerScriptingInterface::runningStateChanged); | |
| 66 | − connect(_manager, &ScriptManager::clearDebugWindow, this, &ScriptManagerScriptingInterface::clearDebugWindow); | |
| 67 | − connect(_manager, &ScriptManager::loadScript, this, &ScriptManagerScriptingInterface::loadScript); | |
| 68 | − connect(_manager, &ScriptManager::doneRunning, this, &ScriptManagerScriptingInterface::doneRunning); | |
| 69 | − connect(_manager, &ScriptManager::entityScriptDetailsUpdated, this, &ScriptManagerScriptingInterface::entityScriptDetailsUpdated); | |
| 70 | − connect(_manager, &ScriptManager::entityScriptPreloadFinished, this, &ScriptManagerScriptingInterface::entityScriptPreloadFinished); | |
| 71 | − connect(_manager, &ScriptManager::unhandledException, this, &ScriptManagerScriptingInterface::unhandledException); | |
| 72 | − } | |
| 54 | + ScriptManagerScriptingInterface(ScriptManager *parent); | |
| 55 | + | |
| 56 | + virtual ~ScriptManagerScriptingInterface() { | |
| 73 | 57 | |
| 58 | + } | |
| 74 | 59 | /**jsdoc |
| 75 | 60 | * Stops and unloads the current script. |
| 76 | 61 | * <p><strong>Warning:</strong> If an assignment client script, the script gets restarted after stopping.</p> |
| @@ -709,7 +694,8 @@ protected: · 632 unmodified lines | ||
| 709 | 694 | * @param {string} status - Status. |
| 710 | 695 | * @deprecated This function is deprecated and will be removed. |
| 711 | 696 | */ |
| 712 | − Q_INVOKABLE void entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success, const QString& status); | |
| 697 | + Q_INVOKABLE void entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success, const QString& status) | |
| 698 | + { _manager->entityScriptContentAvailable(entityID, scriptOrURL, contents, isURL, success, status); } | |
| 713 | 699 | |
| 714 | 700 | |
| 715 | 701 | private: |