diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-05-14 13:40:40 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-05-15 08:19:42 +0000 |
| commit | cee72f444e5860e1ae96dfa2a448fa0aa08736f6 (patch) | |
| tree | 53ea00f226677410eea95eca9371fea1ff2c484f /src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | |
| parent | ac03f580a0762e79c52f56c03f577003b1853887 (diff) | |
Rename object if drag-move target parent has object with same name
Task-number: QT3DS-1549
Change-Id: Ic249473bcb5d3c4cc9b06958b47e9a0bb3e5de2d
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp index 8f36c547..c4b52853 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp @@ -343,7 +343,8 @@ void Qt3DSDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName) CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge(); // Display warning if we had to modify the user-given name to make it unique - if (!theBridge->CheckNameUnique(m_DataHandle, inName)) { + if (!theBridge->CheckNameUnique(theBridge->GetParentInstance(m_DataHandle), + m_DataHandle, inName)) { // Find unique name based on the input string Q3DStudio::SCOPED_DOCUMENT_EDITOR( *m_TransMgr->GetDoc(), QObject::tr("Set Name"))->SetName(m_DataHandle, inName, true); |