Merge branch 'V9_7_BR'

[modules/kernel.git] / src / Basics / Basics_Utils.hxx

diff --git a/src/Basics/Basics_Utils.hxx b/src/Basics/Basics_Utils.hxx
index 5843afb7524c41a3232040f01c2e5edd05bb84ed..1f3e451253aecf2796f8eaf8b3550cb4b13e3dcf 100644 (file)
--- a/src/Basics/Basics_Utils.hxx
+++ b/src/Basics/Basics_Utils.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,7 @@
 
 //  SALOME Utils : general SALOME's definitions and tools
 //  File   : Basics_DirUtils.hxx
-//  Autor  : Alexander A. BORODIN
+//  Author  : Alexander A. BORODIN
 //  Module : SALOME
 //
 #ifndef _Basics_UTILS_HXX_
@@ -34,8 +34,12 @@
 #else
 #include <windows.h>
 #pragma comment(lib,"winmm.lib")
+#pragma warning (disable : 4251)
 #endif
 
+#ifndef SALOME_UNUSED
+#define SALOME_UNUSED(var) (void)var
+#endif
 
 namespace Kernel_Utils
 {
@@ -45,9 +49,13 @@ namespace Kernel_Utils
   {
   public:
     Localizer();
+    Localizer(int, const char*);
     ~Localizer();
   private:
-    std::string myCurLocale;
+    void init(int, const char*);
+  private:
+    int myCategory;
+    std::string myOriginalLocale;
   };
   
   //! GUID type
@@ -56,6 +64,18 @@ namespace Kernel_Utils
     ObjectdID       //!< Global usage object identifier ID
   };
 
+  BASICS_EXPORT const wchar_t* decode(const char* encoded);
+  BASICS_EXPORT const wchar_t* decode_s(std::string encoded);
+  BASICS_EXPORT const char* encode(const wchar_t* decoded);
+  BASICS_EXPORT std::string encode_s(const wchar_t* decoded);
+
+#ifdef WIN32
+  BASICS_EXPORT char* utf8_encode(const wchar_t* encoded);
+  BASICS_EXPORT wchar_t* utf8_decode(const char* decoded);
+  BASICS_EXPORT std::string utf8_encode_s(const std::wstring& encoded);
+  BASICS_EXPORT std::wstring utf8_decode_s(const std::string& decoded);
+#endif
+
   //! Get predefined GUID
   BASICS_EXPORT std::string GetGUID( GUIDtype );
 #ifndef WIN32