diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/ListeningTo/src/listeningto.cpp | 2 | ||||
-rw-r--r-- | plugins/ListeningTo/src/stdafx.h | 1 | ||||
-rw-r--r-- | plugins/SpellChecker/src/autoreplace.cpp | 8 | ||||
-rw-r--r-- | plugins/SpellChecker/src/stdafx.h | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index b8b7f0f02b..4244c91c22 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -860,7 +860,7 @@ INT_PTR SetNewSong(WPARAM wParam, LPARAM lParam) return -1;
if (lParam == LISTENINGTO_ANSI) {
- CharToWchar data((char *)wParam);
+ ptrW data(mir_a2u((char *)wParam));
((GenericPlayer *)players[GENERIC])->NewData(data, mir_wstrlen(data));
}
else {
diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h index 1c756963d6..a85b455ff7 100644 --- a/plugins/ListeningTo/src/stdafx.h +++ b/plugins/ListeningTo/src/stdafx.h @@ -57,7 +57,6 @@ struct CMPlugin : public PLUGIN<CMPlugin> #include "../../utils/mir_options.h"
#include "../../utils/mir_buffer.h"
-#include "../../utils/utf8_helpers.h"
#include "music.h"
#include "resource.h"
diff --git a/plugins/SpellChecker/src/autoreplace.cpp b/plugins/SpellChecker/src/autoreplace.cpp index 921f105c7f..2dfe7787df 100644 --- a/plugins/SpellChecker/src/autoreplace.cpp +++ b/plugins/SpellChecker/src/autoreplace.cpp @@ -64,8 +64,8 @@ void AutoReplaceMap::loadAutoReplaceMap() }
if (p != nullptr) {
- Utf8ToTchar find(tmp);
- Utf8ToTchar replace(p);
+ ptrW find(Utf8DecodeW(tmp));
+ ptrW replace(Utf8DecodeW(p));
lstrtrim(find);
lstrtrim(replace);
@@ -102,8 +102,8 @@ void AutoReplaceMap::writeAutoReplaceMap() for (; it != m_replacements.end(); it++) {
AutoReplacement &ar = it->second;
- TcharToUtf8 find(it->first.c_str());
- TcharToUtf8 replace(ar.replace.c_str());
+ ptrA find(Utf8EncodeW(it->first.c_str()));
+ ptrA replace(Utf8EncodeW(ar.replace.c_str()));
if (ar.useVariables)
fprintf(file, "%s-V>%s\n", (const char *)find, (const char *)replace);
diff --git a/plugins/SpellChecker/src/stdafx.h b/plugins/SpellChecker/src/stdafx.h index a6dd064cb4..6907c7aa30 100644 --- a/plugins/SpellChecker/src/stdafx.h +++ b/plugins/SpellChecker/src/stdafx.h @@ -54,7 +54,6 @@ using namespace std; #include <m_spellchecker.h>
#include <../../utils/mir_options.h>
-#include <../../utils/utf8_helpers.h>
#include <hunspell.hpp>
|