diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
commit | 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch) | |
tree | b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Platform/StringConverter.h | |
parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Platform/StringConverter.h')
-rw-r--r-- | src/Platform/StringConverter.h | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/src/Platform/StringConverter.h b/src/Platform/StringConverter.h index 13d61f53..ad391fc4 100644 --- a/src/Platform/StringConverter.h +++ b/src/Platform/StringConverter.h @@ -3,66 +3,66 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source code distribution packages. -*/
-
-#ifndef TC_HEADER_Platform_StringConverter
-#define TC_HEADER_Platform_StringConverter
-
-#include <stdlib.h>
-#include "PlatformBase.h"
-
-namespace VeraCrypt
-{
- class StringConverter
- {
- public:
- static void Erase (string &str);
- static void Erase (wstring &str);
- static wstring FromNumber (double number);
- static wstring FromNumber (int32 number);
- static wstring FromNumber (uint32 number);
- static wstring FromNumber (int64 number);
- static wstring FromNumber (uint64 number);
- static string GetTrailingNumber (const string &str);
- static string GetTypeName (const type_info &typeInfo);
- static wstring QuoteSpaces (const wstring &str);
- static vector <string> Split (const string &str, const string &separators = " \t\r\n", bool returnEmptyFields = false);
- static string StripTrailingNumber (const string &str);
- static wstring ToExceptionString (const exception &ex);
- static string ToLower (const string &str);
- static uint32 ToUInt32 (const string &str);
+*/ + +#ifndef TC_HEADER_Platform_StringConverter +#define TC_HEADER_Platform_StringConverter + +#include <stdlib.h> +#include "PlatformBase.h" + +namespace VeraCrypt +{ + class StringConverter + { + public: + static void Erase (string &str); + static void Erase (wstring &str); + static wstring FromNumber (double number); + static wstring FromNumber (int32 number); + static wstring FromNumber (uint32 number); + static wstring FromNumber (int64 number); + static wstring FromNumber (uint64 number); + static string GetTrailingNumber (const string &str); + static string GetTypeName (const type_info &typeInfo); + static wstring QuoteSpaces (const wstring &str); + static vector <string> Split (const string &str, const string &separators = " \t\r\n", bool returnEmptyFields = false); + static string StripTrailingNumber (const string &str); + static wstring ToExceptionString (const exception &ex); + static string ToLower (const string &str); + static uint32 ToUInt32 (const string &str); static uint32 ToUInt32 (const wstring &str); - static int32 ToInt32 (const string &str);
- static int32 ToInt32 (const wstring &str);
- static uint64 ToUInt64 (const string &str);
+ static int32 ToInt32 (const string &str); + static int32 ToInt32 (const wstring &str); + static uint64 ToUInt64 (const string &str); static uint64 ToUInt64 (const wstring &str); - static int64 ToInt64 (const string &str);
- static int64 ToInt64 (const wstring &str);
- static string ToSingle (double number) { return ToSingle (FromNumber (number)); }
- static string ToSingle (int32 number) { return ToSingle (FromNumber (number)); }
- static string ToSingle (uint32 number) { return ToSingle (FromNumber (number)); }
- static string ToSingle (int64 number) { return ToSingle (FromNumber (number)); }
- static string ToSingle (uint64 number) { return ToSingle (FromNumber (number)); }
- static string ToSingle (const wstring &wstr, bool noThrow = false);
- static void ToSingle (const wstring &wstr, string &str, bool noThrow = false);
- static string ToUpper (const string &str);
- static wstring ToWide (double number) { return FromNumber (number); }
- static wstring ToWide (int32 number) { return FromNumber (number); }
- static wstring ToWide (uint32 number) { return FromNumber (number); }
- static wstring ToWide (int64 number) { return FromNumber (number); }
- static wstring ToWide (uint64 number) { return FromNumber (number); }
- static wstring ToWide (const string &str, bool noThrow = false);
- static void ToWideBuffer (const wstring &str, wchar_t *buffer, size_t bufferSize);
- static string Trim (const string &str);
-
- private:
- StringConverter ();
- };
-}
-
-#endif // TC_HEADER_Platform_StringConverter
+ static int64 ToInt64 (const string &str); + static int64 ToInt64 (const wstring &str); + static string ToSingle (double number) { return ToSingle (FromNumber (number)); } + static string ToSingle (int32 number) { return ToSingle (FromNumber (number)); } + static string ToSingle (uint32 number) { return ToSingle (FromNumber (number)); } + static string ToSingle (int64 number) { return ToSingle (FromNumber (number)); } + static string ToSingle (uint64 number) { return ToSingle (FromNumber (number)); } + static string ToSingle (const wstring &wstr, bool noThrow = false); + static void ToSingle (const wstring &wstr, string &str, bool noThrow = false); + static string ToUpper (const string &str); + static wstring ToWide (double number) { return FromNumber (number); } + static wstring ToWide (int32 number) { return FromNumber (number); } + static wstring ToWide (uint32 number) { return FromNumber (number); } + static wstring ToWide (int64 number) { return FromNumber (number); } + static wstring ToWide (uint64 number) { return FromNumber (number); } + static wstring ToWide (const string &str, bool noThrow = false); + static void ToWideBuffer (const wstring &str, wchar_t *buffer, size_t bufferSize); + static string Trim (const string &str); + + private: + StringConverter (); + }; +} + +#endif // TC_HEADER_Platform_StringConverter |