diff --git a/Encoding.cpp b/Encoding.cpp index 00ae079..ba74d42 100644 --- a/Encoding.cpp +++ b/Encoding.cpp @@ -45,7 +45,7 @@ std::wstring CodePageToWide(uint32_t codePage, const char * text, size_t size) n /// std::string CodePageToUTF8(uint32_t codePage, const char * text, size_t size) noexcept { - return WideToUTF8(CodePageToWide(codePage, text, size)); + return ::WideToUTF8(CodePageToWide(codePage, text, size)); } /// @@ -232,10 +232,10 @@ std::wstring TextToWide(const char * text, size_t size) noexcept size = ::strlen(text); if (IsASCII(text)) - return UTF8ToWide(text); + return ::UTF8ToWide(text); if (IsUTF8(text, size)) - return UTF8ToWide(text); + return ::UTF8ToWide(text); if (IsShiftJIS(text, size)) return CodePageToWide(932, text); diff --git a/Encoding.h b/Encoding.h index 285b2c0..7d6c14e 100644 --- a/Encoding.h +++ b/Encoding.h @@ -20,7 +20,7 @@ inline std::wstring UTF8ToWide(const char * text, size_t size) noexcept inline std::string WideToUTF8(const std::wstring & text) noexcept { - return WideToUTF8(text.c_str(), text.length()); + return ::WideToUTF8(text.c_str(), text.length()); } inline std::wstring CodePageToWide(uint32_t codePage, const std::string & text) noexcept diff --git a/Exceptions.cpp b/Exceptions.cpp index 6b67f0f..12a8350 100644 --- a/Exceptions.cpp +++ b/Exceptions.cpp @@ -34,7 +34,7 @@ std::string GetErrorMessage(DWORD errorCode, const std::string & errorMessage) n else Text = ::FormatText("Failed to get error message for error code (0x%08X)", ::GetLastError()); - return FormatText("%s: %s (0x%08X)", errorMessage.c_str(), Text.c_str(), errorCode); + return ::FormatText("%s: %s (0x%08X)", errorMessage.c_str(), Text.c_str(), errorCode); } /// diff --git a/FrameTemplate.html b/FrameTemplate.html index 01ab129..71c67c4 100644 --- a/FrameTemplate.html +++ b/FrameTemplate.html @@ -16,7 +16,7 @@

IFrame