birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating PR to change lower API to return AZStd::string instead of const char* for safety.

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-08-25 15:28:42 -05:00
parent d64c034fee
commit d211771253
57 changed files with 142 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
+3 -3
View File
@@ -992,7 +992,7 @@ void CUiAnimViewDialog::ReloadSequencesComboBox()
for (unsigned int k = 0; k < numSequences; ++k)
{
CUiAnimViewSequence* pSequence = pSequenceManager->GetSequenceByIndex(k);
QString fullname = pSequence->GetName();
QString fullname = QString::fromUtf8(pSequence->GetName().c_str());
m_sequencesComboBox->addItem(fullname);
}
}
@@ -1132,7 +1132,7 @@ void CUiAnimViewDialog::OnSequenceChanged(CUiAnimViewSequence* pSequence)
if (pSequence)
{
m_currentSequenceName = pSequence->GetName();
m_currentSequenceName = QString::fromUtf8(pSequence->GetName().c_str());
pSequence->Reset(true);
SaveZoomScrollSettings();
@@ -1733,7 +1733,7 @@ void CUiAnimViewDialog::OnNodeRenamed(CUiAnimViewNode* pNode, const char* pOldNa
{
if (m_currentSequenceName == QString(pOldName))
{
m_currentSequenceName = pNode->GetName();
m_currentSequenceName = QString::fromUtf8(pNode->GetName().c_str());
}
ReloadSequencesComboBox();