From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Jul 2016 10:31:04 +0000 Subject: hello, Unix. phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirLua/src/mlua_options.cpp | 8 ++++---- plugins/MirLua/src/mlua_script_loader.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/MirLua/src') diff --git a/plugins/MirLua/src/mlua_options.cpp b/plugins/MirLua/src/mlua_options.cpp index 72bde7761f..6714d7ebed 100644 --- a/plugins/MirLua/src/mlua_options.cpp +++ b/plugins/MirLua/src/mlua_options.cpp @@ -62,9 +62,9 @@ void CMLuaOptions::OnInitDialog() TCHAR scriptDir[MAX_PATH], relativeScriptDir[MAX_PATH], header[MAX_PATH + 100]; FoldersGetCustomPathT(g_hScriptsFolder, scriptDir, _countof(scriptDir), VARST(MIRLUA_PATHT)); PathToRelativeT(scriptDir, relativeScriptDir, NULL); - mir_sntprintf(header, _T("%s (%s)"), TranslateT("Common scripts"), relativeScriptDir); + mir_sntprintf(header, L"%s (%s)", TranslateT("Common scripts"), relativeScriptDir); - m_scripts.AddColumn(0, _T("Script"), 380); + m_scripts.AddColumn(0, L"Script", 380); m_scripts.AddColumn(1, NULL, 32 - GetSystemMetrics(SM_CXVSCROLL)); m_scripts.AddColumn(2, NULL, 32 - GetSystemMetrics(SM_CXVSCROLL)); @@ -126,7 +126,7 @@ void CMLuaOptions::OnScriptListClick(CCtrlListView::TEventInfo *evt) switch (lvi.iSubItem) { case 1: - ShellExecute(m_hwnd, _T("Open"), script->GetFilePath(), NULL, NULL, SW_SHOWNORMAL); + ShellExecute(m_hwnd, L"Open", script->GetFilePath(), NULL, NULL, SW_SHOWNORMAL); break; case 2: @@ -162,7 +162,7 @@ int CMLuaOptions::OnOptionsInit(WPARAM wParam, LPARAM) odp.hInstance = g_hInstance; odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE; odp.ptszGroup = LPGENT("Services"); - odp.ptszTitle = _T("Lua"); + odp.ptszTitle = L"Lua"; odp.ptszTab = LPGENT("Scripts"); odp.pDialog = CMLuaOptions::CreateOptionsPage(); Options_AddPage(wParam, &odp); diff --git a/plugins/MirLua/src/mlua_script_loader.cpp b/plugins/MirLua/src/mlua_script_loader.cpp index ddecbad547..f95fdbfc78 100644 --- a/plugins/MirLua/src/mlua_script_loader.cpp +++ b/plugins/MirLua/src/mlua_script_loader.cpp @@ -7,7 +7,7 @@ CMLuaScriptLoader::CMLuaScriptLoader(lua_State *L) : L(L) void CMLuaScriptLoader::LoadScript(const TCHAR *scriptDir, const TCHAR *file) { TCHAR fullPath[MAX_PATH], path[MAX_PATH]; - mir_sntprintf(fullPath, _T("%s\\%s"), scriptDir, file); + mir_sntprintf(fullPath, L"%s\\%s", scriptDir, file); PathToRelativeT(fullPath, path); CMLuaScript *script = new CMLuaScript(L, path); @@ -15,12 +15,12 @@ void CMLuaScriptLoader::LoadScript(const TCHAR *scriptDir, const TCHAR *file) if (db_get_b(NULL, MODULE, _T2A(file), 1) == FALSE) { - Log(_T("%s:PASS"), path); + Log(L"%s:PASS", path); return; } if (script->Load()) - Log(_T("%s:OK"), path); + Log(L"%s:OK", path); } void CMLuaScriptLoader::LoadScripts() @@ -28,10 +28,10 @@ void CMLuaScriptLoader::LoadScripts() TCHAR scriptDir[MAX_PATH]; FoldersGetCustomPathT(g_hScriptsFolder, scriptDir, _countof(scriptDir), VARST(MIRLUA_PATHT)); - Log(_T("Loading scripts from %s"), scriptDir); + Log(L"Loading scripts from %s", scriptDir); TCHAR searchMask[MAX_PATH]; - mir_sntprintf(searchMask, _T("%s\\%s"), scriptDir, _T("*.lua")); + mir_sntprintf(searchMask, L"%s\\%s", scriptDir, L"*.lua"); WIN32_FIND_DATA fd; HANDLE hFind = FindFirstFile(searchMask, &fd); -- cgit v1.2.3