Change timeline comment datatype to QString

Change-Id: Idf27515b2e0589e228ac4fd048168281ad2246bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

10 files changed, 22 insertions, 27 deletions

diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index 060d32d0..4404ac71 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -2847,11 +2847,11 @@ public:
                            inColor.GetBlue() / 255.0f));
     }
 
-    void SetTimebarText(TInstanceHandle inInstance, const Q3DStudio::CString &inComment) override
+    void SetTimebarText(TInstanceHandle inInstance, const QString &inComment) override
     {
         m_PropertySystem.SetInstancePropertyValue(inInstance,
                                                   m_Bridge.GetSceneAsset().m_TimebarText,
-                                                  qt3dsdm::SStringRef(inComment.c_str()));
+                                                  QVariant(inComment));
     }
 
     void AddChild(Qt3DSDMInstanceHandle parent, Qt3DSDMInstanceHandle child,
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
index 9319808f..cba7bdc7 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
@@ -288,8 +288,7 @@ public:
     virtual void TruncateTimeRange(TInstanceHandle inInstance, bool inSetStart, long inTime) = 0;
 
     virtual void SetTimebarColor(TInstanceHandle inInstance, ::CColor inColor) = 0;
-    virtual void SetTimebarText(TInstanceHandle inInstance,
-                                const Q3DStudio::CString &inComment) = 0;
+    virtual void SetTimebarText(TInstanceHandle inInstance, const QString &inComment) = 0;
 
     // Scene graph management.
     virtual void AddChild(TInstanceHandle parent, TInstanceHandle child,
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h
index bc665b22..4871b62c 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h
@@ -99,7 +99,7 @@ class IPropertySystem;
     HANDLE_COMPOSER_PROPERTY(shy, m_Shy, bool, false)                                              \
     HANDLE_COMPOSER_PROPERTY(locked, m_Locked, bool, false)                                        \
     HANDLE_COMPOSER_PROPERTY_NO_DEFAULT(timebarcolor, m_TimebarColor, SFloat3)                     \
-    HANDLE_COMPOSER_PROPERTY(timebartext, m_TimebarText, SStringRef, L"")                          \
+    HANDLE_COMPOSER_PROPERTY(timebartext, m_TimebarText, TDataStrPtr, L"")                         \
     HANDLE_COMPOSER_PROPERTY(controlledproperty, m_ControlledProperty, TDataStrPtr, L"")
 
 #define ITERATE_COMPOSER_SCENE_PROPERTIES                                                          \
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp
index 8b2ea242..b135e2c0 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp
@@ -87,12 +87,12 @@ void CEmptyTimelineTimebar::RollbackTimeChange()
     return CStudioPreferences::GetObjectTimebarColor();
 }
 
-Q3DStudio::CString CEmptyTimelineTimebar::GetTimebarComment()
+QString CEmptyTimelineTimebar::GetTimebarComment() const
 {
-    return "";
+    return {};
 }
 
-void CEmptyTimelineTimebar::SetTimebarComment(const Q3DStudio::CString &inComment)
+void CEmptyTimelineTimebar::SetTimebarComment(const QString &inComment)
 {
     Q_UNUSED(inComment);
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.h
index 1ddc261d..09c00582 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.h
@@ -59,7 +59,7 @@ public:
     void CommitTimeChange() override;
     void RollbackTimeChange() override;
     ::CColor GetTimebarColor() override;
-    Q3DStudio::CString GetTimebarComment() override;
-    void SetTimebarComment(const Q3DStudio::CString &inComment) override;
+    QString GetTimebarComment() const override;
+    void SetTimebarComment(const QString &inComment) override;
     void SetTimebarTime(ITimeChangeCallback *inCallback = nullptr) override;
 };
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/ITimelineTimebar.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/ITimelineTimebar.h
index 01c41155..2a5ef827 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/ITimelineTimebar.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/ITimelineTimebar.h
@@ -65,8 +65,8 @@ public:
     virtual void RollbackTimeChange() = 0;
     //
     virtual CColor GetTimebarColor() = 0;
-    virtual Q3DStudio::CString GetTimebarComment() = 0;
-    virtual void SetTimebarComment(const Q3DStudio::CString &inComment) = 0;
+    virtual QString GetTimebarComment() const = 0;
+    virtual void SetTimebarComment(const QString &inComment) = 0;
     virtual void SetTimebarTime(ITimeChangeCallback *inCallback = nullptr) = 0;
 };
 
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
index 15f364c3..0cf78a30 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
@@ -110,10 +110,9 @@ void Qt3DSDMTimelineTimebar::OnPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle in
             if (m_PropertySystem->GetInstancePropertyValue(
                     m_DataHandle, theClientDataModelBridge->GetSceneAsset().m_TimebarText,
                     theValue)) {
-                qt3dsdm::SStringRef theTimebarComment = qt3dsdm::get<qt3dsdm::SStringRef>(theValue);
-                m_Comment.Assign(static_cast<const wchar_t *>(theTimebarComment));
+                m_Comment = qt3dsdm::get<qt3dsdm::TDataStrPtr>(theValue)->toQString();
             } else {
-                m_Comment.Assign(L"");
+                m_Comment.clear();
             }
             needsInvalidate = true;
         }
