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/SecureIM/src/loadlib.cpp | 4 ++-- plugins/SecureIM/src/main.cpp | 2 +- plugins/SecureIM/src/options.cpp | 28 ++++++++++++++-------------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/SecureIM') diff --git a/plugins/SecureIM/src/loadlib.cpp b/plugins/SecureIM/src/loadlib.cpp index ebe2fab802..640f464ce4 100644 --- a/plugins/SecureIM/src/loadlib.cpp +++ b/plugins/SecureIM/src/loadlib.cpp @@ -5,9 +5,9 @@ CRYPTOPP_INFO cpp; HMODULE h; BOOL loadlib(void) { - h = LoadLibrary(_T("plugins/cryptopp.dll")); + h = LoadLibrary("plugins/cryptopp.dll"); if (h == NULL) { - h = LoadLibrary(_T("cryptopp.dll")); + h = LoadLibrary("cryptopp.dll"); if (h == NULL) return 0; } diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index dc695ce9b7..5a02a2cf66 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -304,7 +304,7 @@ extern "C" __declspec(dllexport) int __cdecl Load(void) // check for support TrueColor Icons BOOL bIsComCtl6 = FALSE; - HMODULE hComCtlDll = LoadLibrary(_T("comctl32.dll")); + HMODULE hComCtlDll = LoadLibrary("comctl32.dll"); if (hComCtlDll) { typedef HRESULT(CALLBACK *PFNDLLGETVERSION)(DLLVERSIONINFO*); PFNDLLGETVERSION pfnDllGetVersion = (PFNDLLGETVERSION)GetProcAddress(hComCtlDll, "DllGetVersion"); diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index cef386ddbf..6c05088389 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -806,7 +806,7 @@ INT_PTR CALLBACK DlgProcOptionsGPG(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l GetDlgItemText(hDlg, IDC_GPGEXECUTABLE_EDIT, gpgexe, _countof(gpgexe)); // filter zusammensetzen - mir_snprintf(filter, _T("%s (*.exe)%c*.exe%c%c"), Translate("Executable Files"), 0, 0, 0); + mir_snprintf(filter, "%s (*.exe)%c*.exe%c%c", Translate("Executable Files"), 0, 0, 0); // OPENFILENAME initialisieren OPENFILENAME ofn = { sizeof(ofn) }; @@ -1020,8 +1020,8 @@ void RefreshProtoDlg(HWND hDlg) ListView_SetCheckState(hLV, itemNum, arProto[i]->inspecting); } - SetDlgItemText(hDlg, IDC_SPLITON, _T("0")); - SetDlgItemText(hDlg, IDC_SPLITOFF, _T("0")); + SetDlgItemText(hDlg, IDC_SPLITON, "0"); + SetDlgItemText(hDlg, IDC_SPLITOFF, "0"); EnableWindow(GetDlgItem(hDlg, IDC_SPLITON), false); EnableWindow(GetDlgItem(hDlg, IDC_SPLITOFF), false); @@ -1154,8 +1154,8 @@ void RefreshGPGDlg(HWND hDlg, BOOL iInit) void ResetGeneralDlg(HWND hDlg) { - SetDlgItemText(hDlg, IDC_KET, _T("10")); - SetDlgItemText(hDlg, IDC_OKT, _T("2")); + SetDlgItemText(hDlg, IDC_KET, "10"); + SetDlgItemText(hDlg, IDC_OKT, "2"); CheckDlgButton(hDlg, IDC_SFT, BST_UNCHECKED); CheckDlgButton(hDlg, IDC_SOM, BST_UNCHECKED); @@ -1571,7 +1571,7 @@ BOOL ShowSelectKeyDlg(HWND hParent, LPSTR KeyPath) ofn.lpstrFile = KeyPath; char temp[MAX_PATH]; - mir_snprintf(temp, _T("%s (*.asc)%c*.asc%c%s (*.*)%c*.*%c%c"), Translate("ASC files"), 0, 0, Translate("All files"), 0, 0, 0); + mir_snprintf(temp, "%s (*.asc)%c*.asc%c%s (*.*)%c*.*%c%c", Translate("ASC files"), 0, 0, Translate("All files"), 0, 0, 0); ofn.lpstrFilter = temp; ofn.lpstrTitle = TranslateT("Open Key File"); if (!GetOpenFileName(&ofn)) return FALSE; @@ -1622,13 +1622,13 @@ LPSTR LoadKeys(LPCSTR file, BOOL priv) BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) { - TCHAR szFile[MAX_PATH] = _T("rsa_pub.asc"); + TCHAR szFile[MAX_PATH] = "rsa_pub.asc"; if (priv) - mir_tstrcpy(szFile, _T("rsa_priv.asc")); + mir_tstrcpy(szFile, "rsa_priv.asc"); OPENFILENAME ofn = { sizeof(ofn) }; char temp[MAX_PATH]; - mir_snprintf(temp, _T("%s (*.asc)%c*.asc%c%s (*.*)%c*.*%c%c"), Translate("ASC files"), 0, 0, Translate("All files"), 0, 0, 0); + mir_snprintf(temp, "%s (*.asc)%c*.asc%c%s (*.*)%c*.*%c%c", Translate("ASC files"), 0, 0, Translate("All files"), 0, 0, 0); ofn.lpstrFilter = temp; ofn.hwndOwner = hParent; ofn.nMaxFile = MAX_PATH; @@ -1639,7 +1639,7 @@ BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) if (!GetSaveFileName(&ofn)) return FALSE; - FILE *f = _tfopen(szFile, _T("wb")); + FILE *f = _tfopen(szFile, "wb"); if (!f) return FALSE; fwrite(key, mir_strlen(key), 1, f); @@ -1650,9 +1650,9 @@ BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) { - TCHAR szFile[MAX_PATH] = _T("rsa_pub.asc"); + TCHAR szFile[MAX_PATH] = "rsa_pub.asc"; if (priv) - mir_tstrcpy(szFile, _T("rsa_priv.asc")); + mir_tstrcpy(szFile, "rsa_priv.asc"); OPENFILENAME ofn = { 0 }; ofn.lStructSize = sizeof(ofn); @@ -1661,13 +1661,13 @@ BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) ofn.Flags = OFN_EXPLORER | OFN_CREATEPROMPT | OFN_OVERWRITEPROMPT | OFN_NOREADONLYRETURN; ofn.lpstrFile = szFile; char temp[MAX_PATH]; - mir_snprintf(temp, _T("%s (*.asc)%c*.asc%c%s (*.*)%c*.*%c%c"), Translate("ASC files"), 0, 0, Translate("All files"), 0, 0, 0); + mir_snprintf(temp, "%s (*.asc)%c*.asc%c%s (*.*)%c*.*%c%c", Translate("ASC files"), 0, 0, Translate("All files"), 0, 0, 0); ofn.lpstrFilter = temp; ofn.lpstrTitle = (priv) ? TranslateT("Load Private Key File") : TranslateT("Load Public Key File"); if (!GetOpenFileName(&ofn)) return FALSE; - FILE *f = _tfopen(szFile, _T("rb")); + FILE *f = _tfopen(szFile, "rb"); if (!f) return FALSE; -- cgit v1.2.3