From 6ccfdcb25f2bb3c7a4e39a055bb392c0d4bfa905 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 22 May 2018 16:10:40 +0300 Subject: m_langpack.h unbound from hLangpack --- plugins/BasicHistory/src/stdafx.h | 9 +++++---- plugins/ClientChangeNotify/src/stdafx.h | 9 ++++----- plugins/ExternalAPI/m_variables.h | 2 +- plugins/FavContacts/src/stdafx.h | 10 +++++----- plugins/ListeningTo/src/stdafx.h | 10 +++++----- plugins/MimCmd/src/MimCmd.cpp | 12 ++++++------ plugins/MimCmd/src/commands.cpp | 8 ++++---- plugins/New_GPG/src/stdafx.h | 10 +++++----- plugins/OpenSSL/src/ssl_openssl.cpp | 6 +++--- plugins/TranslitSwitcher/src/Layoutproc.cpp | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) (limited to 'plugins') diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h index 881e94fc82..f2e353cb67 100644 --- a/plugins/BasicHistory/src/stdafx.h +++ b/plugins/BasicHistory/src/stdafx.h @@ -58,6 +58,11 @@ #include "m_smileyadd.h" #include "m_metacontacts.h" +struct CMPlugin : public PLUGIN +{ + CMPlugin(); +}; + #include "../../libs/zlib/src/zconf.h" #include "../../libs/zlib/src/ioapi.h" #include "../../libs/zlib/src/zip.h" @@ -92,7 +97,3 @@ HICON LoadIconEx(int iconId, bool big = false); #define MODULENAME "BasicHistory" -struct CMPlugin : public PLUGIN -{ - CMPlugin(); -}; \ No newline at end of file diff --git a/plugins/ClientChangeNotify/src/stdafx.h b/plugins/ClientChangeNotify/src/stdafx.h index 497ee6ac1d..f02330f144 100644 --- a/plugins/ClientChangeNotify/src/stdafx.h +++ b/plugins/ClientChangeNotify/src/stdafx.h @@ -52,6 +52,10 @@ #include "m_fingerprint.h" +{ + CMPlugin(); +}; + #include "TMyArray.h" #include "Options.h" #include "CString.h" @@ -84,11 +88,6 @@ #define MODULENAME "ClientChangeNotify" -struct CMPlugin : public PLUGIN -{ - CMPlugin(); -}; - #define LOG_ID MODULENAME #define LOG_PREFIX MODULENAME ": " // for netlib.log diff --git a/plugins/ExternalAPI/m_variables.h b/plugins/ExternalAPI/m_variables.h index 6277c84a2e..0e015f7ce6 100644 --- a/plugins/ExternalAPI/m_variables.h +++ b/plugins/ExternalAPI/m_variables.h @@ -534,7 +534,7 @@ __inline static int variables_skin_helpbutton(HWND hwndDlg, UINT uIDButton) { szTipInfo = (char *)CallService(MS_VARS_GETSKINITEM, 0, (LPARAM)VSI_HELPTIPTEXT); if (szTipInfo == nullptr) - szTipInfo = Translate("Open String Formatting Help"); + szTipInfo = TranslateA_LP("Open String Formatting Help", 0); SendMessage(GetDlgItem(hwndDlg, uIDButton), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0); SendDlgItemMessage(hwndDlg, uIDButton, BUTTONSETASFLATBTN, 0, 0); diff --git a/plugins/FavContacts/src/stdafx.h b/plugins/FavContacts/src/stdafx.h index 2ab32caea4..858d735c8f 100644 --- a/plugins/FavContacts/src/stdafx.h +++ b/plugins/FavContacts/src/stdafx.h @@ -49,6 +49,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include +struct CMPlugin : public PLUGIN +{ + CMPlugin(); +}; + #include "resource.h" #include "version.h" #include "contact_cache.h" @@ -100,8 +105,3 @@ void InitServices(); void UninitServices(); extern IconItem iconList[]; - -struct CMPlugin : public PLUGIN -{ - CMPlugin(); -}; diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h index 8727d8dda8..52ab19b677 100644 --- a/plugins/ListeningTo/src/stdafx.h +++ b/plugins/ListeningTo/src/stdafx.h @@ -47,6 +47,11 @@ Boston, MA 02111-1307, USA. #include #include +struct CMPlugin : public PLUGIN +{ + CMPlugin(); +}; + #include "../../utils/mir_options.h" #include "../../utils/mir_buffer.h" #include "../../utils/utf8_helpers.h" @@ -71,11 +76,6 @@ Boston, MA 02111-1307, USA. #define MODULENAME "ListeningTo" -struct CMPlugin : public PLUGIN -{ - CMPlugin(); -}; - // Global Variables extern BOOL loaded; diff --git a/plugins/MimCmd/src/MimCmd.cpp b/plugins/MimCmd/src/MimCmd.cpp index 39a3dcbe39..b5d6bf3f72 100644 --- a/plugins/MimCmd/src/MimCmd.cpp +++ b/plugins/MimCmd/src/MimCmd.cpp @@ -43,17 +43,17 @@ void PrintUsage() wchar_t name[128]; GetProgramName(name, _countof(name)); - wprintf(TranslateT("%s usage:\n"), name); - wprintf(TranslateT("%s [ [ [...]]].\n"), name); - wprintf(TranslateT("This will tell Miranda to run the specified command. The commands can have zero, one or more parameters. Use '%s help' to get a list of possible commands.\n"), name); - wprintf(TranslateT("No command can have more than %d parameters.\n"), MAX_ARGUMENTS - 1); + wprintf(TranslateW_LP(L"%s usage:\n"), name); + wprintf(TranslateW_LP(L"%s [ [ [...]]].\n"), name); + wprintf(TranslateW_LP(L"This will tell Miranda to run the specified command. The commands can have zero, one or more parameters. Use '%s help' to get a list of possible commands.\n"), name); + wprintf(TranslateW_LP(L"No command can have more than %d parameters.\n"), MAX_ARGUMENTS - 1); } void ShowVersion() { wchar_t name[128]; GetProgramName(name, _countof(name)); - wprintf(TranslateT("%s version %s"), name, __VERSION_STRING_DOTS); + wprintf(TranslateW_LP(L"%s version %s"), name, __VERSION_STRING_DOTS); } int wmain(int argc, wchar_t *argv[]) @@ -104,7 +104,7 @@ int wmain(int argc, wchar_t *argv[]) wprintf(L"%s\n", reply->message); } else { - wprintf(TranslateT("Unknown command '%s'.\n"), argv[1]); + wprintf(TranslateW_LP(L"Unknown command '%s'.\n"), argv[1]); error = 0; } diff --git a/plugins/MimCmd/src/commands.cpp b/plugins/MimCmd/src/commands.cpp index 37a6be7795..10a437e383 100644 --- a/plugins/MimCmd/src/commands.cpp +++ b/plugins/MimCmd/src/commands.cpp @@ -114,16 +114,16 @@ void HandleHelpCommand(PCommand, wchar_t *argv[], int argc, PReply reply) if (command) { reply->code = MIMRES_SUCCESS; - szReply.Append(TranslateW(command->help)); + szReply.Append(TranslateW_LP(command->help)); } else { reply->code = MIMRES_NOTFOUND; - szReply.AppendFormat(TranslateT("No help for '%s'."), argv[2]); + szReply.AppendFormat(TranslateW_LP(L"No help for '%s'."), argv[2]); } } else { reply->code = MIMRES_SUCCESS; - szReply.Append(TranslateT("Available commands: ")); + szReply.Append(TranslateW_LP(L"Available commands: ")); for (int i = 0; i < cKnownCommands - 1; i++) { szReply.Append(knownCommands[i].command); @@ -179,7 +179,7 @@ void ProcessConsoleCommand(PCommand command, wchar_t *arguments[], int count, PR case WAIT_OBJECT_0 + 1: //close event default: - mir_wstrcpy(sdCmdLine->reply.message, TranslateT("Miranda has been closed or an error has occurred while waiting for the result, could not process request.")); + mir_wstrcpy(sdCmdLine->reply.message, TranslateW_LP(L"Miranda has been closed or an error has occurred while waiting for the result, could not process request.")); done = TRUE; break; diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h index 77b649545a..699f69bbc1 100755 --- a/plugins/New_GPG/src/stdafx.h +++ b/plugins/New_GPG/src/stdafx.h @@ -73,6 +73,11 @@ using std::fstream; #include +struct CMPlugin : public PLUGIN +{ + CMPlugin(); +}; + //internal #include "resource.h" #include "version.h" @@ -87,9 +92,4 @@ using std::fstream; #include "options.h" #include "globals.h" -struct CMPlugin : public PLUGIN -{ - CMPlugin(); -}; - #endif diff --git a/plugins/OpenSSL/src/ssl_openssl.cpp b/plugins/OpenSSL/src/ssl_openssl.cpp index 2d477e8dde..20056c5495 100644 --- a/plugins/OpenSSL/src/ssl_openssl.cpp +++ b/plugins/OpenSSL/src/ssl_openssl.cpp @@ -101,12 +101,12 @@ static void ReportSslError(SECURITY_STATUS scRet, int line, bool = false) return; case SEC_E_INVALID_TOKEN: - tszMsg += TranslateT("Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package"); + tszMsg += TranslateW_LP(L"Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package"); break; case CERT_E_CN_NO_MATCH: case SEC_E_WRONG_PRINCIPAL: - tszMsg += TranslateT("Host we are connecting to is not the one certificate was issued for"); + tszMsg += TranslateW_LP(L"Host we are connecting to is not the one certificate was issued for"); break; default: @@ -404,7 +404,7 @@ static INT_PTR GetSslApi(WPARAM, LPARAM lParam) int LoadSslModule(void) { if (!SSL_library_load()) { - MessageBoxW(nullptr, TranslateT("OpenSSL library loading failed"), TranslateT("OpenSSL error"), MB_ICONERROR | MB_OK); + MessageBoxW(nullptr, TranslateW_LP(L"OpenSSL library loading failed"), TranslateW_LP(L"OpenSSL error"), MB_ICONERROR | MB_OK); return 1; } CreateServiceFunction(MS_SYSTEM_GET_SI, GetSslApi); diff --git a/plugins/TranslitSwitcher/src/Layoutproc.cpp b/plugins/TranslitSwitcher/src/Layoutproc.cpp index 03740c5813..915301ad6e 100644 --- a/plugins/TranslitSwitcher/src/Layoutproc.cpp +++ b/plugins/TranslitSwitcher/src/Layoutproc.cpp @@ -430,7 +430,7 @@ void SwitchLayout(bool lastword) POPUPDATAT pd = { 0 }; pd.lchIcon = IcoLib_GetIcon("Switch Layout and Send"); mir_wstrncpy(pd.lptzText, buf, _countof(pd.lptzText)); - mir_wstrncpy(pd.lptzContactName, TranslateT("TranslitSwitcher"), _countof(pd.lptzContactName)); + mir_wstrncpy(pd.lptzContactName, TranslateW_LP(L"TranslitSwitcher"), _countof(pd.lptzContactName)); PUAddPopupT(&pd); } } -- cgit v1.2.3