Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4872] trunk/OpenMPT
|
From: <man...@us...> - 2015-03-11 16:21:48
|
Revision: 4872
http://sourceforge.net/p/modplug/code/4872
Author: manxorist
Date: 2015-03-11 16:21:42 +0000 (Wed, 11 Mar 2015)
Log Message:
-----------
[Ref] Kill Stringify and StringifyW.
Modified Paths:
--------------
trunk/OpenMPT/common/mptString.h
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/TuningDialog.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/tuningRatioMapWnd.cpp
Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/common/mptString.h 2015-03-11 16:21:42 UTC (rev 4872)
@@ -929,13 +929,6 @@
} // namespace mpt
-#ifdef MODPLUG_TRACKER
-#define Stringify(x) mpt::ToString(x)
-#if MPT_WSTRING_FORMAT
-#define StringifyW(x) mpt::ToWString(x)
-#endif
-#endif
-
namespace mpt { namespace String {
namespace detail
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2015-03-11 16:21:42 UTC (rev 4872)
@@ -1344,7 +1344,7 @@
m_EditPitchTempoLock.EnableWindow(pIns->wPitchToTempoLock > 0 ? TRUE : FALSE);
if(pIns->wPitchToTempoLock > 0)
{
- m_EditPitchTempoLock.SetWindowText(Stringify(pIns->wPitchToTempoLock).c_str());
+ m_EditPitchTempoLock.SetWindowText(mpt::ToString(pIns->wPitchToTempoLock).c_str());
}
// Pitch Wheel Depth
@@ -1561,7 +1561,7 @@
// Pitch/Tempo lock
{
const CModSpecifications& specs = m_sndFile.GetModSpecifications();
- std::string str = std::string("Tempo range: ") + Stringify(specs.tempoMin) + std::string(" - ") + Stringify(specs.tempoMax);
+ std::string str = std::string("Tempo range: ") + mpt::ToString(specs.tempoMin) + std::string(" - ") + mpt::ToString(specs.tempoMax);
if(str.size() >= 250) str.resize(250);
strcpy(pszText, str.c_str());
return TRUE;
@@ -2755,7 +2755,7 @@
{
ptl = m_sndFile.m_nDefaultTempo;
}
- m_EditPitchTempoLock.SetWindowText(Stringify(ptl).c_str());
+ m_EditPitchTempoLock.SetWindowText(mpt::ToString(ptl).c_str());
for(INSTRUMENTINDEX i = firstIns; i <= lastIns; i++)
{
@@ -2818,7 +2818,7 @@
changed = true;
}
- if(changed) m_EditPitchTempoLock.SetWindowText(Stringify(ptlTempo).c_str());
+ if(changed) m_EditPitchTempoLock.SetWindowText(mpt::ToString(ptlTempo).c_str());
}
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2015-03-11 16:21:42 UTC (rev 4872)
@@ -1385,7 +1385,7 @@
const bool editSequence = nSeq >= sndFile.Order.GetNumSequences();
if(nSeq == MAX_SEQUENCES + 2)
{
- std::wstring str = L"Delete sequence " + StringifyW(sndFile.Order.GetCurrentSequenceIndex()) + L": " + mpt::ToWide(mpt::CharsetLocale, sndFile.Order.GetName()) + L"?";
+ std::wstring str = L"Delete sequence " + mpt::ToWString(sndFile.Order.GetCurrentSequenceIndex()) + L": " + mpt::ToWide(mpt::CharsetLocale, sndFile.Order.GetName()) + L"?";
if (Reporting::Confirm(str) == cnfYes)
sndFile.Order.RemoveSequence();
else
Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2015-03-11 16:21:42 UTC (rev 4872)
@@ -186,7 +186,7 @@
m_eReport.FmtLines(TRUE);
m_eReport.SetWindowText("");
- m_eChordWaitTime.SetWindowText(Stringify(TrackerSettings::Instance().gnAutoChordWaitTime).c_str());
+ m_eChordWaitTime.SetWindowText(mpt::ToString(TrackerSettings::Instance().gnAutoChordWaitTime).c_str());
return TRUE;
}
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2015-03-11 16:21:42 UTC (rev 4872)
@@ -2904,7 +2904,7 @@
mpt::PathString sName;
for(size_t i = 0; i < 1000; ++i)
{
- sName += MPT_PATHSTRING("newTemplate") + mpt::PathString::FromWide(StringifyW(i));
+ sName += MPT_PATHSTRING("newTemplate") + mpt::PathString::FromWide(mpt::ToWString(i));
sName += MPT_PATHSTRING(".") + mpt::PathString::FromUTF8(m_SndFile.GetModSpecifications().fileExtension);
if (!Util::sdOs::IsPathFileAvailable(templateFolder + sName, Util::sdOs::FileModeExists))
break;
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-03-11 16:21:42 UTC (rev 4872)
@@ -1039,7 +1039,7 @@
{
cc += ",";
}
- cc += Stringify(i);
+ cc += mpt::ToString(i);
first = false;
}
}
Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.cpp 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/mptrack/TuningDialog.cpp 2015-03-11 16:21:42 UTC (rev 4872)
@@ -252,7 +252,7 @@
m_EditTuningCollectionName.SetWindowText(m_pActiveTuningCollection->GetName().c_str());
m_EditTuningCollectionVersion.SetWindowText(m_pActiveTuningCollection->GetVersionString().c_str());
m_EditTuningCollectionEditMask.SetWindowText(m_pActiveTuningCollection->GetEditMaskString().c_str());
- m_EditTuningCollectionItemNum.SetWindowText(Stringify(m_pActiveTuningCollection->GetNumTunings()).c_str());
+ m_EditTuningCollectionItemNum.SetWindowText(mpt::ToString(m_pActiveTuningCollection->GetNumTunings()).c_str());
::SetWindowTextW(m_EditTuningCollectionPath.m_hWnd, m_pActiveTuningCollection->GetSaveFilePath().ToWide().c_str());
}
//<-- Updating tuning collection part
@@ -266,7 +266,7 @@
m_EditName.Invalidate();
//Finetunesteps-edit
- m_EditFineTuneSteps.SetWindowText(Stringify(m_pActiveTuning->GetFineStepCount()).c_str());
+ m_EditFineTuneSteps.SetWindowText(mpt::ToString(m_pActiveTuning->GetFineStepCount()).c_str());
m_EditFineTuneSteps.Invalidate();
//Making sure that ratiomap window is showing and
@@ -282,10 +282,10 @@
if(period > 0)
{
m_EditSteps.EnableWindow();
- m_EditSteps.SetWindowText(Stringify(period).c_str());
+ m_EditSteps.SetWindowText(mpt::ToString(period).c_str());
m_EditRatioPeriod.EnableWindow();
- m_EditRatioPeriod.SetWindowText(Stringify(GroupRatio).c_str());
+ m_EditRatioPeriod.SetWindowText(mpt::ToString(GroupRatio).c_str());
}
else //case: m_pActiveTuning is of type general.
{
@@ -607,7 +607,7 @@
return;
m_RatioEditApply = false;
- m_EditRatio.SetWindowText(Stringify(m_pActiveTuning->GetRatio(note)).c_str());
+ m_EditRatio.SetWindowText(mpt::ToString(m_pActiveTuning->GetRatio(note)).c_str());
m_NoteEditApply = false;
m_EditNotename.SetWindowText(m_pActiveTuning->GetNoteName(note).c_str());
@@ -718,7 +718,7 @@
delete pT; pT = nullptr;
if (m_TempTunings.GetNumTunings() >= CTuningCollection::s_nMaxTuningCount)
{
- sLoadReport += L"-Failed to load file " + fileNameExt + L": maximum number(" + StringifyW(CTuningCollection::s_nMaxTuningCount) + L") of temporary tunings is already open.\n";
+ sLoadReport += L"-Failed to load file " + fileNameExt + L": maximum number(" + mpt::ToWString(CTuningCollection::s_nMaxTuningCount) + L") of temporary tunings is already open.\n";
}
else // Case: Can't add tuning to tuning collection for unknown reason.
{
@@ -736,7 +736,7 @@
{
if (a == enSclImportAddTuningFailure && m_TempTunings.GetNumTunings() >= CTuningCollection::s_nMaxTuningCount)
{
- sLoadReport += L"-Failed to load file " + fileNameExt + L": maximum number(" + StringifyW(CTuningCollection::s_nMaxTuningCount) + L") of temporary tunings is already open.\n";
+ sLoadReport += L"-Failed to load file " + fileNameExt + L": maximum number(" + mpt::ToWString(CTuningCollection::s_nMaxTuningCount) + L") of temporary tunings is already open.\n";
}
else
{
@@ -797,7 +797,7 @@
const BYTE BS = 5;
char buffer[BS];
m_EditFineTuneSteps.GetWindowText(buffer, BS);
- m_EditFineTuneSteps.SetWindowText(Stringify(m_pActiveTuning->SetFineStepCount(ConvertStrTo<CTuning::USTEPINDEXTYPE>(buffer))).c_str());
+ m_EditFineTuneSteps.SetWindowText(mpt::ToString(m_pActiveTuning->SetFineStepCount(ConvertStrTo<CTuning::USTEPINDEXTYPE>(buffer))).c_str());
m_ModifiedTCs[GetpTuningCollection(m_pActiveTuning)] = true;
m_EditFineTuneSteps.Invalidate();
}
@@ -1407,7 +1407,7 @@
switch(id)
{
case enSclImportFailTooManyNotes:
- AfxFormatString1(sMsg, IDS_SCL_IMPORT_FAIL_8, Stringify(s_nSclImportMaxNoteCount).c_str());
+ AfxFormatString1(sMsg, IDS_SCL_IMPORT_FAIL_8, mpt::ToString(s_nSclImportMaxNoteCount).c_str());
return sMsg;
case enSclImportFailTooLargeNumDenomIntegers:
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2015-03-11 16:21:42 UTC (rev 4872)
@@ -514,7 +514,7 @@
for(UINT iMidi = 0; iMidi < 128; iMidi++)
{
DWORD dwImage = IMAGE_INSTRMUTE;
- s = StringifyW(iMidi) + L": " + mpt::ToWide(mpt::CharsetASCII, szMidiProgramNames[iMidi]);
+ s = mpt::ToWString(iMidi) + L": " + mpt::ToWide(mpt::CharsetASCII, szMidiProgramNames[iMidi]);
const LPARAM param = (MODITEM_MIDIINSTRUMENT << MIDILIB_SHIFT) | iMidi;
if(!midiLib.MidiMap[iMidi].empty())
{
@@ -3658,7 +3658,7 @@
else if(pat == sndFile.Order.GetIgnoreIndex())
text = "+++";
else
- text = Stringify(pat);
+ text = mpt::ToString(pat);
doLabelEdit = true;
}
break;
Modified: trunk/OpenMPT/mptrack/tuningRatioMapWnd.cpp
===================================================================
--- trunk/OpenMPT/mptrack/tuningRatioMapWnd.cpp 2015-03-11 15:56:44 UTC (rev 4871)
+++ trunk/OpenMPT/mptrack/tuningRatioMapWnd.cpp 2015-03-11 16:21:42 UTC (rev 4872)
@@ -80,7 +80,7 @@
std::string temp;
if(isValidNote)
{
- temp = "(" + Stringify(noteToDraw) + ") " + m_pTuning->GetNoteName(noteToDraw);
+ temp = "(" + mpt::ToString(noteToDraw) + ") " + m_pTuning->GetNoteName(noteToDraw);
}
if(isValidNote && temp.size()+1 < sizeofS)
@@ -104,7 +104,7 @@
rect.InflateRect(1, 1);
}
dc.SetTextColor((bHighLight) ? colorTextSel : colorText);
- std::string str = Stringify(m_pTuning->GetRatio(noteToDraw));
+ std::string str = mpt::ToString(m_pTuning->GetRatio(noteToDraw));
dc.DrawText(str.c_str(), -1, &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
}
rect.SetRect(rcClient.left+m_cxFont*2-1, rcClient.top, rcClient.left+m_cxFont*2+3, ypaint);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
