diff options
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/instances')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp | 21 | ||||
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h | 6 |
2 files changed, 19 insertions, 8 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp index 93520c2f7d..d12cfe327f 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp @@ -41,7 +41,8 @@ #include "instancecontainer.h" #include "createinstancescommand.h" #include "createscenecommand.h" -#include "change3dviewcommand.h" +#include "update3dviewstatecommand.h" +#include "enable3dviewcommand.h" #include "changevaluescommand.h" #include "changebindingscommand.h" #include "changeauxiliarycommand.h" @@ -361,9 +362,14 @@ void NodeInstanceClientProxy::createScene(const CreateSceneCommand &command) nodeInstanceServer()->createScene(command); } -void NodeInstanceClientProxy::change3DView(const Change3DViewCommand &command) +void NodeInstanceClientProxy::update3DViewState(const Update3dViewStateCommand &command) { - nodeInstanceServer()->change3DView(command); + nodeInstanceServer()->update3DViewState(command); +} + +void NodeInstanceClientProxy::enable3DView(const Enable3DViewCommand &command) +{ + nodeInstanceServer()->enable3DView(command); } void NodeInstanceClientProxy::clearScene(const ClearSceneCommand &command) @@ -453,7 +459,8 @@ void NodeInstanceClientProxy::changeSelection(const ChangeSelectionCommand &comm void NodeInstanceClientProxy::dispatchCommand(const QVariant &command) { static const int createInstancesCommandType = QMetaType::type("CreateInstancesCommand"); - static const int change3DViewCommandType = QMetaType::type("Change3DViewCommand"); + static const int update3dViewStateCommand = QMetaType::type("Update3dViewStateCommand"); + static const int enable3DViewCommandType = QMetaType::type("Enable3DViewCommand"); static const int changeFileUrlCommandType = QMetaType::type("ChangeFileUrlCommand"); static const int createSceneCommandType = QMetaType::type("CreateSceneCommand"); static const int clearSceneCommandType = QMetaType::type("ClearSceneCommand"); @@ -477,8 +484,10 @@ void NodeInstanceClientProxy::dispatchCommand(const QVariant &command) if (commandType == createInstancesCommandType) createInstances(command.value<CreateInstancesCommand>()); - else if (commandType == change3DViewCommandType) - change3DView(command.value<Change3DViewCommand>()); + else if (commandType == update3dViewStateCommand) + update3DViewState(command.value<Update3dViewStateCommand>()); + else if (commandType == enable3DViewCommandType) + enable3DView(command.value<Enable3DViewCommand>()); else if (commandType == changeFileUrlCommandType) changeFileUrl(command.value<ChangeFileUrlCommand>()); else if (commandType == createSceneCommandType) diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h index e9044b63ef..5a742947d2 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h @@ -45,7 +45,8 @@ class CreateSceneCommand; class CreateInstancesCommand; class ClearSceneCommand; class ReparentInstancesCommand; -class Change3DViewCommand; +class Update3dViewStateCommand; +class Enable3DViewCommand; class ChangeFileUrlCommand; class ChangeValuesCommand; class ChangeAuxiliaryCommand; @@ -96,7 +97,8 @@ protected: void changeFileUrl(const ChangeFileUrlCommand &command); void createScene(const CreateSceneCommand &command); void clearScene(const ClearSceneCommand &command); - void change3DView(const Change3DViewCommand &command); + void update3DViewState(const Update3dViewStateCommand &command); + void enable3DView(const Enable3DViewCommand &command); void removeInstances(const RemoveInstancesCommand &command); void removeProperties(const RemovePropertiesCommand &command); void changePropertyBindings(const ChangeBindingsCommand &command); |