diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2018-06-06 10:09:01 +0300 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2018-06-07 08:04:39 +0000 |
| commit | 4ce185f7c7bf10116977e3deea4ab857a8cf2f25 (patch) | |
| tree | cac090aa5137b0860d236569b8d470a0dcd3e1df /src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h | |
| parent | 0eec127f81eb35ed1cc5171c9a82b7f9c4525324 (diff) | |
Fix component/group name uniqueness check
Check new component or group name uniqueness based on the original object
name, not based on default "Group" or "Component" that is temporarily
assigned to the newly created object.
Task-ID: QT3DS-1831
Change-Id: I23138f92cb573eca861d494403371795dfaeec1b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h')
| -rw-r--r-- | src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h index d5a65a5c..3e73cf7b 100644 --- a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h +++ b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h @@ -274,14 +274,16 @@ public: virtual void RearrangeObjects(const qt3dsdm::TInstanceHandleList &inInstances, TInstanceHandle inDest, - DocumentEditorInsertType::Enum inInsertType) = 0; + DocumentEditorInsertType::Enum inInsertType, + bool checkUniqueName = true) = 0; void RearrangeObject(TInstanceHandle inInstance, TInstanceHandle inDest, - DocumentEditorInsertType::Enum inInsertType) + DocumentEditorInsertType::Enum inInsertType, + bool checkUniqueName = true) { qt3dsdm::TInstanceHandleList theInstances; theInstances.push_back(inInstance); - RearrangeObjects(theInstances, inDest, inInsertType); + RearrangeObjects(theInstances, inDest, inInsertType, checkUniqueName); } // Returns the new component. |