@@ -205,7 +204,7 @@ void Qt3DSDMTimelineTimebar::RollbackTimeChange()
     RollbackEditor();
 }
 
-void Qt3DSDMTimelineTimebar::SetTimebarComment(const Q3DStudio::CString &inComment)
+void Qt3DSDMTimelineTimebar::SetTimebarComment(const QString &inComment)
 {
     using namespace Q3DStudio;
     if (inComment != m_Comment) {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
index 49db6229..33e3f22d 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
@@ -67,7 +67,7 @@ protected:
     qt3dsdm::Qt3DSDMPropertyHandle m_EndTime;
     ::CColor m_Color; // Timebar color
 
-    Q3DStudio::CString m_Comment; // Timebar comment text
+    QString m_Comment; // Timebar comment text
     std::shared_ptr<qt3dsdm::ISignalConnection> m_PropertyChangedSignal;
     void OnPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                            qt3dsdm::Qt3DSDMPropertyHandle inProperty);
@@ -84,7 +84,7 @@ public:
     void CommitTimeChange() override;
     void RollbackTimeChange() override;
     ::CColor GetTimebarColor() override { return m_Color; }
-    Q3DStudio::CString GetTimebarComment() override { return m_Comment; }
-    void SetTimebarComment(const Q3DStudio::CString &inComment) override;
+    QString GetTimebarComment() const override { return m_Comment; }
+    void SetTimebarComment(const QString &inComment) override;
     void SetTimebarTime(ITimeChangeCallback *inCallback = nullptr) override;
 };
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimeline.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimeline.cpp
index 29850fa8..b84d6018 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimeline.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimeline.cpp
@@ -87,15 +87,12 @@ void RowTimeline::initialize()
     connect(m_commentItem, &RowTimelineCommentItem::labelChanged, this,
             [this](const QString &label) {
         // Update label on timeline and on model
-        // TODO: Get rid of CString APIs
-        auto ccomment = Q3DStudio::CString::fromQString(label);
         ITimelineTimebar *timebar = m_rowTree->m_binding->GetTimelineItem()->GetTimebar();
-        timebar->SetTimebarComment(ccomment);
+        timebar->SetTimebarComment(label);
     });
 
-    connect(m_rowTree->m_scene->ruler(), &Ruler::viewportXChanged, this, [this]() {
-        updateCommentItemPos();
-    });
+    connect(m_rowTree->m_scene->ruler(), &Ruler::viewportXChanged, this,
+            &RowTimeline::updateCommentItemPos);
 }
 
 void RowTimeline::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -880,7 +877,7 @@ void RowTimeline::updateCommentItem()
     m_commentItem->setVisible(showComments);
     if (showComments && m_rowTree->m_binding) {
         ITimelineTimebar *timebar = m_rowTree->m_binding->GetTimelineItem()->GetTimebar();
-        m_commentItem->setLabel(timebar->GetTimebarComment().toQString());
+        m_commentItem->setLabel(timebar->GetTimebarComment());
     }
 }
 
@@ -888,6 +885,7 @@ void RowTimeline::updateCommentItemPos()
 {
     if (!m_commentItem)
         return;
+
     Ruler *ruler = m_rowTree->m_scene->ruler();
     m_commentItem->setPos(TimelineConstants::RULER_EDGE_OFFSET + ruler->viewportX(),
                          -TimelineConstants::ROW_TEXT_OFFSET_Y);
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimelineCommentItem.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimelineCommentItem.cpp
index 4ba976d6..1bfb7163 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimelineCommentItem.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimelineCommentItem.cpp
@@ -33,7 +33,6 @@
 #include "StudioPreferences.h"
 
 #include <QtWidgets/qstyleoption.h>
-#include <QtCore/qdebug.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qtextcursor.h>
 #include <QtGui/qpainter.h>