Showing the changes to interface/src/scripting/ClipboardScriptingInterface.cpp (1 of 37 files). Show all
Unified · Split
| @@ -15,12 +15,12 @@ ClipboardScriptingInterface::ClipboardScriptingInterface() { · 14 unmodified lines | |||
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | float ClipboardScriptingInterface::getClipboardContentsLargestDimension() { | 17 | float ClipboardScriptingInterface::getClipboardContentsLargestDimension() { |
| 18 | return Application::getInstance()->getEntityClipboard()->getContentsLargestDimension(); | 18 | return qApp->getEntityClipboard()->getContentsLargestDimension(); |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) { | 21 | bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) { |
| 22 | bool retVal; | 22 | bool retVal; |
| 23 | QMetaObject::invokeMethod(Application::getInstance(), "exportEntities", Qt::BlockingQueuedConnection, | 23 | QMetaObject::invokeMethod(qApp, "exportEntities", Qt::BlockingQueuedConnection, |
| 24 | Q_RETURN_ARG(bool, retVal), | 24 | Q_RETURN_ARG(bool, retVal), |
| 25 | Q_ARG(const QString&, filename), | 25 | Q_ARG(const QString&, filename), |
| 26 | Q_ARG(const QVector<EntityItemID>&, entityIDs)); | 26 | Q_ARG(const QVector<EntityItemID>&, entityIDs)); |
| @@ -29,7 +29,7 @@ bool ClipboardScriptingInterface::exportEntities(const QString& filename, const · 2 unmodified lines | |||
| 29 | 29 | ||
| 30 | bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float s) { | 30 | bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float s) { |
| 31 | bool retVal; | 31 | bool retVal; |
| 32 | QMetaObject::invokeMethod(Application::getInstance(), "exportEntities", Qt::BlockingQueuedConnection, | 32 | QMetaObject::invokeMethod(qApp, "exportEntities", Qt::BlockingQueuedConnection, |
| 33 | Q_RETURN_ARG(bool, retVal), | 33 | Q_RETURN_ARG(bool, retVal), |
| 34 | Q_ARG(const QString&, filename), | 34 | Q_ARG(const QString&, filename), |
| 35 | Q_ARG(float, x), | 35 | Q_ARG(float, x), |
| @@ -41,7 +41,7 @@ bool ClipboardScriptingInterface::exportEntities(const QString& filename, float · 5 unmodified lines | |||
| 41 | 41 | ||
| 42 | bool ClipboardScriptingInterface::importEntities(const QString& filename) { | 42 | bool ClipboardScriptingInterface::importEntities(const QString& filename) { |
| 43 | bool retVal; | 43 | bool retVal; |
| 44 | QMetaObject::invokeMethod(Application::getInstance(), "importEntities", Qt::BlockingQueuedConnection, | 44 | QMetaObject::invokeMethod(qApp, "importEntities", Qt::BlockingQueuedConnection, |
| 45 | Q_RETURN_ARG(bool, retVal), | 45 | Q_RETURN_ARG(bool, retVal), |
| 46 | Q_ARG(const QString&, filename)); | 46 | Q_ARG(const QString&, filename)); |
| 47 | return retVal; | 47 | return retVal; |
| @@ -49,7 +49,7 @@ bool ClipboardScriptingInterface::importEntities(const QString& filename) { · 1 unmodified line | |||
| 49 | 49 | ||
| 50 | QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(glm::vec3 position) { | 50 | QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(glm::vec3 position) { |
| 51 | QVector<EntityItemID> retVal; | 51 | QVector<EntityItemID> retVal; |
| 52 | QMetaObject::invokeMethod(Application::getInstance(), "pasteEntities", Qt::BlockingQueuedConnection, | 52 | QMetaObject::invokeMethod(qApp, "pasteEntities", Qt::BlockingQueuedConnection, |
| 53 | Q_RETURN_ARG(QVector<EntityItemID>, retVal), | 53 | Q_RETURN_ARG(QVector<EntityItemID>, retVal), |
| 54 | Q_ARG(float, position.x), | 54 | Q_ARG(float, position.x), |
| 55 | Q_ARG(float, position.y), | 55 | Q_ARG(float, position.y), |