Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5240] trunk/OpenMPT
|
From: <man...@us...> - 2015-06-02 15:12:07
|
Revision: 5240
http://sourceforge.net/p/modplug/code/5240
Author: manxorist
Date: 2015-06-02 15:11:53 +0000 (Tue, 02 Jun 2015)
Log Message:
-----------
[Ref] Split out mptStringFormat and mptStringParse.
Modified Paths:
--------------
trunk/OpenMPT/build/android_ndk/Android-unmo3.mk
trunk/OpenMPT/build/android_ndk/Android.mk
trunk/OpenMPT/build/autotools/Makefile.am
trunk/OpenMPT/build/vs2008/OpenMPT.vcproj
trunk/OpenMPT/build/vs2008/libopenmpt.vcproj
trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj
trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj
trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj
trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters
trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj
trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj
trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj
trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj.filters
trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj
trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj
trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj
trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj.filters
trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj
trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj
trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj
trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj.filters
trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj
trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj
trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/common/misc_util.cpp
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/common/mptString.cpp
trunk/OpenMPT/common/mptString.h
trunk/OpenMPT/common/stdafx.h
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
Added Paths:
-----------
trunk/OpenMPT/common/mptStringFormat.cpp
trunk/OpenMPT/common/mptStringFormat.h
trunk/OpenMPT/common/mptStringParse.cpp
trunk/OpenMPT/common/mptStringParse.h
Modified: trunk/OpenMPT/build/android_ndk/Android-unmo3.mk
===================================================================
--- trunk/OpenMPT/build/android_ndk/Android-unmo3.mk 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/android_ndk/Android-unmo3.mk 2015-06-02 15:11:53 UTC (rev 5240)
@@ -60,6 +60,8 @@
common/mptOS.cpp \
common/mptPathString.cpp \
common/mptString.cpp \
+ common/mptStringFormat.cpp \
+ common/mptStringParse.cpp \
common/mptTime.cpp \
common/mptUUID.cpp \
common/Profiler.cpp \
Modified: trunk/OpenMPT/build/android_ndk/Android.mk
===================================================================
--- trunk/OpenMPT/build/android_ndk/Android.mk 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/android_ndk/Android.mk 2015-06-02 15:11:53 UTC (rev 5240)
@@ -28,6 +28,8 @@
common/mptOS.cpp \
common/mptPathString.cpp \
common/mptString.cpp \
+ common/mptStringFormat.cpp \
+ common/mptStringParse.cpp \
common/mptTime.cpp \
common/mptUUID.cpp \
common/Profiler.cpp \
Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/autotools/Makefile.am 2015-06-02 15:11:53 UTC (rev 5240)
@@ -104,6 +104,10 @@
libopenmpt_la_SOURCES += common/mptPathString.h
libopenmpt_la_SOURCES += common/mptString.cpp
libopenmpt_la_SOURCES += common/mptString.h
+libopenmpt_la_SOURCES += common/mptStringFormat.cpp
+libopenmpt_la_SOURCES += common/mptStringFormat.h
+libopenmpt_la_SOURCES += common/mptStringParse.cpp
+libopenmpt_la_SOURCES += common/mptStringParse.h
libopenmpt_la_SOURCES += common/mptTime.cpp
libopenmpt_la_SOURCES += common/mptTime.h
libopenmpt_la_SOURCES += common/mptUUID.cpp
@@ -316,6 +320,10 @@
libopenmpttest_SOURCES += common/mptPathString.h
libopenmpttest_SOURCES += common/mptString.cpp
libopenmpttest_SOURCES += common/mptString.h
+libopenmpttest_SOURCES += common/mptStringFormat.cpp
+libopenmpttest_SOURCES += common/mptStringFormat.h
+libopenmpttest_SOURCES += common/mptStringParse.cpp
+libopenmpttest_SOURCES += common/mptStringParse.h
libopenmpttest_SOURCES += common/mptTime.cpp
libopenmpttest_SOURCES += common/mptTime.h
libopenmpttest_SOURCES += common/mptUUID.cpp
Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -716,6 +716,22 @@
>
</File>
<File
+ RelativePath="..\..\common\mptStringFormat.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringFormat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringParse.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringParse.h"
+ >
+ </File>
+ <File
RelativePath="..\..\common\mptTime.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2008/libopenmpt.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmpt.vcproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2008/libopenmpt.vcproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -431,6 +431,22 @@
>
</File>
<File
+ RelativePath="..\..\common\mptStringFormat.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringFormat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringParse.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringParse.h"
+ >
+ </File>
+ <File
RelativePath="..\..\common\mptTime.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -479,6 +479,22 @@
>
</File>
<File
+ RelativePath="..\..\common\mptStringFormat.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringFormat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringParse.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringParse.h"
+ >
+ </File>
+ <File
RelativePath="..\..\common\mptTime.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -475,6 +475,22 @@
>
</File>
<File
+ RelativePath="..\..\common\mptStringFormat.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringFormat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringParse.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\mptStringParse.h"
+ >
+ </File>
+ <File
RelativePath="..\..\common\mptTime.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -367,6 +367,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -547,6 +549,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -98,6 +98,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -634,6 +640,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -193,6 +193,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -267,6 +269,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -72,6 +72,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -290,6 +296,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -197,6 +197,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -271,6 +273,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -72,6 +72,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -290,6 +296,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -201,6 +201,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -279,6 +281,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -75,6 +75,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -305,6 +311,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -373,6 +373,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -553,6 +555,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -98,6 +98,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -634,6 +640,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -197,6 +197,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -271,6 +273,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -72,6 +72,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -290,6 +296,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -201,6 +201,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -275,6 +277,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -72,6 +72,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -290,6 +296,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -205,6 +205,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -283,6 +285,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -75,6 +75,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -305,6 +311,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -374,6 +374,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -554,6 +556,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -98,6 +98,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -634,6 +640,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -198,6 +198,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -272,6 +274,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -72,6 +72,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -290,6 +296,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -202,6 +202,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -276,6 +278,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -72,6 +72,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -290,6 +296,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -206,6 +206,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -284,6 +286,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -75,6 +75,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -305,6 +311,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -374,6 +374,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -554,6 +556,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -98,6 +98,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -634,6 +640,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -198,6 +198,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -272,6 +274,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -72,6 +72,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -290,6 +296,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -202,6 +202,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -276,6 +278,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -72,6 +72,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -290,6 +296,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj 2015-06-02 15:11:53 UTC (rev 5240)
@@ -206,6 +206,8 @@
<ClInclude Include="..\..\common\mptOS.h" />
<ClInclude Include="..\..\common\mptPathString.h" />
<ClInclude Include="..\..\common\mptString.h" />
+ <ClInclude Include="..\..\common\mptStringFormat.h" />
+ <ClInclude Include="..\..\common\mptStringParse.h" />
<ClInclude Include="..\..\common\mptTime.h" />
<ClInclude Include="..\..\common\mptUUID.h" />
<ClInclude Include="..\..\common\mutex.h" />
@@ -284,6 +286,8 @@
<ClCompile Include="..\..\common\mptOS.cpp" />
<ClCompile Include="..\..\common\mptPathString.cpp" />
<ClCompile Include="..\..\common\mptString.cpp" />
+ <ClCompile Include="..\..\common\mptStringFormat.cpp" />
+ <ClCompile Include="..\..\common\mptStringParse.cpp" />
<ClCompile Include="..\..\common\mptTime.cpp" />
<ClCompile Include="..\..\common\mptUUID.cpp" />
<ClCompile Include="..\..\common\serialization_utils.cpp" />
Modified: trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj.filters 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj.filters 2015-06-02 15:11:53 UTC (rev 5240)
@@ -75,6 +75,12 @@
<ClInclude Include="..\..\common\mptString.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\common\mptStringFormat.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\common\mptStringParse.h">
+ <Filter>common</Filter>
+ </ClInclude>
<ClInclude Include="..\..\common\mptTime.h">
<Filter>common</Filter>
</ClInclude>
@@ -305,6 +311,12 @@
<ClCompile Include="..\..\common\mptString.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\common\mptStringFormat.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\common\mptStringParse.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
<ClCompile Include="..\..\common\mptTime.cpp">
<Filter>common</Filter>
</ClCompile>
Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/common/misc_util.cpp 2015-06-02 15:11:53 UTC (rev 5240)
@@ -11,82 +11,11 @@
#include "stdafx.h"
#include "misc_util.h"
-#include <locale>
-#include <sstream>
-
OPENMPT_NAMESPACE_BEGIN
-template<typename T>
-inline T ConvertStrToHelper(const std::string &str)
-{
- std::istringstream i(str);
- i.imbue(std::locale::classic());
- T x;
- if(!(i >> x))
- {
- return T();
- }
- return x;
-}
-template<> inline bool ConvertStrToHelper(const std::string &str) { return ConvertStrToHelper<int>(str)?true:false; }
-template<> inline signed char ConvertStrToHelper(const std::string &str) { return static_cast<signed char>(ConvertStrToHelper<signed int>(str)); }
-template<> inline unsigned char ConvertStrToHelper(const std::string &str) { return static_cast<unsigned char>(ConvertStrToHelper<unsigned int>(str)); }
-#if MPT_WSTRING_FORMAT
-template<typename T>
-inline T ConvertStrToHelper(const std::wstring &str)
-{
- std::wistringstream i(str);
- i.imbue(std::locale::classic());
- T x;
- if(!(i >> x))
- {
- return T();
- }
- return x;
-}
-template<> inline bool ConvertStrToHelper(const std::wstring &str) { return ConvertStrToHelper<int>(str)?true:false; }
-template<> inline signed char ConvertStrToHelper(const std::wstring &str) { return static_cast<signed char>(ConvertStrToHelper<signed int>(str)); }
-template<> inline unsigned char ConvertStrToHelper(const std::wstring &str) { return static_cast<unsigned char>(ConvertStrToHelper<unsigned int>(str)); }
-#endif
-
-bool ConvertStrToBool(const std::string &str) { return ConvertStrToHelper<bool>(str); }
-signed char ConvertStrToSignedChar(const std::string &str) { return ConvertStrToHelper<signed char>(str); }
-unsigned char ConvertStrToUnsignedChar(const std::string &str) { return ConvertStrToHelper<unsigned char>(str); }
-signed short ConvertStrToSignedShort(const std::string &str) { return ConvertStrToHelper<signed short>(str); }
-unsigned short ConvertStrToUnsignedShort(const std::string &str) { return ConvertStrToHelper<unsigned short>(str); }
-signed int ConvertStrToSignedInt(const std::string &str) { return ConvertStrToHelper<signed int>(str); }
-unsigned int ConvertStrToUnsignedInt(const std::string &str) { return ConvertStrToHelper<unsigned int>(str); }
-signed long ConvertStrToSignedLong(const std::string &str) { return ConvertStrToHelper<signed long>(str); }
-unsigned long ConvertStrToUnsignedLong(const std::string &str) { return ConvertStrToHelper<unsigned long>(str); }
-signed long long ConvertStrToSignedLongLong(const std::string &str) { return ConvertStrToHelper<signed long long>(str); }
-unsigned long long ConvertStrToUnsignedLongLong(const std::string &str) { return ConvertStrToHelper<unsigned long long>(str); }
-float ConvertStrToFloat(const std::string &str) { return ConvertStrToHelper<float>(str); }
-double ConvertStrToDouble(const std::string &str) { return ConvertStrToHelper<double>(str); }
-long double ConvertStrToLongDouble(const std::string &str) { return ConvertStrToHelper<long double>(str); }
-
-#if MPT_WSTRING_FORMAT
-bool ConvertStrToBool(const std::wstring &str) { return ConvertStrToHelper<bool>(str); }
-signed char ConvertStrToSignedChar(const std::wstring &str) { return ConvertStrToHelper<signed char>(str); }
-unsigned char ConvertStrToUnsignedChar(const std::wstring &str) { return ConvertStrToHelper<unsigned char>(str); }
-signed short ConvertStrToSignedShort(const std::wstring &str) { return ConvertStrToHelper<signed short>(str); }
-unsigned short ConvertStrToUnsignedShort(const std::wstring &str) { return ConvertStrToHelper<unsigned short>(str); }
-signed int ConvertStrToSignedInt(const std::wstring &str) { return ConvertStrToHelper<signed int>(str); }
-unsigned int ConvertStrToUnsignedInt(const std::wstring &str) { return ConvertStrToHelper<unsigned int>(str); }
-signed long ConvertStrToSignedLong(const std::wstring &str) { return ConvertStrToHelper<signed long>(str); }
-unsigned long ConvertStrToUnsignedLong(const std::wstring &str) { return ConvertStrToHelper<unsigned long>(str); }
-signed long long ConvertStrToSignedLongLong(const std::wstring &str) { return ConvertStrToHelper<signed long long>(str); }
-unsigned long long ConvertStrToUnsignedLongLong(const std::wstring &str) { return ConvertStrToHelper<unsigned long long>(str); }
-float ConvertStrToFloat(const std::wstring &str) { return ConvertStrToHelper<float>(str); }
-double ConvertStrToDouble(const std::wstring &str) { return ConvertStrToHelper<double>(str); }
-long double ConvertStrToLongDouble(const std::wstring &str) { return ConvertStrToHelper<long double>(str); }
-#endif
-
-
-
-
#ifdef MODPLUG_TRACKER
namespace Util
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/common/misc_util.h 2015-06-02 15:11:53 UTC (rev 5240)
@@ -10,6 +10,7 @@
#pragma once
+#include "mptStringParse.h"
#include "mptCPU.h"
#include "mptOS.h"
#include "mptTime.h"
@@ -40,108 +41,7 @@
#endif
-bool ConvertStrToBool(const std::string &str);
-signed char ConvertStrToSignedChar(const std::string &str);
-unsigned char ConvertStrToUnsignedChar(const std::string &str);
-signed short ConvertStrToSignedShort(const std::string &str);
-unsigned short ConvertStrToUnsignedShort(const std::string &str);
-signed int ConvertStrToSignedInt(const std::string &str);
-unsigned int ConvertStrToUnsignedInt(const std::string &str);
-signed long ConvertStrToSignedLong(const std::string &str);
-unsigned long ConvertStrToUnsignedLong(const std::string &str);
-signed long long ConvertStrToSignedLongLong(const std::string &str);
-unsigned long long ConvertStrToUnsignedLongLong(const std::string &str);
-float ConvertStrToFloat(const std::string &str);
-double ConvertStrToDouble(const std::string &str);
-long double ConvertStrToLongDouble(const std::string &str);
-template<typename T> inline T ConvertStrTo(const std::string &str); // not defined, generates compiler error for non-specialized types
-template<> inline std::string ConvertStrTo(const std::string &str) { return str; }
-template<> inline bool ConvertStrTo(const std::string &str) { return ConvertStrToBool(str); }
-template<> inline signed char ConvertStrTo(const std::string &str) { return ConvertStrToSignedChar(str); }
-template<> inline unsigned char ConvertStrTo(const std::string &str) { return ConvertStrToUnsignedChar(str); }
-template<> inline signed short ConvertStrTo(const std::string &str) { return ConvertStrToSignedShort(str); }
-template<> inline unsigned short ConvertStrTo(const std::string &str) { return ConvertStrToUnsignedShort(str); }
-template<> inline signed int ConvertStrTo(const std::string &str) { return ConvertStrToSignedInt(str); }
-template<> inline unsigned int ConvertStrTo(const std::string &str) { return ConvertStrToUnsignedInt(str); }
-template<> inline signed long ConvertStrTo(const std::string &str) { return ConvertStrToSignedLong(str); }
-template<> inline unsigned long ConvertStrTo(const std::string &str) { return ConvertStrToUnsignedLong(str); }
-template<> inline signed long long ConvertStrTo(const std::string &str) { return ConvertStrToSignedLongLong(str); }
-template<> inline unsigned long long ConvertStrTo(const std::string &str) { return ConvertStrToUnsignedLongLong(str); }
-template<> inline float ConvertStrTo(const std::string &str) { return ConvertStrToFloat(str); }
-template<> inline double ConvertStrTo(const std::string &str) { return ConvertStrToDouble(str); }
-template<> inline long double ConvertStrTo(const std::string &str) { return ConvertStrToLongDouble(str); }
-#if MPT_WSTRING_FORMAT
-bool ConvertStrToBool(const std::wstring &str);
-signed char ConvertStrToSignedChar(const std::wstring &str);
-unsigned char ConvertStrToUnsignedChar(const std::wstring &str);
-signed short ConvertStrToSignedShort(const std::wstring &str);
-unsigned short ConvertStrToUnsignedShort(const std::wstring &str);
-signed int ConvertStrToSignedInt(const std::wstring &str);
-unsigned int ConvertStrToUnsignedInt(const std::wstring &str);
-signed long ConvertStrToSignedLong(const std::wstring &str);
-unsigned long ConvertStrToUnsignedLong(const std::wstring &str);
-signed long long ConvertStrToSignedLongLong(const std::wstring &str);
-unsigned long long ConvertStrToUnsignedLongLong(const std::wstring &str);
-float ConvertStrToFloat(const std::wstring &str);
-double ConvertStrToDouble(const std::wstring &str);
-long double ConvertStrToLongDouble(const std::wstring &str);
-template<typename T> inline T ConvertStrTo(const std::wstring &str); // not defined, generates compiler error for non-specialized types
-template<> inline std::wstring ConvertStrTo(const std::wstring &str) { return str; }
-template<> inline bool ConvertStrTo(const std::wstring &str) { return ConvertStrToBool(str); }
-template<> inline signed char ConvertStrTo(const std::wstring &str) { return ConvertStrToSignedChar(str); }
-template<> inline unsigned char ConvertStrTo(const std::wstring &str) { return ConvertStrToUnsignedChar(str); }
-template<> inline signed short ConvertStrTo(const std::wstring &str) { return ConvertStrToSignedShort(str); }
-template<> inline unsigned short ConvertStrTo(const std::wstring &str) { return ConvertStrToUnsignedShort(str); }
-template<> inline signed int ConvertStrTo(const std::wstring &str) { return ConvertStrToSignedInt(str); }
-template<> inline unsigned int ConvertStrTo(const std::wstring &str) { return ConvertStrToUnsignedInt(str); }
-template<> inline signed long ConvertStrTo(const std::wstring &str) { return ConvertStrToSignedLong(str); }
-template<> inline unsigned long ConvertStrTo(const std::wstring &str) { return ConvertStrToUnsignedLong(str); }
-template<> inline signed long long ConvertStrTo(const std::wstring &str) { return ConvertStrToSignedLongLong(str); }
-template<> inline unsigned long long ConvertStrTo(const std::wstring &str) { return ConvertStrToUnsignedLongLong(str); }
-template<> inline float ConvertStrTo(const std::wstring &str) { return ConvertStrToFloat(str); }
-template<> inline double ConvertStrTo(const std::wstring &str) { return ConvertStrToDouble(str); }
-template<> inline long double ConvertStrTo(const std::wstring &str) { return ConvertStrToLongDouble(str); }
-#endif
-
-template<typename T>
-inline T ConvertStrTo(const char *str)
-{
- if(!str)
- {
- return T();
- }
- return ConvertStrTo<T>(std::string(str));
-}
-
-#if MPT_WSTRING_FORMAT
-template<typename T>
-inline T ConvertStrTo(const wchar_t *str)
-{
- if(!str)
- {
- return T();
- }
- return ConvertStrTo<T>(std::wstring(str));
-}
-#if MPT_USTRING_MODE_UTF8
-template<> inline mpt::ustring ConvertStrTo(const std::wstring &str) { return mpt::ToUnicode(str); }
-#endif
-#endif
-
-#if MPT_USTRING_MODE_UTF8
-template<typename T>
-inline T ConvertStrTo(const mpt::ustring &str)
-{
- return ConvertStrTo<T>(mpt::ToCharset(mpt::CharsetUTF8, str));
-}
-template<> inline mpt::ustring ConvertStrTo(const mpt::ustring &str) { return str; }
-#if MPT_WSTRING_CONVERT
-template<> inline std::wstring ConvertStrTo(const mpt::ustring &str) { return mpt::ToWide(str); }
-#endif
-#endif
-
-
namespace mpt { namespace String {
// Combine a vector of values into a string, separated with the given separator.
Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp 2015-06-02 15:11:33 UTC (rev 5239)
+++ trunk/OpenMPT/common/mptString.cpp 2015-06-02 15:11:53 UTC (rev 5240)
@@ -16,9 +16,7 @@
#if defined(MPT_CHARSET_INTERNAL) || defined(MPT_CHARSET_WIN32)
#include <cstdlib>
#endif
-#include <iomanip>
#include <locale>
-#include <sstream>
#include <string>
#include <stdexcept>
#include <vector>
@@ -1530,442 +1528,4 @@
-namespace mpt
-{
-
-
-template<typename Tstream, typename T> inline void SaneInsert(Tstream & s, const T & x) { s << x; }
-// do the right thing for signed/unsigned char and bool
-template<typename Tstream> void SaneInsert(Tstream & s, const bool & x) { s << static_cast<int>(x); }
-template<typename Tstream> void SaneInsert(Tstream & s, const signed char & x) { s << static_cast<signed int>(x); }
-template<typename Tstream> void SaneInsert(Tstream & s, const unsigned char & x) { s << static_cast<unsigned int>(x); }
-
-template<typename T>
-inline std::string ToStringHelper(const T & x)
-{
- std::ostringstream o;
- o.imbue(std::locale::classic());
- SaneInsert(o, x);
- return o.str();
-}
-
-#if MPT_WSTRING_FORMAT
-template<typename T>
-inline std::wstring ToWStringHelper(const T & x)
-{
- std::wostringstream o;
- o.imbue(std::locale::classic());
- SaneInsert(o, x);
- return o.str();
-}
-#endif
-
-#if MPT_WSTRING_CONVERT
-#if defined(MPT_WITH_CHARSET_LOCALE)
-std::string ToString(const std::wstring & x) { return mpt::ToLocale(x); }
-std::string ToString(const wchar_t * const & x) { return mpt::ToLocale(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::ToCharset(mpt::CharsetUTF8, x); }
-std::string ToString(const wchar_t * const & x) { return mpt::ToCharset(mpt::CharsetUTF8, x); }
-std::string ToString(const wchar_t & x) { return mpt::ToCharset(mpt::CharsetUTF8, std::wstring(1, x)); }
-#endif
-#endif
-#if MPT_USTRING_MODE_UTF8
-#if defined(MPT_WITH_CHARSET_LOCALE)
-std::...
[truncated message content] |
