FolderCompare: fix build error

diff --git a/Testing/FolderCompare/FolderCompare.vcproj b/Testing/FolderCompare/FolderCompare.vcproj
index 0942729..ca646af 100644 (file)
--- a/Testing/FolderCompare/FolderCompare.vcproj
+++ b/Testing/FolderCompare/FolderCompare.vcproj
@@ -208,9 +208,6 @@
                                RelativePath="..\..\Src\FolderCmp.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Src\Common\LogFile.cpp">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\Src\Common\lwdisp.c">\r
                        </File>\r
                        <File\r

diff --git a/Testing/FolderCompare/FolderCompare.vcxproj b/Testing/FolderCompare/FolderCompare.vcxproj
index 67de4cc..1e8cece 100644 (file)
--- a/Testing/FolderCompare/FolderCompare.vcxproj
+++ b/Testing/FolderCompare/FolderCompare.vcxproj
@@ -195,7 +195,6 @@
     <ClCompile Include="..\..\Src\FilterCommentsManager.cpp" />\r
     <ClCompile Include="..\..\Src\FilterList.cpp" />\r
     <ClCompile Include="..\..\Src\FolderCmp.cpp" />\r
-    <ClCompile Include="..\..\Src\Common\LogFile.cpp" />\r
     <ClCompile Include="..\..\Src\Common\lwdisp.c" />\r
     <ClCompile Include="..\..\Src\markdown.cpp" />\r
     <ClCompile Include="..\..\Src\MovedBlocks.cpp" />\r

diff --git a/Testing/FolderCompare/FolderCompare.vcxproj.filters b/Testing/FolderCompare/FolderCompare.vcxproj.filters
index c2957f5..59771a7 100644 (file)
--- a/Testing/FolderCompare/FolderCompare.vcxproj.filters
+++ b/Testing/FolderCompare/FolderCompare.vcxproj.filters
@@ -102,9 +102,6 @@
     <ClCompile Include="..\..\Src\FolderCmp.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\Src\Common\LogFile.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\Src\Common\lwdisp.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r

diff --git a/Testing/FolderCompare/misc.cpp b/Testing/FolderCompare/misc.cpp
index ecdff33..d67e09f 100644 (file)
--- a/Testing/FolderCompare/misc.cpp
+++ b/Testing/FolderCompare/misc.cpp
@@ -1,10 +1,8 @@
-#include <iostream>\r
-#include "UnicodeString.h"\r
-#include "LogFile.h"\r
-#include "unicoder.h"\r
-\r
-CLogFile g_log;\r
-\r
+#include <iostream>
+#include "UnicodeString.h"
+#include "unicoder.h"
+#include <Windows.h>
+
 String GetSysError(int nerr /* =-1 */)
 {
        if (nerr == -1)
@@ -29,28 +27,28 @@ String GetSysError(int nerr /* =-1 */)
        LocalFree( lpMsgBuf );
        return str;
 }
-\r
-String LoadResString(unsigned id)\r
-{\r
-       return _T("Nothing");\r
-}\r
-\r
-CLogFile * GetLog()
+
+String LoadResString(unsigned id)
 {
-       return &g_log;
+       return _T("Nothing");
 }
-\r
+
 void LogErrorStringUTF8(const std::string& sz)
 {
        std::cout << sz;
 }
-\r
+
 void LogErrorString(const String& sz)
 {
        std::cout << ucr::toUTF8(sz);
 }
-\r
+
 void AppErrorMessageBox(const String& msg)
 {
        MessageBox(NULL, msg.c_str(), NULL, MB_ICONSTOP);
 }
+
+String tr(const std::string& str)
+{
+       return ucr::toTString(str);
+}