xrCore: renamed MhHelpers.h|cpp -> StringConversion.hpp|cpp

OpenXRay · Aug 6, 2018 · 28d317f · 28d317f
1 parent 3774f79
commit 28d317f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/src/Layers/xrRender/dxFontRender.cpp b/src/Layers/xrRender/dxFontRender.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "dxFontRender.h"
 #include "xrEngine/GameFont.h"
-#include "xrCore/Text/MbHelpers.h"
+#include "xrCore/Text/StringConversion.hpp"
 
 dxFontRender::dxFontRender() {}
 dxFontRender::~dxFontRender()

diff --git a/src/xrCore/Text/MbHelpers.cpp → src/xrCore/Text/StringConversion.cpp b/src/xrCore/Text/MbHelpers.cpp → src/xrCore/Text/StringConversion.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "MbHelpers.h"
+#include "StringConversion.hpp"
 #include <codecvt>
 
 // XXX: use c++11 functions and kill that DUMP_CONVERSION!!!11

diff --git a/src/xrCore/Text/MbHelpers.h → src/xrCore/Text/StringConversion.hpp b/src/xrCore/Text/MbHelpers.h → src/xrCore/Text/StringConversion.hpp
@@ -1,7 +1,6 @@
 #pragma once
 #include "xrCore/xrCore.h"
 
-// XXX: rename this file to StringConversion.hpp
 // XXX: use c++11 functions
 
 #define MAX_MB_CHARS 4096

diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
@@ -241,7 +241,7 @@
     </ClCompile>
     <ClCompile Include="stream_reader.cpp" />
     <ClCompile Include="string_concatenations.cpp" />
-    <ClCompile Include="Text\MbHelpers.cpp" />
+    <ClCompile Include="Text\StringConversion.cpp" />
     <ClCompile Include="Threading\Event.cpp" />
     <ClCompile Include="Threading\ScopeLock.cpp" />
     <ClCompile Include="Threading\ThreadPool.cpp" />
@@ -340,7 +340,7 @@
     <ClInclude Include="stream_reader_inline.h" />
     <ClInclude Include="string_concatenations.h" />
     <ClInclude Include="string_concatenations_inline.h" />
-    <ClInclude Include="Text\MbHelpers.h" />
+    <ClInclude Include="Text\StringConversion.hpp" />
     <ClInclude Include="Threading\Event.hpp" />
     <ClInclude Include="Threading\ScopeLock.hpp" />
     <ClInclude Include="Threading\ThreadPool.hpp" />

diff --git a/src/xrCore/xrCore.vcxproj.filters b/src/xrCore/xrCore.vcxproj.filters
@@ -240,9 +240,6 @@
     <ClCompile Include="Math\MathUtil.cpp">
       <Filter>Math</Filter>
     </ClCompile>
-    <ClCompile Include="Text\MbHelpers.cpp">
-      <Filter>Text</Filter>
-    </ClCompile>
     <ClCompile Include="Threading\Lock.cpp">
       <Filter>Threading</Filter>
     </ClCompile>
@@ -309,6 +306,9 @@
     <ClCompile Include="Compression\rt_compressor.cpp">
       <Filter>Compression\lzo</Filter>
     </ClCompile>
+    <ClCompile Include="Text\StringConversion.cpp">
+      <Filter>Text</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FTimer.h">
@@ -545,9 +545,6 @@
     <ClInclude Include="Containers\AssociativeVector.hpp">
       <Filter>Containers</Filter>
     </ClInclude>
-    <ClInclude Include="Text\MbHelpers.h">
-      <Filter>Text</Filter>
-    </ClInclude>
     <ClInclude Include="Threading\Lock.hpp">
       <Filter>Threading</Filter>
     </ClInclude>
@@ -677,6 +674,9 @@
     <ClInclude Include="Compression\rt_compressor.h">
       <Filter>Compression\lzo</Filter>
     </ClInclude>
+    <ClInclude Include="Text\StringConversion.hpp">
+      <Filter>Text</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xrCore.rc">

diff --git a/src/xrEngine/GameFont.cpp b/src/xrEngine/GameFont.cpp
@@ -2,7 +2,7 @@
 #pragma hdrstop
 
 #include "GameFont.h"
-#include "xrCore/Text/MbHelpers.h"
+#include "xrCore/Text/StringConversion.hpp"
 #ifndef _EDITOR
 #include "Render.h"
 #endif

diff --git a/src/xrEngine/edit_actions.cpp b/src/xrEngine/edit_actions.cpp
@@ -9,7 +9,7 @@
 #include "edit_actions.h"
 #include "line_edit_control.h"
 #include "xr_input.h"
-#include "xrCore/Text/MbHelpers.h"
+#include "xrCore/Text/StringConversion.hpp"
 
 namespace text_editor
 {

diff --git a/src/xrEngine/xr_input.cpp b/src/xrEngine/xr_input.cpp
@@ -6,7 +6,7 @@
 #include "Include/editor/ide.hpp"
 #include "GameFont.h"
 #include "PerformanceAlert.hpp"
-#include "xrCore/Text/MbHelpers.h"
+#include "xrCore/Text/StringConversion.hpp"
 
 #ifndef _EDITOR
 #include "xr_input_xinput.h"

diff --git a/src/xrGame/ui/UILines.cpp b/src/xrGame/ui/UILines.cpp
@@ -12,7 +12,7 @@
 #include "UIXmlInit.h"
 #include "uilinestd.h"
 #include "string_table.h"
-#include "xrCore/Text/MbHelpers.h"
+#include "xrCore/Text/StringConversion.hpp"
 
 CUILines::CUILines()
 {