diff options
author | George Hazan <ghazan@miranda.im> | 2019-06-03 14:02:02 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2019-06-03 14:02:02 +0300 |
commit | c1881274c8c431014368f4f5b9b49397e6c579f0 (patch) | |
tree | 35534e17812aab00ec9e63b801ccb99a4ee221e9 /plugins/MirLua/src | |
parent | 240b4b12c1ec026be8a62b7ecd1f4702736b0e1b (diff) |
Folders: old TCHAR helpers removed
Diffstat (limited to 'plugins/MirLua/src')
-rw-r--r-- | plugins/MirLua/src/options.cpp | 2 | ||||
-rw-r--r-- | plugins/MirLua/src/plugin.cpp | 4 | ||||
-rw-r--r-- | plugins/MirLua/src/script.cpp | 2 | ||||
-rw-r--r-- | plugins/MirLua/src/script_loader.cpp | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/plugins/MirLua/src/options.cpp b/plugins/MirLua/src/options.cpp index f96a4a15a3..e196c52f3c 100644 --- a/plugins/MirLua/src/options.cpp +++ b/plugins/MirLua/src/options.cpp @@ -57,7 +57,7 @@ bool CMLuaOptionsMain::OnInitDialog() ImageList_AddIcon(hImageList, g_plugin.getIcon(IDI_COMPILE));
wchar_t scriptDir[MAX_PATH];
- FoldersGetCustomPathT(g_hScriptsFolder, scriptDir, _countof(scriptDir), VARSW(MIRLUA_PATHT));
+ FoldersGetCustomPathW(g_hScriptsFolder, scriptDir, _countof(scriptDir), VARSW(MIRLUA_PATHT));
wchar_t relativeScriptDir[MAX_PATH];
PathToRelativeW(scriptDir, relativeScriptDir, nullptr);
diff --git a/plugins/MirLua/src/plugin.cpp b/plugins/MirLua/src/plugin.cpp index 59756f1d26..e64d52863d 100644 --- a/plugins/MirLua/src/plugin.cpp +++ b/plugins/MirLua/src/plugin.cpp @@ -111,8 +111,8 @@ int CMPlugin::OnOptionsInit(WPARAM wParam, LPARAM) int CMPlugin::OnModulesLoaded(WPARAM, LPARAM) { - g_hCLibsFolder = FoldersRegisterCustomPathT(MODULENAME, "CLibsFolder", MIRLUA_PATHT, TranslateT("C libs folder")); - g_hScriptsFolder = FoldersRegisterCustomPathT(MODULENAME, "ScriptsFolder", MIRLUA_PATHT, TranslateT("Scripts folder")); + g_hCLibsFolder = FoldersRegisterCustomPathW(MODULENAME, "CLibsFolder", MIRLUA_PATHT, TranslateT("C libs folder")); + g_hScriptsFolder = FoldersRegisterCustomPathW(MODULENAME, "ScriptsFolder", MIRLUA_PATHT, TranslateT("Scripts folder")); LoadLuaScripts(); diff --git a/plugins/MirLua/src/script.cpp b/plugins/MirLua/src/script.cpp index 79f30e5399..a02467b6a3 100644 --- a/plugins/MirLua/src/script.cpp +++ b/plugins/MirLua/src/script.cpp @@ -165,7 +165,7 @@ bool CMLuaScript::Compile() Log(L"Compiling script %s", filePath);
wchar_t scriptDir[MAX_PATH];
- FoldersGetCustomPathT(g_hScriptsFolder, scriptDir, _countof(scriptDir), VARSW(MIRLUA_PATHT));
+ FoldersGetCustomPathW(g_hScriptsFolder, scriptDir, _countof(scriptDir), VARSW(MIRLUA_PATHT));
wchar_t fullPath[MAX_PATH];
mir_snwprintf(fullPath, L"%s\\%s.%s", scriptDir, scriptName, LUAPRECSCRIPTEXT);
wchar_t path[MAX_PATH];
diff --git a/plugins/MirLua/src/script_loader.cpp b/plugins/MirLua/src/script_loader.cpp index 1b70d0f039..32ff9346f8 100644 --- a/plugins/MirLua/src/script_loader.cpp +++ b/plugins/MirLua/src/script_loader.cpp @@ -15,12 +15,12 @@ void CMLuaScriptLoader::SetPaths() lua_getglobal(L, LUA_LOADLIBNAME);
- FoldersGetCustomPathT(g_hCLibsFolder, path, _countof(path), VARSW(MIRLUA_PATHT));
+ FoldersGetCustomPathW(g_hCLibsFolder, path, _countof(path), VARSW(MIRLUA_PATHT));
pathA = mir_utf8encodeW(path);
lua_pushfstring(L, "%s\\?.%s", pathA, _T2A(LUACLIBSCRIPTEXT));
lua_setfield(L, -2, "cpath");
- FoldersGetCustomPathT(g_hScriptsFolder, path, _countof(path), VARSW(MIRLUA_PATHT));
+ FoldersGetCustomPathW(g_hScriptsFolder, path, _countof(path), VARSW(MIRLUA_PATHT));
pathA = mir_utf8encodeW(path);
lua_pushfstring(L, "%s\\?.%s;%s\\?.%s", pathA, _T2A(LUATEXTSCRIPTEXT), pathA, _T2A(LUAPRECSCRIPTEXT));
lua_setfield(L, -2, "path");
@@ -60,7 +60,7 @@ void CMLuaScriptLoader::LoadScripts() SetPaths();
wchar_t scriptDir[MAX_PATH];
- FoldersGetCustomPathT(g_hScriptsFolder, scriptDir, _countof(scriptDir), VARSW(MIRLUA_PATHT));
+ FoldersGetCustomPathW(g_hScriptsFolder, scriptDir, _countof(scriptDir), VARSW(MIRLUA_PATHT));
Log(L"Loading scripts from %s", scriptDir);
|