Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3206] trunk/OpenMPT
|
From: <man...@us...> - 2013-11-13 18:05:30
|
Revision: 3206
http://sourceforge.net/p/modplug/code/3206
Author: manxorist
Date: 2013-11-13 18:05:18 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
[Ref] Replace last occurence of mpt::string with std::string.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/soundlib/ModSequence.cpp
trunk/OpenMPT/soundlib/ModSequence.h
trunk/OpenMPT/test/test.cpp
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2013-11-13 17:45:06 UTC (rev 3205)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2013-11-13 18:05:18 UTC (rev 3206)
@@ -192,7 +192,7 @@
m_SpinSequence.SetRange(0, m_sndFile.Order.GetNumSequences() - 1);
m_SpinSequence.SetPos(m_sndFile.Order.GetCurrentSequenceIndex());
- SetDlgItemText(IDC_EDIT_SEQUENCE_NAME, m_sndFile.Order.m_sName);
+ SetDlgItemText(IDC_EDIT_SEQUENCE_NAME, m_sndFile.Order.GetName().c_str());
m_OrderList.SetFocus();
@@ -243,7 +243,7 @@
if(dwHintMask & HINT_MODSEQUENCE)
{
- SetDlgItemText(IDC_EDIT_SEQUENCE_NAME, m_sndFile.Order.m_sName);
+ SetDlgItemText(IDC_EDIT_SEQUENCE_NAME, m_sndFile.Order.GetName().c_str());
}
if(dwHintMask & (HINT_MODSEQUENCE|HINT_MODTYPE))
{
@@ -1093,9 +1093,9 @@
{
CString str;
GetDlgItemText(IDC_EDIT_SEQUENCE_NAME, str);
- if (str != m_sndFile.Order.m_sName)
+ if(str != m_sndFile.Order.GetName().c_str())
{
- m_sndFile.Order.m_sName = str.GetString();
+ m_sndFile.Order.SetName(str.GetString());
m_modDoc.SetModified();
m_modDoc.UpdateAllViews(NULL, (m_sndFile.Order.GetCurrentSequenceIndex() << HINT_SHIFT_SEQUENCE) | HINT_SEQNAMES, this);
}
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2013-11-13 17:45:06 UTC (rev 3205)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2013-11-13 18:05:18 UTC (rev 3206)
@@ -1008,10 +1008,10 @@
for(SEQUENCEINDEX i = 0; i < numSequences; i++)
{
CString str;
- if(sndFile.Order.GetSequence(i).m_sName.empty())
+ if(sndFile.Order.GetSequence(i).GetName().empty())
str.Format(TEXT("Sequence %u"), i);
else
- str.Format(TEXT("%u: %s"), i, (LPCTSTR)sndFile.Order.GetSequence(i).m_sName);
+ str.Format(TEXT("%u: %s"), i, sndFile.Order.GetSequence(i).GetName().c_str());
const UINT flags = (sndFile.Order.GetCurrentSequenceIndex() == i) ? MF_STRING|MF_CHECKED : MF_STRING;
AppendMenu(menuSequence, flags, ID_SEQUENCE_ITEM + i, str);
}
@@ -1345,7 +1345,7 @@
CSoundFile &sndFile = m_pModDoc.GetrSoundFile();
if(nSeq == MAX_SEQUENCES + 2)
{
- std::wstring str = L"Delete sequence " + StringifyW(sndFile.Order.GetCurrentSequenceIndex()) + L": " + mpt::String::Decode(sndFile.Order.m_sName, mpt::CharsetLocale) + L"?";
+ std::wstring str = L"Delete sequence " + StringifyW(sndFile.Order.GetCurrentSequenceIndex()) + L": " + mpt::String::Decode(sndFile.Order.GetName(), mpt::CharsetLocale) + L"?";
if (Reporting::Confirm(str) == cnfYes)
sndFile.Order.RemoveSequence();
else
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2013-11-13 17:45:06 UTC (rev 3205)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2013-11-13 18:05:18 UTC (rev 3206)
@@ -794,7 +794,7 @@
// Adjust caption of the "Sequence" node (if only one sequence exists, it should be labeled with the sequence name)
if(((hintFlagPart & HINT_SEQNAMES) && sndFile.Order.GetNumSequences() == 1) || adjustParentNode)
{
- CString seqName = sndFile.Order.GetSequence(0).m_sName;
+ CString seqName = sndFile.Order.GetSequence(0).GetName().c_str();
if(seqName.IsEmpty() || sndFile.Order.GetNumSequences() > 1)
seqName = _T("Sequence");
else
@@ -809,10 +809,10 @@
{
// more than one sequence -> add folder
CString sSeqName;
- if(sndFile.Order.GetSequence(nSeq).m_sName.empty())
+ if(sndFile.Order.GetSequence(nSeq).GetName().empty())
sSeqName.Format("Sequence %u", nSeq);
else
- sSeqName.Format("%u: %s", nSeq, (LPCTSTR)sndFile.Order.GetSequence(nSeq).m_sName);
+ sSeqName.Format("%u: %s", nSeq, sndFile.Order.GetSequence(nSeq).GetName().c_str());
UINT state = (nSeq == sndFile.Order.GetCurrentSequenceIndex()) ? TVIS_BOLD : 0;
@@ -3430,7 +3430,7 @@
case MODITEM_SEQUENCE:
if(modItem.val1 < sndFile.Order.GetNumSequences())
{
- text = sndFile.Order.GetSequence(static_cast<SEQUENCEINDEX>(modItem.val1)).m_sName;
+ text = sndFile.Order.GetSequence(static_cast<SEQUENCEINDEX>(modItem.val1)).GetName();
doLabelEdit = true;
}
break;
@@ -3523,9 +3523,9 @@
case MODITEM_HDR_ORDERS:
case MODITEM_SEQUENCE:
- if(modItem.val1 < sndFile.Order.GetNumSequences() && sndFile.Order.GetSequence(static_cast<SEQUENCEINDEX>(modItem.val1)).m_sName != info->item.pszText)
+ if(modItem.val1 < sndFile.Order.GetNumSequences() && sndFile.Order.GetSequence(static_cast<SEQUENCEINDEX>(modItem.val1)).GetName() != info->item.pszText)
{
- sndFile.Order.GetSequence(static_cast<SEQUENCEINDEX>(modItem.val1)).m_sName = info->item.pszText;
+ sndFile.Order.GetSequence(static_cast<SEQUENCEINDEX>(modItem.val1)).SetName(info->item.pszText);
modDoc->SetModified();
modDoc->UpdateAllViews(NULL, HINT_SEQNAMES | HINT_MODSEQUENCE | ((modItem.val1) << HINT_SHIFT_SEQUENCE), NULL);
}
Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp 2013-11-13 17:45:06 UTC (rev 3205)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp 2013-11-13 18:05:18 UTC (rev 3206)
@@ -669,6 +669,20 @@
#endif // MODPLUG_TRACKER
+void ModSequence::SetName(const std::string &newName)
+//---------------------------------------------------
+{
+ m_sName = newName;
+}
+
+
+std::string ModSequence::GetName() const
+//--------------------------------------
+{
+ return m_sName;
+}
+
+
/////////////////////////////////////
// Read/Write
/////////////////////////////////////
Modified: trunk/OpenMPT/soundlib/ModSequence.h
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.h 2013-11-13 17:45:06 UTC (rev 3205)
+++ trunk/OpenMPT/soundlib/ModSequence.h 2013-11-13 18:05:18 UTC (rev 3206)
@@ -115,16 +115,20 @@
bool IsPositionLocked(ORDERINDEX position);
#endif // MODPLUG_TRACKER
+ // Sequence name setter
+ void SetName(const std::string &newName);
+
+ // Sequence name getter
+ std::string GetName() const;
-
protected:
iterator begin() {return m_pArray;}
const_iterator begin() const {return m_pArray;}
iterator end() {return m_pArray + m_nSize;}
const_iterator end() const {return m_pArray + m_nSize;}
-public:
- mpt::string m_sName; // Sequence name.
+protected:
+ std::string m_sName; // Sequence name.
protected:
CSoundFile &m_sndFile; // Pointer to associated CSoundFile.
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp 2013-11-13 17:45:06 UTC (rev 3205)
+++ trunk/OpenMPT/test/test.cpp 2013-11-13 18:05:18 UTC (rev 3206)
@@ -1278,13 +1278,13 @@
VERIFY_EQUAL_NONCONT(sndFile.Order.GetNumSequences(), 2);
VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(0).GetLengthTailTrimmed(), 3);
- VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(0).m_sName, "First Sequence");
+ VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(0).GetName(), "First Sequence");
VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(0)[0], sndFile.Order.GetIgnoreIndex());
VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(0)[1], 0);
VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(0)[2], sndFile.Order.GetIgnoreIndex());
VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(1).GetLengthTailTrimmed(), 2);
- VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(1).m_sName, "Second Sequence");
+ VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(1).GetName(), "Second Sequence");
VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(1)[0], 1);
VERIFY_EQUAL_NONCONT(sndFile.Order.GetSequence(1)[1], 2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
