Showing the changes to interface/src/raypick/PointerScriptingInterface.cpp (1 of 21 files). Show all
Unified · Split
| @@ -14,23 +14,23 @@ · 13 unmodified lines | ||
| 14 | 14 | #include "Application.h" |
| 15 | 15 | #include "LaserPointer.h" |
| 16 | 16 | |
| 17 | −void PointerScriptingInterface::setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreItems) const { | |
| 17 | +void PointerScriptingInterface::setIgnoreItems(unsigned int uid, const QScriptValue& ignoreItems) const { | |
| 18 | 18 | DependencyManager::get<PointerManager>()->setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems)); |
| 19 | 19 | } |
| 20 | −void PointerScriptingInterface::setIncludeItems(const QUuid& uid, const QScriptValue& includeItems) const { | |
| 20 | +void PointerScriptingInterface::setIncludeItems(unsigned int uid, const QScriptValue& includeItems) const { | |
| 21 | 21 | DependencyManager::get<PointerManager>()->setIncludeItems(uid, qVectorQUuidFromScriptValue(includeItems)); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | −QUuid PointerScriptingInterface::createPointer(const PickQuery::PickType& type, const QVariant& properties) const { | |
| 24 | +unsigned int PointerScriptingInterface::createPointer(const PickQuery::PickType& type, const QVariant& properties) const { | |
| 25 | 25 | switch (type) { |
| 26 | 26 | case PickQuery::PickType::Ray: |
| 27 | 27 | return createLaserPointer(properties); |
| 28 | 28 | default: |
| 29 | − return QUuid(); | |
| 29 | + return 0; | |
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | −QUuid PointerScriptingInterface::createLaserPointer(const QVariant& properties) const { | |
| 33 | +unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& properties) const { | |
| 34 | 34 | QVariantMap propertyMap = properties.toMap(); |
| 35 | 35 | |
| 36 | 36 | bool faceAvatar = false; |
| @@ -114,7 +114,7 @@ QUuid PointerScriptingInterface::createLaserPointer(const QVariant& properties) · 77 unmodified lines | ||
| 114 | 114 | faceAvatar, centerEndY, lockEnd, distanceScaleEnd, enabled)); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | −void PointerScriptingInterface::editRenderState(const QUuid& uid, const QString& renderState, const QVariant& properties) const { | |
| 117 | +void PointerScriptingInterface::editRenderState(unsigned int uid, const QString& renderState, const QVariant& properties) const { | |
| 118 | 118 | QVariantMap propMap = properties.toMap(); |
| 119 | 119 | |
| 120 | 120 | QVariant startProps; |