diff options
Diffstat (limited to 'protocols/CurrencyRates/src/DBUtils.cpp')
| -rw-r--r-- | protocols/CurrencyRates/src/DBUtils.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/protocols/CurrencyRates/src/DBUtils.cpp b/protocols/CurrencyRates/src/DBUtils.cpp index acc4debddb..05e0e79c05 100644 --- a/protocols/CurrencyRates/src/DBUtils.cpp +++ b/protocols/CurrencyRates/src/DBUtils.cpp @@ -1,20 +1,12 @@ #include "StdAfx.h" -std::wstring GetNodeText(const TiXmlElement *pNode) +CMStringW GetNodeText(const TiXmlElement *pNode) { auto *pszText = pNode->GetText(); if (pszText) return Utf2T(pszText).get(); - return std::wstring(); -} - -std::wstring CurrencyRates_DBGetStringW(MCONTACT hContact, const char *szModule, const char *szSetting, const wchar_t *pszDefValue) -{ - if (pszDefValue == nullptr) - pszDefValue = L""; - - return std::wstring(ptrW(db_get_wsa(hContact, szModule, szSetting, pszDefValue))); + return CMStringW(); } bool CurrencyRates_DBWriteDouble(MCONTACT hContact, const char *szModule, const char *szSetting, double dValue) @@ -35,9 +27,14 @@ bool CurrencyRates_DBReadDouble(MCONTACT hContact, const char *szModule, const c return bResult; } -void FixInvalidChars(std::wstring &s) +void FixInvalidChars(CMStringW &s) { - for (auto &c : s) - if (wcschr(L"\\/:*?\"<>|", c)) - c = '_'; + s.Replace('\\', '_'); + s.Replace('/', '_'); + s.Replace(':', '_'); + s.Replace('*', '_'); + s.Replace('\"', '_'); + s.Replace('<', '_'); + s.Replace('>', '_'); + s.Replace('/', '_'); } |