Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3213] trunk/OpenMPT
|
From: <man...@us...> - 2013-11-14 17:27:57
|
Revision: 3213
http://sourceforge.net/p/modplug/code/3213
Author: manxorist
Date: 2013-11-14 17:27:46 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
[Ref] Rename CharsetUS_ASCII to simply CharsetASCII.
Modified Paths:
--------------
trunk/OpenMPT/common/mptString.cpp
trunk/OpenMPT/common/mptString.h
trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
trunk/OpenMPT/mptrack/Settings.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/test/test.cpp
Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp 2013-11-13 22:31:02 UTC (rev 3212)
+++ trunk/OpenMPT/common/mptString.cpp 2013-11-14 17:27:46 UTC (rev 3213)
@@ -65,7 +65,7 @@
{
case CharsetLocale: return CP_ACP; break;
case CharsetUTF8: return CP_UTF8; break;
- case CharsetUS_ASCII: return 20127; break;
+ case CharsetASCII: return 20127; break;
case CharsetISO8859_1: return 28591; break;
case CharsetISO8859_15: return 28605; break;
case CharsetCP437: return 437; break;
@@ -80,7 +80,7 @@
{
case CharsetLocale: return ""; break; // "char" breaks with glibc when no locale is set
case CharsetUTF8: return "UTF-8"; break;
- case CharsetUS_ASCII: return "ASCII"; break;
+ case CharsetASCII: return "ASCII"; break;
case CharsetISO8859_1: return "ISO-8859-1"; break;
case CharsetISO8859_15: return "ISO-8859-15"; break;
case CharsetCP437: return "CP437"; break;
@@ -94,7 +94,7 @@
{
case CharsetLocale: return "//TRANSLIT"; break; // "char" breaks with glibc when no locale is set
case CharsetUTF8: return "UTF-8//TRANSLIT"; break;
- case CharsetUS_ASCII: return "ASCII//TRANSLIT"; break;
+ case CharsetASCII: return "ASCII//TRANSLIT"; break;
case CharsetISO8859_1: return "ISO-8859-1//TRANSLIT"; break;
case CharsetISO8859_15: return "ISO-8859-15//TRANSLIT"; break;
case CharsetCP437: return "CP437//TRANSLIT"; break;
Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h 2013-11-13 22:31:02 UTC (rev 3212)
+++ trunk/OpenMPT/common/mptString.h 2013-11-14 17:27:46 UTC (rev 3213)
@@ -140,7 +140,7 @@
CharsetUTF8,
- CharsetUS_ASCII, // strictly 7-bit ASCII
+ CharsetASCII, // strictly 7-bit ASCII
CharsetISO8859_1,
CharsetISO8859_15,
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp 2013-11-13 22:31:02 UTC (rev 3212)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp 2013-11-14 17:27:46 UTC (rev 3213)
@@ -221,16 +221,16 @@
std::string module_impl::mod_string_to_utf8( const std::string & encoded ) const {
std::string encoding = m_sndFile->GetCharset().second;
std::transform( encoding.begin(), encoding.end(), encoding.begin(), tolower );
- mpt::Charset charset = mpt::CharsetUS_ASCII;
- if ( encoding == "" ) { charset = mpt::CharsetUS_ASCII; } // fallback
+ mpt::Charset charset = mpt::CharsetASCII;
+ if ( encoding == "" ) { charset = mpt::CharsetASCII; } // fallback
else if ( encoding == "utf-8" ) { charset = mpt::CharsetUTF8; }
- else if ( encoding == "ascii" ) { charset = mpt::CharsetUS_ASCII; }
- else if ( encoding == "us-ascii" ) { charset = mpt::CharsetUS_ASCII; }
+ else if ( encoding == "ascii" ) { charset = mpt::CharsetASCII; }
+ else if ( encoding == "us-ascii" ) { charset = mpt::CharsetASCII; }
else if ( encoding == "iso-8859-1" ) { charset = mpt::CharsetISO8859_1; }
else if ( encoding == "iso-8859-15" ) { charset = mpt::CharsetISO8859_15; }
else if ( encoding == "cp437" ) { charset = mpt::CharsetCP437; }
else if ( encoding == "windows-1252" ) { charset = mpt::CharsetWindows1252; }
- else { charset = mpt::CharsetUS_ASCII; } // fallback
+ else { charset = mpt::CharsetASCII; } // fallback
return mpt::String::Convert( encoded, charset, mpt::CharsetUTF8 );
}
void module_impl::apply_mixer_settings( std::int32_t samplerate, int channels ) {
Modified: trunk/OpenMPT/mptrack/Settings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Settings.cpp 2013-11-13 22:31:02 UTC (rev 3212)
+++ trunk/OpenMPT/mptrack/Settings.cpp 2013-11-14 17:27:46 UTC (rev 3213)
@@ -113,7 +113,7 @@
}
if(HasTypeTag() && !GetTypeTag().empty())
{
- result += L":" + mpt::String::Decode(GetTypeTag(), mpt::CharsetUS_ASCII);
+ result += L":" + mpt::String::Decode(GetTypeTag(), mpt::CharsetASCII);
}
return result;
}
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2013-11-13 22:31:02 UTC (rev 3212)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2013-11-14 17:27:46 UTC (rev 3213)
@@ -448,7 +448,7 @@
for(UINT iMidi = 0; iMidi < 128; iMidi++)
{
DWORD dwImage = IMAGE_NOINSTRUMENT;
- s = StringifyW(iMidi) + L": " + mpt::String::Decode(szMidiProgramNames[iMidi], mpt::CharsetUS_ASCII);
+ s = StringifyW(iMidi) + L": " + mpt::String::Decode(szMidiProgramNames[iMidi], mpt::CharsetASCII);
const LPARAM param = (MODITEM_MIDIINSTRUMENT << MIDILIB_SHIFT) | iMidi;
if(!midiLib.MidiMap[iMidi].empty())
{
@@ -482,7 +482,7 @@
for (UINT iPerc=24; iPerc<=84; iPerc++)
{
DWORD dwImage = IMAGE_NOSAMPLE;
- s = mpt::String::Decode(szDefaultNoteNames[iPerc], mpt::CharsetUS_ASCII) + L": " + mpt::String::Decode(szMidiPercussionNames[iPerc - 24], mpt::CharsetUS_ASCII);
+ s = mpt::String::Decode(szDefaultNoteNames[iPerc], mpt::CharsetUS_ASCII) + L": " + mpt::String::Decode(szMidiPercussionNames[iPerc - 24], mpt::CharsetASCII);
const LPARAM param = (MODITEM_MIDIPERCUSSION << MIDILIB_SHIFT) | iPerc;
if(!midiLib.MidiMap[iPerc | 0x80].empty())
{
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp 2013-11-13 22:31:02 UTC (rev 3212)
+++ trunk/OpenMPT/test/test.cpp 2013-11-14 17:27:46 UTC (rev 3213)
@@ -700,11 +700,11 @@
VERIFY_EQUAL(mpt::String::Encode(L"a", mpt::CharsetLocale), "a");
VERIFY_EQUAL(mpt::String::Encode(L"a", mpt::CharsetUTF8), "a");
VERIFY_EQUAL(mpt::String::Encode(L"a", mpt::CharsetISO8859_1), "a");
- VERIFY_EQUAL(mpt::String::Encode(L"a", mpt::CharsetUS_ASCII), "a");
+ VERIFY_EQUAL(mpt::String::Encode(L"a", mpt::CharsetASCII), "a");
VERIFY_EQUAL(mpt::String::Decode("a", mpt::CharsetLocale), L"a");
VERIFY_EQUAL(mpt::String::Decode("a", mpt::CharsetUTF8), L"a");
VERIFY_EQUAL(mpt::String::Decode("a", mpt::CharsetISO8859_1), L"a");
- VERIFY_EQUAL(mpt::String::Decode("a", mpt::CharsetUS_ASCII), L"a");
+ VERIFY_EQUAL(mpt::String::Decode("a", mpt::CharsetASCII), L"a");
// Path conversions
#ifdef MODPLUG_TRACKER
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
