Showing the changes to interface/src/raypick/LaserPointerScriptingInterface.cpp (1 of 16 files). Show all
Unified · Split
| @@ -40,30 +40,30 @@ QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& propert · 39 unmodified lines | ||
| 40 | 40 | enabled = propertyMap["enabled"].toBool(); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | − QHash<QString, RenderState> renderStates; | |
| 43 | + LaserPointer::RenderStateMap renderStates; | |
| 44 | 44 | if (propertyMap["renderStates"].isValid()) { |
| 45 | 45 | QList<QVariant> renderStateVariants = propertyMap["renderStates"].toList(); |
| 46 | 46 | for (QVariant& renderStateVariant : renderStateVariants) { |
| 47 | 47 | if (renderStateVariant.isValid()) { |
| 48 | 48 | QVariantMap renderStateMap = renderStateVariant.toMap(); |
| 49 | 49 | if (renderStateMap["name"].isValid()) { |
| 50 | − QString name = renderStateMap["name"].toString(); | |
| 50 | + std::string name = renderStateMap["name"].toString().toStdString(); | |
| 51 | 51 | renderStates[name] = buildRenderState(renderStateMap); |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | − QHash<QString, QPair<float, RenderState>> defaultRenderStates; | |
| 57 | + LaserPointer::DefaultRenderStateMap defaultRenderStates; | |
| 58 | 58 | if (propertyMap["defaultRenderStates"].isValid()) { |
| 59 | 59 | QList<QVariant> renderStateVariants = propertyMap["defaultRenderStates"].toList(); |
| 60 | 60 | for (QVariant& renderStateVariant : renderStateVariants) { |
| 61 | 61 | if (renderStateVariant.isValid()) { |
| 62 | 62 | QVariantMap renderStateMap = renderStateVariant.toMap(); |
| 63 | 63 | if (renderStateMap["name"].isValid() && renderStateMap["distance"].isValid()) { |
| 64 | − QString name = renderStateMap["name"].toString(); | |
| 64 | + std::string name = renderStateMap["name"].toString().toStdString(); | |
| 65 | 65 | float distance = renderStateMap["distance"].toFloat(); |
| 66 | − defaultRenderStates[name] = QPair<float, RenderState>(distance, buildRenderState(renderStateMap)); | |
| 66 | + defaultRenderStates[name] = std::pair<float, RenderState>(distance, buildRenderState(renderStateMap)); | |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | } |
| @@ -90,7 +90,7 @@ void LaserPointerScriptingInterface::editRenderState(QUuid uid, const QString& r · 20 unmodified lines | ||
| 90 | 90 | endProps = propMap["end"]; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | − qApp->getLaserPointerManager().editRenderState(uid, renderState, startProps, pathProps, endProps); | |
| 93 | + qApp->getLaserPointerManager().editRenderState(uid, renderState.toStdString(), startProps, pathProps, endProps); | |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | const RenderState LaserPointerScriptingInterface::buildRenderState(const QVariantMap& propMap) { |