Swiftdiff options
Diffstat (limited to 'Swiften/Base/String.h')
| -rw-r--r-- | Swiften/Base/String.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/Swiften/Base/String.h b/Swiften/Base/String.h index db6c28b..5a5642e 100644 --- a/Swiften/Base/String.h +++ b/Swiften/Base/String.h @@ -11,4 +11,7 @@ #include <sstream> +#include <Swiften/Base/API.h> +#include <Swiften/Base/Platform.h> + #define SWIFTEN_STRING_TO_CFSTRING(a) \ CFStringCreateWithBytes(NULL, reinterpret_cast<const UInt8*>(a.c_str()), a.size(), kCFStringEncodingUTF8, false) @@ -16,8 +19,8 @@ namespace Swift { namespace String { - std::vector<unsigned int> getUnicodeCodePoints(const std::string&); - std::pair<std::string, std::string> getSplittedAtFirst(const std::string&, char c); - std::vector<std::string> split(const std::string&, char c); - void replaceAll(std::string&, char c, const std::string& s); + SWIFTEN_API std::vector<unsigned int> getUnicodeCodePoints(const std::string&); + SWIFTEN_API std::pair<std::string, std::string> getSplittedAtFirst(const std::string&, char c); + SWIFTEN_API std::vector<std::string> split(const std::string&, char c); + SWIFTEN_API void replaceAll(std::string&, char c, const std::string& s); inline bool beginsWith(const std::string& s, char c) { @@ -28,7 +31,16 @@ namespace Swift { return s.size() > 0 && s[s.size()-1] == c; } - }; - class makeString { + std::string convertIntToHexString(int h); + int convertHexStringToInt(const std::string& s); + + } + +#ifdef SWIFTEN_PLATFORM_WINDOWS + SWIFTEN_API std::string convertWStringToString(const std::wstring& s); + SWIFTEN_API std::wstring convertStringToWString(const std::string& s); +#endif + + class SWIFTEN_API makeString { public: template <typename T> makeString& operator<<(T const& v) { |