Showing the changes to interface/src/scripting/ClipboardScriptingInterface.cpp (1 of 39 files). Show all
Unified · Split
| @@ -27,7 +27,7 @@ float ClipboardScriptingInterface::getClipboardContentsLargestDimension() { · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) { | 28 | bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) { |
| 29 | bool retVal; | 29 | bool retVal; |
| 30 | hifi::qt::blockingInvokeMethod(qApp, "exportEntities", | 30 | BLOCKING_INVOKE_METHOD(qApp, "exportEntities", |
| 31 | Q_RETURN_ARG(bool, retVal), | 31 | Q_RETURN_ARG(bool, retVal), |
| 32 | Q_ARG(const QString&, filename), | 32 | Q_ARG(const QString&, filename), |
| 33 | Q_ARG(const QVector<EntityItemID>&, entityIDs)); | 33 | Q_ARG(const QVector<EntityItemID>&, entityIDs)); |
| @@ -36,7 +36,7 @@ bool ClipboardScriptingInterface::exportEntities(const QString& filename, const · 2 unmodified lines | |||
| 36 | 36 | ||
| 37 | bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float s) { | 37 | bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float s) { |
| 38 | bool retVal; | 38 | bool retVal; |
| 39 | hifi::qt::blockingInvokeMethod(qApp, "exportEntities", | 39 | BLOCKING_INVOKE_METHOD(qApp, "exportEntities", |
| 40 | Q_RETURN_ARG(bool, retVal), | 40 | Q_RETURN_ARG(bool, retVal), |
| 41 | Q_ARG(const QString&, filename), | 41 | Q_ARG(const QString&, filename), |
| 42 | Q_ARG(float, x), | 42 | Q_ARG(float, x), |
| @@ -48,7 +48,7 @@ bool ClipboardScriptingInterface::exportEntities(const QString& filename, float · 5 unmodified lines | |||
| 48 | 48 | ||
| 49 | bool ClipboardScriptingInterface::importEntities(const QString& filename) { | 49 | bool ClipboardScriptingInterface::importEntities(const QString& filename) { |
| 50 | bool retVal; | 50 | bool retVal; |
| 51 | hifi::qt::blockingInvokeMethod(qApp, "importEntities", | 51 | BLOCKING_INVOKE_METHOD(qApp, "importEntities", |
| 52 | Q_RETURN_ARG(bool, retVal), | 52 | Q_RETURN_ARG(bool, retVal), |
| 53 | Q_ARG(const QString&, filename)); | 53 | Q_ARG(const QString&, filename)); |
| 54 | return retVal; | 54 | return retVal; |
| @@ -56,7 +56,7 @@ bool ClipboardScriptingInterface::importEntities(const QString& filename) { · 1 unmodified line | |||
| 56 | 56 | ||
| 57 | QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(glm::vec3 position) { | 57 | QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(glm::vec3 position) { |
| 58 | QVector<EntityItemID> retVal; | 58 | QVector<EntityItemID> retVal; |
| 59 | hifi::qt::blockingInvokeMethod(qApp, "pasteEntities", | 59 | BLOCKING_INVOKE_METHOD(qApp, "pasteEntities", |
| 60 | Q_RETURN_ARG(QVector<EntityItemID>, retVal), | 60 | Q_RETURN_ARG(QVector<EntityItemID>, retVal), |
| 61 | Q_ARG(float, position.x), | 61 | Q_ARG(float, position.x), |
| 62 | Q_ARG(float, position.y), | 62 | Q_ARG(float, position.y), |