Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4324] trunk/OpenMPT
|
From: <man...@us...> - 2014-09-29 12:22:02
|
Revision: 4324
http://sourceforge.net/p/modplug/code/4324
Author: manxorist
Date: 2014-09-29 12:21:46 +0000 (Mon, 29 Sep 2014)
Log Message:
-----------
[Ref] Rename mpt::To(Charset to, string) to mpt::ToCharset(Charset to, string).
Modified Paths:
--------------
trunk/OpenMPT/common/Logging.cpp
trunk/OpenMPT/common/mptPathString.cpp
trunk/OpenMPT/common/mptPathString.h
trunk/OpenMPT/common/mptString.cpp
trunk/OpenMPT/common/mptString.h
trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
trunk/OpenMPT/mptrack/AboutDialog.cpp
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/sounddev/SoundDevice.h
trunk/OpenMPT/soundlib/Load_ams.cpp
trunk/OpenMPT/soundlib/Load_itp.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/WAVTools.cpp
trunk/OpenMPT/test/test.cpp
trunk/OpenMPT/unarchiver/unarchiver.cpp
Modified: trunk/OpenMPT/common/Logging.cpp
===================================================================
--- trunk/OpenMPT/common/Logging.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/common/Logging.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -128,7 +128,7 @@
}
if(s_logfile)
{
- fprintf(s_logfile, "%s+%s %s(%i): %s [%s]\n", TimeAsAsString(cur).c_str(), TimeDiffAsString(diff).c_str(), context.file, context.line, mpt::To(mpt::CharsetUTF8, message).c_str(), context.function);
+ fprintf(s_logfile, "%s+%s %s(%i): %s [%s]\n", TimeAsAsString(cur).c_str(), TimeDiffAsString(diff).c_str(), context.file, context.line, mpt::ToCharset(mpt::CharsetUTF8, message).c_str(), context.function);
fflush(s_logfile);
}
}
@@ -143,7 +143,7 @@
#if defined(MPT_WITH_CHARSET_LOCALE)
<< mpt::ToLocale(message)
#else
- << mpt::To(mpt::CharsetUTF8, message)
+ << mpt::ToCharset(mpt::CharsetUTF8, message)
#endif
<< " [" << context.function << "]"
<< std::endl;
Modified: trunk/OpenMPT/common/mptPathString.cpp
===================================================================
--- trunk/OpenMPT/common/mptPathString.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/common/mptPathString.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -174,7 +174,7 @@
// that filenames we get from MFC are always encoded in our hacked UTF8-in-CString encoding.
// Instead, we use a rough heuristic: if the string is parseable as UTF8, we assume it is.
// This fails for CP_ACP strings, that are also valid UTF8. That's the trade-off here.
- if(mpt::To(mpt::CharsetUTF8, mpt::ToWide(mpt::CharsetUTF8, path.GetString())) == path.GetString())
+ if(mpt::ToCharset(mpt::CharsetUTF8, mpt::ToWide(mpt::CharsetUTF8, path.GetString())) == path.GetString())
{
// utf8
return mpt::PathString::FromUTF8(path.GetString());
@@ -228,7 +228,7 @@
#if defined(MPT_WITH_CHARSET_LOCALE)
return fopen(filename.AsNative().c_str(), mode ? mpt::ToLocale(mode).c_str() : nullptr);
#else
- return fopen(filename.AsNative().c_str(), mode ? mpt::To(mpt::CharsetUTF8, mode).c_str() : nullptr);
+ return fopen(filename.AsNative().c_str(), mode ? mpt::ToCharset(mpt::CharsetUTF8, mode).c_str() : nullptr);
#endif
#endif // MPT_OS_WINDOWS
}
Modified: trunk/OpenMPT/common/mptPathString.h
===================================================================
--- trunk/OpenMPT/common/mptPathString.h 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/common/mptPathString.h 2014-09-29 12:21:46 UTC (rev 4324)
@@ -138,7 +138,7 @@
#if defined(MPT_WITH_CHARSET_LOCALE)
MPT_DEPRECATED_PATH std::string ToLocale() const { return mpt::ToLocale(path); }
#endif
- std::string ToUTF8() const { return mpt::To(mpt::CharsetUTF8, path); }
+ std::string ToUTF8() const { return mpt::ToCharset(mpt::CharsetUTF8, path); }
std::wstring ToWide() const { return path; }
#if defined(MPT_WITH_CHARSET_LOCALE)
MPT_DEPRECATED_PATH static PathString FromLocale(const std::string &path) { return PathString(mpt::ToWide(mpt::CharsetLocale, path)); }
@@ -172,18 +172,18 @@
// conversions
#if defined(MPT_WITH_CHARSET_LOCALE)
std::string ToLocale() const { return path; }
- std::string ToUTF8() const { return mpt::To(mpt::CharsetUTF8, mpt::CharsetLocale, path); }
+ std::string ToUTF8() const { return mpt::ToCharset(mpt::CharsetUTF8, mpt::CharsetLocale, path); }
std::wstring ToWide() const { return mpt::ToWide(mpt::CharsetLocale, path); }
static PathString FromLocale(const std::string &path) { return PathString(path); }
- static PathString FromUTF8(const std::string &path) { return PathString(mpt::To(mpt::CharsetLocale, mpt::CharsetUTF8, path)); }
- static PathString FromWide(const std::wstring &path) { return PathString(mpt::To(mpt::CharsetLocale, path)); }
+ static PathString FromUTF8(const std::string &path) { return PathString(mpt::ToCharset(mpt::CharsetLocale, mpt::CharsetUTF8, path)); }
+ static PathString FromWide(const std::wstring &path) { return PathString(mpt::ToCharset(mpt::CharsetLocale, path)); }
RawPathString AsNative() const { return path; }
static PathString FromNative(const RawPathString &path) { return PathString(path); }
#else
std::string ToUTF8() const { return path; }
std::wstring ToWide() const { return mpt::ToWide(mpt::CharsetUTF8, path); }
static PathString FromUTF8(const std::string &path) { return path; }
- static PathString FromWide(const std::wstring &path) { return PathString(mpt::To(mpt::CharsetUTF8, path)); }
+ static PathString FromWide(const std::wstring &path) { return PathString(mpt::ToCharset(mpt::CharsetUTF8, path)); }
RawPathString AsNative() const { return path; }
static PathString FromNative(const RawPathString &path) { return PathString(path); }
#endif
Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/common/mptString.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -1012,11 +1012,11 @@
return String::DecodeImpl(from, str);
}
-std::string To(Charset to, const std::wstring &str)
+std::string ToCharset(Charset to, const std::wstring &str)
{
return String::EncodeImpl<std::string>(to, str);
}
-std::string To(Charset to, Charset from, const std::string &str)
+std::string ToCharset(Charset to, Charset from, const std::string &str)
{
return String::ConvertImpl<std::string>(to, from, str);
}
@@ -1048,12 +1048,12 @@
return ToWide(CharsetLocale, str.GetString());
#endif
}
-std::string To(Charset to, const CString &str)
+std::string ToCharset(Charset to, const CString &str)
{
#ifdef UNICODE
- return To(to, str.GetString());
+ return ToCharset(to, str.GetString());
#else
- return To(to, CharsetLocale, str.GetString());
+ return ToCharset(to, CharsetLocale, str.GetString());
#endif
}
@@ -1080,9 +1080,9 @@
{
return str.GetString();
}
-std::string To(Charset to, const CStringW &str)
+std::string ToCharset(Charset to, const CStringW &str)
{
- return To(to, str.GetString());
+ return ToCharset(to, str.GetString());
}
CString ToCString(const CStringW &str)
{
@@ -1131,10 +1131,10 @@
std::string ToString(const char & x) { return std::string(1, x); }
std::string ToString(const wchar_t & x) { return mpt::ToLocale(std::wstring(1, x)); }
#else
-std::string ToString(const std::wstring & x) { return mpt::To(mpt::CharsetUTF8, x); }
-std::string ToString(const wchar_t * const & x) { return mpt::To(mpt::CharsetUTF8, x); }
+std::string ToString(const std::wstring & x) { return mpt::ToCharset(mpt::CharsetUTF8, x); }
+std::string ToString(const wchar_t * const & x) { return mpt::ToCharset(mpt::CharsetUTF8, x); }
std::string ToString(const char & x) { return std::string(1, x); }
-std::string ToString(const wchar_t & x) { return mpt::To(mpt::CharsetUTF8, std::wstring(1, x)); }
+std::string ToString(const wchar_t & x) { return mpt::ToCharset(mpt::CharsetUTF8, std::wstring(1, x)); }
#endif
std::string ToString(const bool & x) { return ToStringHelper(x); }
std::string ToString(const signed char & x) { return ToStringHelper(x); }
Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/common/mptString.h 2014-09-29 12:21:46 UTC (rev 4324)
@@ -184,8 +184,8 @@
// 'to' is UTF8.
// Invalid source bytes or characters that are not representable in the
// destination charset will be replaced by some replacement character or string.
-std::string To(Charset to, const std::wstring &str);
-std::string To(Charset to, Charset from, const std::string &str);
+std::string ToCharset(Charset to, const std::wstring &str);
+std::string ToCharset(Charset to, Charset from, const std::string &str);
#if defined(_MFC_VER)
@@ -201,11 +201,11 @@
// This should also be used when converting from TCHAR strings.
// If UNICODE is defined, this is a completely lossless operation.
std::wstring ToWide(const CString &str);
-std::string To(Charset to, const CString &str);
+std::string ToCharset(Charset to, const CString &str);
// Provide un-ambiguous conversion from wide string literal.
static inline std::wstring ToWide(const wchar_t * str) { return ToWide(str ? std::wstring(str) : std::wstring()); }
-static inline std::string To(Charset to, const wchar_t * str) { return To(to, str ? std::wstring(str) : std::wstring()); }
+static inline std::string ToCharset(Charset to, const wchar_t * str) { return ToCharset(to, str ? std::wstring(str) : std::wstring()); }
static inline CString ToCString(const wchar_t * str) { return ToCString(str ? std::wstring(str) : std::wstring()); }
#ifdef UNICODE
@@ -218,7 +218,7 @@
CStringW ToCStringW(Charset from, const std::string &str);
CStringW ToCStringW(const CStringW &str);
std::wstring ToWide(const CStringW &str);
-std::string To(Charset to, const CStringW &str);
+std::string ToCharset(Charset to, const CStringW &str);
CString ToCString(const CStringW &str);
#endif // UNICODE
@@ -234,8 +234,8 @@
// windows AND a UTF8 locale is set.
// Invalid source bytes or characters that are not representable in the
// destination charset will be replaced by some replacement character or string.
-template <typename Tsrc> inline std::string ToLocale(const Tsrc &str) { return To(CharsetLocale, str); }
-static inline std::string ToLocale(Charset from, const std::string &str) { return To(CharsetLocale, from, str); }
+template <typename Tsrc> inline std::string ToLocale(const Tsrc &str) { return ToCharset(CharsetLocale, str); }
+static inline std::string ToLocale(Charset from, const std::string &str) { return ToCharset(CharsetLocale, from, str); }
#endif
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -281,7 +281,7 @@
}
std::string module_impl::mod_string_to_utf8( const std::string & encoded ) const {
- return mpt::To( mpt::CharsetUTF8, m_sndFile->GetCharset(), encoded );
+ return mpt::ToCharset( mpt::CharsetUTF8, m_sndFile->GetCharset(), encoded );
}
void module_impl::apply_mixer_settings( std::int32_t samplerate, int channels ) {
if (
Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/mptrack/AboutDialog.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -237,7 +237,7 @@
SetDlgItemText(IDC_EDIT2, CString("Build Date: ") + MptVersion::GetBuildDateString().c_str());
SetDlgItemText(IDC_EDIT3, CString("OpenMPT ") + MptVersion::GetVersionStringExtended().c_str());
m_static.SubclassDlgItem(IDC_CREDITS,this);
- m_static.SetCredits((mpt::String::Replace(mpt::To(mpt::CharsetLocale, mpt::CharsetUTF8, MptVersion::GetFullCreditsString()), "\n", "|") + "|" + mpt::String::Replace(MptVersion::GetContactString(), "\n", "|" ) + "||||||").c_str());
+ m_static.SetCredits((mpt::String::Replace(mpt::ToCharset(mpt::CharsetLocale, mpt::CharsetUTF8, MptVersion::GetFullCreditsString()), "\n", "|") + "|" + mpt::String::Replace(MptVersion::GetContactString(), "\n", "|" ) + "||||||").c_str());
m_static.SetSpeed(DISPLAY_SLOW);
m_static.SetColor(BACKGROUND_COLOR, RGB(138, 165, 219)); // Background Colour
m_static.SetTransparent(); // Set parts of bitmaps with RGB(192,192,192) transparent
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -61,7 +61,7 @@
static double ParseTime(CString str)
{
- return ConvertStrTo<double>(mpt::To(mpt::CharsetASCII, str)) / 1000.0;
+ return ConvertStrTo<double>(mpt::ToCharset(mpt::CharsetASCII, str)) / 1000.0;
}
Modified: trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -118,7 +118,7 @@
if(!field.empty() && !data.empty())
{
FLAC__StreamMetadata_VorbisComment_Entry entry;
- FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, field.c_str(), mpt::To(mpt::CharsetUTF8, data).c_str());
+ FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, field.c_str(), mpt::ToCharset(mpt::CharsetUTF8, data).c_str());
FLAC__metadata_object_vorbiscomment_append_comment(flac_metadata[0], entry, false);
}
}
Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -184,17 +184,17 @@
s.write(reinterpret_cast<const char*>(&tHeader), sizeof(tHeader));
// Write TIT2 (Title), TCOM / TPE1 (Composer), TALB (Album), TCON (Genre), TYER / TDRC (Date), WXXX (URL), TENC (Encoder), COMM (Comment)
- WriteID3v2Frame("TIT2", mpt::To(mpt::CharsetUTF8, tags.title), s);
- WriteID3v2Frame("TPE1", mpt::To(mpt::CharsetUTF8, tags.artist), s);
- WriteID3v2Frame("TCOM", mpt::To(mpt::CharsetUTF8, tags.artist), s);
- WriteID3v2Frame("TALB", mpt::To(mpt::CharsetUTF8, tags.album), s);
- WriteID3v2Frame("TCON", mpt::To(mpt::CharsetUTF8, tags.genre), s);
- //WriteID3v2Frame("TYER", mpt::To(mpt::CharsetUTF8, tags.year), s); // Deprecated
- WriteID3v2Frame("TDRC", mpt::To(mpt::CharsetUTF8, tags.year), s);
- WriteID3v2Frame("TBPM", mpt::To(mpt::CharsetUTF8, tags.bpm), s);
- WriteID3v2Frame("WXXX", mpt::To(mpt::CharsetUTF8, tags.url), s);
- WriteID3v2Frame("TENC", mpt::To(mpt::CharsetUTF8, tags.encoder), s);
- WriteID3v2Frame("COMM", mpt::To(mpt::CharsetUTF8, tags.comments), s);
+ WriteID3v2Frame("TIT2", mpt::ToCharset(mpt::CharsetUTF8, tags.title), s);
+ WriteID3v2Frame("TPE1", mpt::ToCharset(mpt::CharsetUTF8, tags.artist), s);
+ WriteID3v2Frame("TCOM", mpt::ToCharset(mpt::CharsetUTF8, tags.artist), s);
+ WriteID3v2Frame("TALB", mpt::ToCharset(mpt::CharsetUTF8, tags.album), s);
+ WriteID3v2Frame("TCON", mpt::ToCharset(mpt::CharsetUTF8, tags.genre), s);
+ //WriteID3v2Frame("TYER", mpt::ToCharset(mpt::CharsetUTF8, tags.year), s); // Deprecated
+ WriteID3v2Frame("TDRC", mpt::ToCharset(mpt::CharsetUTF8, tags.year), s);
+ WriteID3v2Frame("TBPM", mpt::ToCharset(mpt::CharsetUTF8, tags.bpm), s);
+ WriteID3v2Frame("WXXX", mpt::ToCharset(mpt::CharsetUTF8, tags.url), s);
+ WriteID3v2Frame("TENC", mpt::ToCharset(mpt::CharsetUTF8, tags.encoder), s);
+ WriteID3v2Frame("COMM", mpt::ToCharset(mpt::CharsetUTF8, tags.comments), s);
// Write Padding
for(size_t i = 0; i < ID3v2_PADDING; i++)
@@ -557,13 +557,13 @@
virtual void WriteMetatags(const FileTags &tags)
{
// Lame API expects Latin1, which is sad, but we cannot change that.
- if(!tags.title.empty()) lame.id3tag_set_title( gfp, mpt::To(mpt::CharsetISO8859_1, tags.title ).c_str());
- if(!tags.artist.empty()) lame.id3tag_set_artist( gfp, mpt::To(mpt::CharsetISO8859_1, tags.artist ).c_str());
- if(!tags.album.empty()) lame.id3tag_set_album( gfp, mpt::To(mpt::CharsetISO8859_1, tags.album ).c_str());
- if(!tags.year.empty()) lame.id3tag_set_year( gfp, mpt::To(mpt::CharsetISO8859_1, tags.year ).c_str());
- if(!tags.comments.empty()) lame.id3tag_set_comment( gfp, mpt::To(mpt::CharsetISO8859_1, tags.comments).c_str());
- if(!tags.trackno.empty()) lame.id3tag_set_track( gfp, mpt::To(mpt::CharsetISO8859_1, tags.trackno ).c_str());
- if(!tags.genre.empty()) lame.id3tag_set_genre( gfp, mpt::To(mpt::CharsetISO8859_1, tags.genre ).c_str());
+ if(!tags.title.empty()) lame.id3tag_set_title( gfp, mpt::ToCharset(mpt::CharsetISO8859_1, tags.title ).c_str());
+ if(!tags.artist.empty()) lame.id3tag_set_artist( gfp, mpt::ToCharset(mpt::CharsetISO8859_1, tags.artist ).c_str());
+ if(!tags.album.empty()) lame.id3tag_set_album( gfp, mpt::ToCharset(mpt::CharsetISO8859_1, tags.album ).c_str());
+ if(!tags.year.empty()) lame.id3tag_set_year( gfp, mpt::ToCharset(mpt::CharsetISO8859_1, tags.year ).c_str());
+ if(!tags.comments.empty()) lame.id3tag_set_comment( gfp, mpt::ToCharset(mpt::CharsetISO8859_1, tags.comments).c_str());
+ if(!tags.trackno.empty()) lame.id3tag_set_track( gfp, mpt::ToCharset(mpt::CharsetISO8859_1, tags.trackno ).c_str());
+ if(!tags.genre.empty()) lame.id3tag_set_genre( gfp, mpt::ToCharset(mpt::CharsetISO8859_1, tags.genre ).c_str());
}
virtual void WriteInterleaved(size_t count, const float *interleaved)
{
Modified: trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -326,7 +326,7 @@
{
if(!field.empty() && !data.empty())
{
- opus_comments.push_back(field + "=" + mpt::To(mpt::CharsetUTF8, data));
+ opus_comments.push_back(field + "=" + mpt::ToCharset(mpt::CharsetUTF8, data));
}
}
public:
Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -291,7 +291,7 @@
{
if(!field.empty() && !data.empty())
{
- vorbis.vorbis_comment_add_tag(&vc, field.c_str(), mpt::To(mpt::CharsetUTF8, data).c_str());
+ vorbis.vorbis_comment_add_tag(&vc, field.c_str(), mpt::ToCharset(mpt::CharsetUTF8, data).c_str());
}
}
public:
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -1745,7 +1745,7 @@
} else if(wfd.nFileSizeHigh > 0 || wfd.nFileSizeLow >= 16)
{
// Get lower-case file extension without dot.
- const std::string ext = mpt::To(mpt::CharsetUTF8, mpt::PathString::FromNative(wfd.cFileName).GetFileExt().ToWide());
+ const std::string ext = mpt::ToCharset(mpt::CharsetUTF8, mpt::PathString::FromNative(wfd.cFileName).GetFileExt().ToWide());
char s[16];
mpt::String::Copy(s, ext);
Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/sounddev/SoundDevice.h 2014-09-29 12:21:46 UTC (rev 4324)
@@ -195,7 +195,7 @@
{
// UTF8-encode the name and convert the utf8 to hex.
// This ensures that no special characters are contained in the configuration key.
- std::string utf8String = mpt::To(mpt::CharsetUTF8, name);
+ std::string utf8String = mpt::ToCharset(mpt::CharsetUTF8, name);
std::wstring hexString = Util::BinToHex(std::vector<char>(utf8String.begin(), utf8String.end()));
result += hexString;
} else
Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -469,7 +469,7 @@
std::string str;
std::copy(textOut.begin(), textOut.end(), std::back_inserter(str));
- str = mpt::To(mpt::CharsetCP437, mpt::CharsetCP437AMS, str);
+ str = mpt::ToCharset(mpt::CharsetCP437, mpt::CharsetCP437AMS, str);
// Packed text doesn't include any line breaks!
songMessage.ReadFixedLineLength(str.c_str(), str.length(), 76, 0);
@@ -895,7 +895,7 @@
{
std::string str;
file.ReadString<mpt::String::spacePadded>(str, composerLength);
- str = mpt::To(mpt::CharsetCP437, mpt::CharsetCP437AMS2, str);
+ str = mpt::ToCharset(mpt::CharsetCP437, mpt::CharsetCP437AMS2, str);
songMessage.Read(str.c_str(), str.length(), SongMessage::leAutodetect);
songArtist = str;
}
@@ -938,7 +938,7 @@
}
std::string str;
std::copy(textOut.begin(), textOut.begin() + descriptionHeader.unpackedLen, std::back_inserter(str));
- str = mpt::To(mpt::CharsetCP437, mpt::CharsetCP437AMS2, str);
+ str = mpt::ToCharset(mpt::CharsetCP437, mpt::CharsetCP437AMS2, str);
// Packed text doesn't include any line breaks!
songMessage.ReadFixedLineLength(str.c_str(), str.length(), 74, 0);
}
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -157,7 +157,7 @@
file.ReadString<mpt::String::maybeNullTerminated>(path, size);
if(version <= 0x00000102)
{
- path = mpt::To(mpt::CharsetUTF8, mpt::CharsetLocale, path);
+ path = mpt::ToCharset(mpt::CharsetUTF8, mpt::CharsetLocale, path);
}
m_szInstrumentPath[ins] = mpt::PathString::FromUTF8(path);
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -2375,9 +2375,9 @@
for(PLUGINDEX i = 0; i < MAX_MIXPLUGINS; i++)
{
#if defined(MODPLUG_TRACKER)
- const std::string name = mpt::To(mpt::CharsetUTF8, mpt::CharsetLocale, m_MixPlugins[i].Info.szLibraryName);
+ const std::string name = mpt::ToCharset(mpt::CharsetUTF8, mpt::CharsetLocale, m_MixPlugins[i].Info.szLibraryName);
#else
- const std::string name = mpt::To(mpt::CharsetUTF8, mpt::CharsetWindows1252, m_MixPlugins[i].Info.szLibraryName);
+ const std::string name = mpt::ToCharset(mpt::CharsetUTF8, mpt::CharsetWindows1252, m_MixPlugins[i].Info.szLibraryName);
#endif
mpt::String::Copy(m_MixPlugins[i].Info.szLibraryName, name);
}
Modified: trunk/OpenMPT/soundlib/WAVTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/WAVTools.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/soundlib/WAVTools.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -507,7 +507,7 @@
void WAVWriter::WriteTag(RIFFChunk::id_type id, const std::wstring &wideText)
//---------------------------------------------------------------------------
{
- std::string text = mpt::To(mpt::CharsetWindows1252, wideText);
+ std::string text = mpt::ToCharset(mpt::CharsetWindows1252, wideText);
if(!text.empty())
{
const size_t length = text.length() + 1;
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/test/test.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -556,9 +556,9 @@
}
// Charset conversions (basic sanity checks)
- VERIFY_EQUAL(mpt::To(mpt::CharsetUTF8, L"a"), "a");
- VERIFY_EQUAL(mpt::To(mpt::CharsetISO8859_1, L"a"), "a");
- VERIFY_EQUAL(mpt::To(mpt::CharsetASCII, L"a"), "a");
+ VERIFY_EQUAL(mpt::ToCharset(mpt::CharsetUTF8, L"a"), "a");
+ VERIFY_EQUAL(mpt::ToCharset(mpt::CharsetISO8859_1, L"a"), "a");
+ VERIFY_EQUAL(mpt::ToCharset(mpt::CharsetASCII, L"a"), "a");
VERIFY_EQUAL(mpt::ToWide(mpt::CharsetUTF8, "a"), L"a");
VERIFY_EQUAL(mpt::ToWide(mpt::CharsetISO8859_1, "a"), L"a");
VERIFY_EQUAL(mpt::ToWide(mpt::CharsetASCII, "a"), L"a");
@@ -570,30 +570,30 @@
// Check that some character replacement is done (and not just empty strings or truncated strings are returned)
// We test german umlaut-a (U+00E4) and CJK U+5BB6
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetASCII,L"abc\u00E4xyz"),"xyz"),true);
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetISO8859_1,L"abc\u00E4xyz"),"xyz"),true);
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetCP437,L"abc\u00E4xyz"),"xyz"),true);
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetUTF8,L"abc\u00E4xyz"),"xyz"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetASCII,L"abc\u00E4xyz"),"abc"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetISO8859_1,L"abc\u00E4xyz"),"abc"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetCP437,L"abc\u00E4xyz"),"abc"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetUTF8,L"abc\u00E4xyz"),"abc"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetASCII,L"abc\u00E4xyz"),"xyz"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetISO8859_1,L"abc\u00E4xyz"),"xyz"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetCP437,L"abc\u00E4xyz"),"xyz"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetUTF8,L"abc\u00E4xyz"),"xyz"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetASCII,L"abc\u00E4xyz"),"abc"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetISO8859_1,L"abc\u00E4xyz"),"abc"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetCP437,L"abc\u00E4xyz"),"abc"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetUTF8,L"abc\u00E4xyz"),"abc"),true);
#if defined(MPT_WITH_CHARSET_LOCALE)
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetLocale,L"abc\u00E4xyz"),"xyz"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetLocale,L"abc\u00E4xyz"),"abc"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetLocale,L"abc\u00E4xyz"),"xyz"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetLocale,L"abc\u00E4xyz"),"abc"),true);
#endif
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetASCII,L"abc\u5BB6xyz"),"xyz"),true);
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetISO8859_1,L"abc\u5BB6xyz"),"xyz"),true);
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetCP437,L"abc\u5BB6xyz"),"xyz"),true);
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetUTF8,L"abc\u5BB6xyz"),"xyz"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetASCII,L"abc\u5BB6xyz"),"abc"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetISO8859_1,L"abc\u5BB6xyz"),"abc"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetCP437,L"abc\u5BB6xyz"),"abc"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetUTF8,L"abc\u5BB6xyz"),"abc"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetASCII,L"abc\u5BB6xyz"),"xyz"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetISO8859_1,L"abc\u5BB6xyz"),"xyz"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetCP437,L"abc\u5BB6xyz"),"xyz"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetUTF8,L"abc\u5BB6xyz"),"xyz"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetASCII,L"abc\u5BB6xyz"),"abc"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetISO8859_1,L"abc\u5BB6xyz"),"abc"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetCP437,L"abc\u5BB6xyz"),"abc"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetUTF8,L"abc\u5BB6xyz"),"abc"),true);
#if defined(MPT_WITH_CHARSET_LOCALE)
- VERIFY_EQUAL(EndsWith(mpt::To(mpt::CharsetLocale,L"abc\u5BB6xyz"),"xyz"),true);
- VERIFY_EQUAL(BeginsWith(mpt::To(mpt::CharsetLocale,L"abc\u5BB6xyz"),"abc"),true);
+ VERIFY_EQUAL(EndsWith(mpt::ToCharset(mpt::CharsetLocale,L"abc\u5BB6xyz"),"xyz"),true);
+ VERIFY_EQUAL(BeginsWith(mpt::ToCharset(mpt::CharsetLocale,L"abc\u5BB6xyz"),"abc"),true);
#endif
VERIFY_EQUAL(EndsWith(mpt::ToWide(mpt::CharsetASCII,"abc\xC3\xA4xyz"),L"xyz"),true);
@@ -626,17 +626,17 @@
// We test german umlaut-a (U+00E4) and CJK U+5BB6
// cp437
- VERIFY_EQUAL(mpt::To(mpt::CharsetCP437,L"abc\u00E4xyz"),"abc\x84xyz");
+ VERIFY_EQUAL(mpt::ToCharset(mpt::CharsetCP437,L"abc\u00E4xyz"),"abc\x84xyz");
VERIFY_EQUAL(L"abc\u00E4xyz",mpt::ToWide(mpt::CharsetCP437,"abc\x84xyz"));
// iso8859
- VERIFY_EQUAL(mpt::To(mpt::CharsetISO8859_1,L"abc\u00E4xyz"),"abc\xE4xyz");
+ VERIFY_EQUAL(mpt::ToCharset(mpt::CharsetISO8859_1,L"abc\u00E4xyz"),"abc\xE4xyz");
VERIFY_EQUAL(L"abc\u00E4xyz",mpt::ToWide(mpt::CharsetISO8859_1,"abc\xE4xyz"));
// utf8
- VERIFY_EQUAL(mpt::To(mpt::CharsetUTF8,L"abc\u00E4xyz"),"abc\xC3\xA4xyz");
+ VERIFY_EQUAL(mpt::ToCharset(mpt::CharsetUTF8,L"abc\u00E4xyz"),"abc\xC3\xA4xyz");
VERIFY_EQUAL(L"abc\u00E4xyz",mpt::ToWide(mpt::CharsetUTF8,"abc\xC3\xA4xyz"));
- VERIFY_EQUAL(mpt::To(mpt::CharsetUTF8,L"abc\u5BB6xyz"),"abc\xE5\xAE\xB6xyz");
+ VERIFY_EQUAL(mpt::ToCharset(mpt::CharsetUTF8,L"abc\u5BB6xyz"),"abc\xE5\xAE\xB6xyz");
VERIFY_EQUAL(L"abc\u5BB6xyz",mpt::ToWide(mpt::CharsetUTF8,"abc\xE5\xAE\xB6xyz"));
// Path conversions
Modified: trunk/OpenMPT/unarchiver/unarchiver.cpp
===================================================================
--- trunk/OpenMPT/unarchiver/unarchiver.cpp 2014-09-29 09:01:08 UTC (rev 4323)
+++ trunk/OpenMPT/unarchiver/unarchiver.cpp 2014-09-29 12:21:46 UTC (rev 4324)
@@ -97,7 +97,7 @@
{
continue;
}
- const std::string ext = mpt::To(mpt::CharsetUTF8, GetExtension(at(i).name.ToWide()));
+ const std::string ext = mpt::ToCharset(mpt::CharsetUTF8, GetExtension(at(i).name.ToWide()));
// Compare with list of preferred extensions
if(std::find_if(extensions.begin(), extensions.end(), find_str(ext.c_str())) != extensions.end())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
