Merge branch 'master' into Sync-weave

1 files changed, 0 insertions, 71 deletions

diff --git a/other-licenses/7zstub/src/Common/StringConvert.h b/other-licenses/7zstub/src/Common/StringConvert.h
deleted file mode 100644
index 921e33c70..000000000
--- a/other-licenses/7zstub/src/Common/StringConvert.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Common/StringConvert.h

-

-#ifndef __COMMON_STRINGCONVERT_H

-#define __COMMON_STRINGCONVERT_H

-

-#include "MyWindows.h"

-#include "Common/String.h"

-#include "Types.h"

-

-UString MultiByteToUnicodeString(const AString &srcString, UINT codePage = CP_ACP);

-AString UnicodeStringToMultiByte(const UString &srcString, UINT codePage = CP_ACP);

-

-inline const wchar_t* GetUnicodeString(const wchar_t* unicodeString)

-  { return unicodeString; }

-inline const UString& GetUnicodeString(const UString &unicodeString)

-  { return unicodeString; }

-inline UString GetUnicodeString(const AString &ansiString)

-  { return MultiByteToUnicodeString(ansiString); }

-inline UString GetUnicodeString(const AString &multiByteString, UINT codePage)

-  { return MultiByteToUnicodeString(multiByteString, codePage); }

-inline const wchar_t* GetUnicodeString(const wchar_t* unicodeString, UINT)

-  { return unicodeString; }

-inline const UString& GetUnicodeString(const UString &unicodeString, UINT)

-  { return unicodeString; }

-

-inline const char* GetAnsiString(const char* ansiString)

-  { return ansiString; }

-inline const AString& GetAnsiString(const AString &ansiString)

-  { return ansiString; }

-inline AString GetAnsiString(const UString &unicodeString)

-  { return UnicodeStringToMultiByte(unicodeString); }

-

-inline const char* GetOemString(const char* oemString)

-  { return oemString; }

-inline const AString& GetOemString(const AString &oemString)

-  { return oemString; }

-inline AString GetOemString(const UString &unicodeString)

-  { return UnicodeStringToMultiByte(unicodeString, CP_OEMCP); }

-

-

-#ifdef _UNICODE

-  inline const wchar_t* GetSystemString(const wchar_t* unicodeString)

-    { return unicodeString;}

-  inline const UString& GetSystemString(const UString &unicodeString)

-    { return unicodeString;}

-  inline const wchar_t* GetSystemString(const wchar_t* unicodeString, UINT codePage)

-    { return unicodeString;}

-  inline const UString& GetSystemString(const UString &unicodeString, UINT codePage)

-    { return unicodeString;}

-  inline UString GetSystemString(const AString &multiByteString, UINT codePage)

-    { return MultiByteToUnicodeString(multiByteString, codePage);}

-  inline UString GetSystemString(const AString &multiByteString)

-    { return MultiByteToUnicodeString(multiByteString);}

-#else

-  inline const char* GetSystemString(const char *ansiString)

-    { return ansiString; }

-  inline const AString& GetSystemString(const AString &multiByteString, UINT)

-    { return multiByteString; }

-  inline const char * GetSystemString(const char *multiByteString, UINT)

-    { return multiByteString; }

-  inline AString GetSystemString(const UString &unicodeString)

-    { return UnicodeStringToMultiByte(unicodeString); }

-  inline AString GetSystemString(const UString &unicodeString, UINT codePage)

-    { return UnicodeStringToMultiByte(unicodeString, codePage); }

-#endif

-

-#ifndef _WIN32_WCE

-AString SystemStringToOemString(const CSysString &srcString);

-#endif

-

-#endif