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/WhenWasIt/src/dlg_handlers.cpp | 28 ++++++++++++++-------------- plugins/WhenWasIt/src/services.cpp | 18 +++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'plugins/WhenWasIt/src') diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index f7f3945f39..d3658eb3a8 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -195,7 +195,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara SetDlgItemText(hWnd, IDC_DAYS_IN_ADVANCE, buffer); _itot(commonData.checkInterval, buffer, 10); SetDlgItemText(hWnd, IDC_CHECK_INTERVAL, buffer); - mir_sntprintf(buffer, _T("%d|%d"), commonData.popupTimeout, commonData.popupTimeoutToday); + mir_sntprintf(buffer, L"%d|%d", commonData.popupTimeout, commonData.popupTimeoutToday); SetDlgItemText(hWnd, IDC_POPUP_TIMEOUT, buffer); _itot(commonData.cSoundNearDays, buffer, 10); SetDlgItemText(hWnd, IDC_SOUND_NEAR_DAYS_EDIT, buffer); @@ -436,7 +436,7 @@ INT_PTR CALLBACK DlgProcAddBirthday(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l switch (loc) { case DOB_MBIRTHDAY: DateTime_SetMonthCalColor(hDate, MCSC_TITLEBK, COLOR_MBIRTHDAY); - szCurrentModuleTooltip = _T("mBirthday"); + szCurrentModuleTooltip = L"mBirthday"; break; case DOB_PROTOCOL: @@ -447,17 +447,17 @@ INT_PTR CALLBACK DlgProcAddBirthday(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l case DOB_BIRTHDAYREMINDER: DateTime_SetMonthCalColor(hDate, MCSC_TITLEBK, COLOR_BIRTHDAYREMINDER); - szCurrentModuleTooltip = _T("Birthday Reminder"); + szCurrentModuleTooltip = L"Birthday Reminder"; break; case DOB_USERINFO: DateTime_SetMonthCalColor(hDate, MCSC_TITLEBK, COLOR_USERINFO); - szCurrentModuleTooltip = _T("UserInfo"); + szCurrentModuleTooltip = L"UserInfo"; break; case DOB_MICQBIRTHDAY: DateTime_SetMonthCalColor(hDate, MCSC_TITLEBK, COLOR_MICQBIRTHDAY); - szCurrentModuleTooltip = _T("mICQBirthday"); + szCurrentModuleTooltip = L"mICQBirthday"; break; default: @@ -519,11 +519,11 @@ void AddAnchorWindowToDeferList(HDWP &hdWnds, HWND window, RECT *rParent, WINDOW TCHAR* GetBirthdayModule(int module, MCONTACT) { switch (module) { - case DOB_MBIRTHDAY: return _T("mBirthday"); + case DOB_MBIRTHDAY: return L"mBirthday"; case DOB_PROTOCOL: return TranslateT("Protocol module"); - case DOB_BIRTHDAYREMINDER: return _T("Birthday Reminder"); - case DOB_USERINFO: return _T("UserInfo"); - case DOB_MICQBIRTHDAY: return _T("mICQBirthday"); + case DOB_BIRTHDAYREMINDER: return L"Birthday Reminder"; + case DOB_USERINFO: return L"UserInfo"; + case DOB_MICQBIRTHDAY: return L"mICQBirthday"; } return NA; } @@ -609,20 +609,20 @@ int UpdateBirthdayEntry(HWND hList, MCONTACT hContact, int entry, int bShowAll, TCHAR buffer[2048]; if ((dtb <= 366) && (dtb >= 0)) - mir_sntprintf(buffer, _T("%d"), dtb); + mir_sntprintf(buffer, L"%d", dtb); else mir_sntprintf(buffer, NA); ListView_SetItemText(hList, entry, 2, buffer); if ((month != 0) && (day != 0)) - mir_sntprintf(buffer, _T("%04d-%02d-%02d"), year, month, day); + mir_sntprintf(buffer, L"%04d-%02d-%02d", year, month, day); else mir_sntprintf(buffer, NA); ListView_SetItemText(hList, entry, 3, buffer); if (age < 400 && age > 0) //hopefully noone lives longer than this :) - mir_sntprintf(buffer, _T("%d"), age); + mir_sntprintf(buffer, L"%d", age); else mir_sntprintf(buffer, NA); @@ -914,9 +914,9 @@ INT_PTR CALLBACK DlgProcUpcoming(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar ListView_InsertItem(hList, &item); TCHAR buffer[512]; - mir_sntprintf(buffer, _T("%d"), data->age); + mir_sntprintf(buffer, L"%d", data->age); ListView_SetItemText(hList, index, 1, buffer); - mir_sntprintf(buffer, _T("%d"), data->dtb); + mir_sntprintf(buffer, L"%d", data->dtb); ListView_SetItemText(hList, index, 2, buffer); BirthdaysSortParams params = { 0 }; diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp index f6d27f5a5f..8eeaf21b6a 100644 --- a/plugins/WhenWasIt/src/services.cpp +++ b/plugins/WhenWasIt/src/services.cpp @@ -217,7 +217,7 @@ INT_PTR ImportBirthdaysService(WPARAM, LPARAM) of.lStructSize = sizeof(OPENFILENAME); //of.hInstance = hInstance; TCHAR filter[MAX_PATH]; - mir_sntprintf(filter, _T("%s (*") _T(BIRTHDAY_EXTENSION) _T(")%c*") _T(BIRTHDAY_EXTENSION) _T("%c"), TranslateT("Birthdays files"), 0, 0); + mir_sntprintf(filter, L"%s (*" _T(BIRTHDAY_EXTENSION) L")%c*" _T(BIRTHDAY_EXTENSION) L"%c", TranslateT("Birthdays files"), 0, 0); of.lpstrFilter = filter; of.lpstrFile = fileName; of.nMaxFile = _countof(fileName); @@ -242,7 +242,7 @@ INT_PTR ExportBirthdaysService(WPARAM, LPARAM) of.lStructSize = sizeof(OPENFILENAME); //of.hInstance = hInstance; TCHAR filter[MAX_PATH]; - mir_sntprintf(filter, _T("%s (*") _T(BIRTHDAY_EXTENSION) _T(")%c*") _T(BIRTHDAY_EXTENSION) _T("%c%s (*.*)%c*.*%c"), TranslateT("Birthdays files"), 0, 0, TranslateT("All Files"), 0, 0); + mir_sntprintf(filter, L"%s (*" _T(BIRTHDAY_EXTENSION) L")%c*" _T(BIRTHDAY_EXTENSION) L"%c%s (*.*)%c*.*%c", TranslateT("Birthdays files"), 0, 0, TranslateT("All Files"), 0, 0); of.lpstrFilter = filter; of.lpstrFile = fileName; of.nMaxFile = _countof(fileName); @@ -265,7 +265,7 @@ INT_PTR ExportBirthdaysService(WPARAM, LPARAM) int DoImport(TCHAR *fileName) { - FILE *fin = _tfopen(fileName, _T("rt")); + FILE *fin = _tfopen(fileName, L"rt"); if (!fin) { MessageBox(0, TranslateT("Could not open file to import birthdays"), TranslateT("Error"), MB_OK | MB_ICONERROR); return 1; @@ -279,7 +279,7 @@ int DoImport(TCHAR *fileName) if (buffer[0] == _T(COMMENT_CHAR)) continue; - TCHAR *delAccount = _tcsstr(buffer, _T(" : ")); + TCHAR *delAccount = _tcsstr(buffer, L" : "); if (delAccount) { int tmp = delAccount[0]; delAccount[0] = _T('\0'); @@ -295,7 +295,7 @@ int DoImport(TCHAR *fileName) delAccount[0] = tmp; int year, month, day; - _stscanf(delAccount, _T(" : %02d/%02d/%04d"), &day, &month, &year); + _stscanf(delAccount, L" : %02d/%02d/%04d", &day, &month, &year); SaveBirthday(hContact, year, month, day, mode); } else { @@ -312,14 +312,14 @@ int DoImport(TCHAR *fileName) int DoExport(TCHAR *fileName) { - FILE *fout = _tfopen(fileName, _T("wt")); + FILE *fout = _tfopen(fileName, L"wt"); if (!fout) { MessageBox(0, TranslateT("Could not open file to export birthdays"), TranslateT("Error"), MB_OK | MB_ICONERROR); return 1; } - _ftprintf(fout, _T("%c%s"), _T(COMMENT_CHAR), TranslateT("Please do not edit this file by hand. Use the export function of WhenWasIt plugin.\n")); - _ftprintf(fout, _T("%c%s"), _T(COMMENT_CHAR), TranslateT("Warning! Please do not mix Unicode and Ansi exported birthday files. You should use the same version (Ansi/Unicode) of WhenWasIt that was used to export the info.\n")); - _ftprintf(fout, _T("%c%s"), _T(COMMENT_CHAR), TranslateT("This file was exported with a Unicode version of WhenWasIt. Please only use a Unicode version of the plugin to import the birthdays.\n")); + _ftprintf(fout, L"%c%s", _T(COMMENT_CHAR), TranslateT("Please do not edit this file by hand. Use the export function of WhenWasIt plugin.\n")); + _ftprintf(fout, L"%c%s", _T(COMMENT_CHAR), TranslateT("Warning! Please do not mix Unicode and Ansi exported birthday files. You should use the same version (Ansi/Unicode) of WhenWasIt that was used to export the info.\n")); + _ftprintf(fout, L"%c%s", _T(COMMENT_CHAR), TranslateT("This file was exported with a Unicode version of WhenWasIt. Please only use a Unicode version of the plugin to import the birthdays.\n")); for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { int year, month, day; -- cgit v1.2.3