X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasics%2FBasics_Utils.hxx;h=1820856e17ba735c19f5529b47f34fa0bd37066b;hb=1bbffef73eeeb5b2a14d8fc7bdf91affdafae664;hp=4ca0f7c50414d0fffe93e37b9f38819e743308b3;hpb=0fac7040be417aab7228a4e23904b4cf22a8dda4;p=modules%2Fkernel.git

diff --git a/src/Basics/Basics_Utils.hxx b/src/Basics/Basics_Utils.hxx
index 4ca0f7c50..1820856e1 100644
--- a/src/Basics/Basics_Utils.hxx
+++ b/src/Basics/Basics_Utils.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, 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_
@@ -32,11 +32,14 @@
 #ifndef WIN32
 #include <sys/time.h>
 #else
-#include <winsock2.h>
 #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
 {
@@ -46,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
@@ -57,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