diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-03-29 16:23:09 +0200 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-03-29 15:46:22 +0000 |
commit | 82df70d5442aaf45f58ec4f881681c54aec1f237 (patch) | |
tree | 239996ca1777b4e69a37bedf5a04a8cc9f4e903e /src/Authoring/Studio/Palettes | |
parent | 2a7c460e0478042329feee9f31bfbc4c784cb047 (diff) |
Change timeline comment datatype to QString
Change-Id: Idf27515b2e0589e228ac4fd048168281ad2246bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes')
7 files changed, 18 insertions, 22 deletions
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> |