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/SeenPlugin/src/file.cpp | 2 +- plugins/SeenPlugin/src/history.cpp | 4 ++-- plugins/SeenPlugin/src/main.cpp | 4 ++-- plugins/SeenPlugin/src/missed.cpp | 4 ++-- plugins/SeenPlugin/src/stdafx.h | 10 +++++----- plugins/SeenPlugin/src/utils.cpp | 26 +++++++++++++------------- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'plugins/SeenPlugin/src') diff --git a/plugins/SeenPlugin/src/file.cpp b/plugins/SeenPlugin/src/file.cpp index adbea85e83..3417e06dd2 100644 --- a/plugins/SeenPlugin/src/file.cpp +++ b/plugins/SeenPlugin/src/file.cpp @@ -55,7 +55,7 @@ void UninitFileOutput() void FileWrite(MCONTACT hcontact) { - FILE *log = _tfopen(ParseString(g_ptszFileName, hcontact), _T("a")); + FILE *log = _tfopen(ParseString(g_ptszFileName, hcontact), L"a"); if (log != NULL) { _fputts(ParseString(g_ptszFileStamp, hcontact), log); fputs("\r\n", log); diff --git a/plugins/SeenPlugin/src/history.cpp b/plugins/SeenPlugin/src/history.cpp index fd214f674c..7d589a95c8 100644 --- a/plugins/SeenPlugin/src/history.cpp +++ b/plugins/SeenPlugin/src/history.cpp @@ -92,7 +92,7 @@ void LoadHistoryList(MCONTACT hContact, HWND hwnd, int nList) SendDlgItemMessage(hwnd, nList, LB_ADDSTRING, 0, (LPARAM)dbv.ptszVal); db_free(&dbv); } - else SendDlgItemMessage(hwnd, nList, LB_ADDSTRING, 0, (LPARAM)_T("")); + else SendDlgItemMessage(hwnd, nList, LB_ADDSTRING, 0, (LPARAM)L""); } } @@ -174,7 +174,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwndDlg, UINT Message, WPARAM wparam, LPARA TranslateDialogDefault(hwndDlg); hContact = (MCONTACT)lparam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lparam); - mir_sntprintf(sztemp, _T("%s: %s"), + mir_sntprintf(sztemp, L"%s: %s", pcli->pfnGetContactDisplayName(hContact, 0), TranslateT("last seen history")); SetWindowText(hwndDlg, sztemp); diff --git a/plugins/SeenPlugin/src/main.cpp b/plugins/SeenPlugin/src/main.cpp index 7403d10827..e3d6c714e6 100644 --- a/plugins/SeenPlugin/src/main.cpp +++ b/plugins/SeenPlugin/src/main.cpp @@ -44,8 +44,8 @@ PLUGININFOEX pluginInfo = { #define TRANSNUMBER 2 DBVTranslation idleTr[TRANSNUMBER] = { - { any_to_IdleNotidleUnknown, _T("Any to Idle/Not Idle/Unknown"), 0 }, - { any_to_Idle, _T("Any to /Idle or empty"), 0 } + { any_to_IdleNotidleUnknown, L"Any to Idle/Not Idle/Unknown", 0 }, + { any_to_Idle, L"Any to /Idle or empty", 0 } }; static int CompareProtos(const char *p1, const char *p2) diff --git a/plugins/SeenPlugin/src/missed.cpp b/plugins/SeenPlugin/src/missed.cpp index 07f5c52fac..eeb15431f4 100644 --- a/plugins/SeenPlugin/src/missed.cpp +++ b/plugins/SeenPlugin/src/missed.cpp @@ -109,11 +109,11 @@ int ShowMissed(void) for (int loop = 0; loop < mcs.count; loop++) { mir_tstrncat(sztemp, (TCHAR*)pcli->pfnGetContactDisplayName(mcs.wpcontact[loop], 0), _countof(sztemp) - mir_tstrlen(sztemp)); if (db_get_b(NULL, S_MOD, "MissedOnes_Count", 0)) { - mir_sntprintf(szcount, _T(" [%i]"), mcs.times[loop]); + mir_sntprintf(szcount, L" [%i]", mcs.times[loop]); mir_tstrcat(sztemp, szcount); } - mir_tstrcat(sztemp, _T("\n")); + mir_tstrcat(sztemp, L"\n"); } CreateDialogParam(hInstance, MAKEINTRESOURCE(IDD_MISSED), NULL, MissedDlgProc, (LPARAM)sztemp); diff --git a/plugins/SeenPlugin/src/stdafx.h b/plugins/SeenPlugin/src/stdafx.h index c1371e94ed..48999ed4c2 100644 --- a/plugins/SeenPlugin/src/stdafx.h +++ b/plugins/SeenPlugin/src/stdafx.h @@ -61,7 +61,7 @@ WCHAR *any_to_Idle(MCONTACT hContact, const char *module_name, const char *setti //#define UM_CHECKHOOKS (WM_USER+1) -#define debug(a) MessageBox(NULL,a,_T("Debug"),MB_OK) +#define debug(a) MessageBox(NULL,a,L"Debug",MB_OK) #define IDI_USERDETAILS 160 #define IDI_DOWNARROW 264 @@ -78,13 +78,13 @@ WCHAR *any_to_Idle(MCONTACT hContact, const char *module_name, const char *setti #define WM_REFRESH_UI (WM_USER+10) -#define DEFAULT_MENUSTAMP _T("%d.%m.%Y - %H:%M [%s]") +#define DEFAULT_MENUSTAMP L"%d.%m.%Y - %H:%M [%s]" #define DEFAULT_POPUPSTAMP TranslateT("%n is %s (%u)") #define DEFAULT_POPUPSTAMPTEXT TranslateT("%i(%r)%bWas %o") #define DEFAULT_USERSTAMP TranslateT("Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClient ID: %t%C%b%bStatus Message:%t%T") -#define DEFAULT_FILESTAMP _T("%d.%m.%Y %H:%M:%S%t%n%t%s%t%u%t%r | %i%t%N") -#define DEFAULT_FILENAME _T("%miranda_logpath%\\LastSeen\\%P.txt") -#define DEFAULT_HISTORYSTAMP _T("%d.%m.%Y - %H:%M [%s]") +#define DEFAULT_FILESTAMP L"%d.%m.%Y %H:%M:%S%t%n%t%s%t%u%t%r | %i%t%N" +#define DEFAULT_FILENAME L"%miranda_logpath%\\LastSeen\\%P.txt" +#define DEFAULT_HISTORYSTAMP L"%d.%m.%Y - %H:%M [%s]" #define DEFAULT_WATCHEDPROTOCOLS "" typedef struct{ diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp index f902e34484..8b281dd3f9 100644 --- a/plugins/SeenPlugin/src/utils.cpp +++ b/plugins/SeenPlugin/src/utils.cpp @@ -182,18 +182,18 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) switch (*++p) { case 'Y': if (!st.wYear) goto LBL_noData; - d += _stprintf(d, _T("%04i"), st.wYear); //!!!!!!!!!!!! + d += _stprintf(d, L"%04i", st.wYear); //!!!!!!!!!!!! break; case 'y': if (!st.wYear) goto LBL_noData; - d += _stprintf(d, _T("%02i"), st.wYear % 100); //!!!!!!!!!!!! + d += _stprintf(d, L"%02i", st.wYear % 100); //!!!!!!!!!!!! break; case 'm': if (!(isetting = st.wMonth)) goto LBL_noData; LBL_2DigNum: - d += _stprintf(d, _T("%02i"), isetting); //!!!!!!!!!!!! + d += _stprintf(d, L"%02i", isetting); //!!!!!!!!!!!! break; case 'd': @@ -204,12 +204,12 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) isetting = st.wDayOfWeek; if (isetting == -1) { LBL_noData: - charPtr = wantempty ? _T("") : TranslateT(""); + charPtr = wantempty ? L"" : TranslateT(""); goto LBL_charPtr; } charPtr = TranslateTS(weekdays[isetting]); LBL_charPtr: - d += mir_sntprintf(d, MAXSIZE - (d - sztemp), _T("%s"), charPtr); + d += mir_sntprintf(d, MAXSIZE - (d - sztemp), L"%s", charPtr); break; case 'w': @@ -240,7 +240,7 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) case 'p': if ((isetting = st.wHour) == -1) goto LBL_noData; - charPtr = (isetting >= 12) ? _T("PM") : _T("AM"); + charPtr = (isetting >= 12) ? L"PM" : L"AM"; goto LBL_charPtr; case 'M': @@ -252,7 +252,7 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) goto LBL_2DigNum; case 'n': - charPtr = hcontact ? (TCHAR*)pcli->pfnGetContactDisplayName(hcontact, 0) : (wantempty ? _T("") : _T("---")); + charPtr = hcontact ? (TCHAR*)pcli->pfnGetContactDisplayName(hcontact, 0) : (wantempty ? L"" : L"---"); goto LBL_charPtr; case 'N': @@ -282,7 +282,7 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) if (isetting = db_get_w(hcontact, S_MOD, hcontact ? "StatusTriger" : courProtoName, 0)) { _tcsncpy(szdbsetting, pcli->pfnGetStatusModeDescription(isetting | 0x8000, 0), _countof(szdbsetting)); if (!(isetting & 0x8000)) { - mir_tstrncat(szdbsetting, _T("/"), _countof(szdbsetting) - mir_tstrlen(szdbsetting)); + mir_tstrncat(szdbsetting, L"/", _countof(szdbsetting) - mir_tstrlen(szdbsetting)); mir_tstrncat(szdbsetting, TranslateT("Idle"), _countof(szdbsetting) - mir_tstrlen(szdbsetting)); } charPtr = szdbsetting; @@ -294,7 +294,7 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) if (db_get_ts(hcontact, "CList", "StatusMsg", &dbv)) goto LBL_noData; - d += mir_sntprintf(d, MAXSIZE - (d - sztemp), _T("%s"), dbv.ptszVal); + d += mir_sntprintf(d, MAXSIZE - (d - sztemp), L"%s", dbv.ptszVal); db_free(&dbv); break; @@ -302,7 +302,7 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) if (isetting = db_get_w(hcontact, S_MOD, hcontact ? "OldStatus" : courProtoName, 0)) { _tcsncpy(szdbsetting, pcli->pfnGetStatusModeDescription(isetting, 0), _countof(szdbsetting)); if (includeIdle && hcontact && db_get_b(hcontact, S_MOD, "OldIdle", 0)) { - mir_tstrncat(szdbsetting, _T("/"), _countof(szdbsetting) - mir_tstrlen(szdbsetting)); + mir_tstrncat(szdbsetting, L"/", _countof(szdbsetting) - mir_tstrlen(szdbsetting)); mir_tstrncat(szdbsetting, TranslateT("Idle"), _countof(szdbsetting) - mir_tstrlen(szdbsetting)); } charPtr = szdbsetting; @@ -331,12 +331,12 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) goto LBL_charPtr; case 'P': - _tcsncpy(szdbsetting, szProto ? _A2T(szProto) : (wantempty ? _T("") : _T("ProtoUnknown")), _countof(szdbsetting)); + _tcsncpy(szdbsetting, szProto ? _A2T(szProto) : (wantempty ? L"" : L"ProtoUnknown"), _countof(szdbsetting)); charPtr = szdbsetting; goto LBL_charPtr; case 'b': - charPtr = _T("\x0D\x0A"); + charPtr = L"\x0D\x0A"; goto LBL_charPtr; case 'C': // Get Client Info @@ -347,7 +347,7 @@ TCHAR* ParseString(TCHAR *szstring, MCONTACT hcontact) goto LBL_noData; case 't': - charPtr = _T("\t"); + charPtr = L"\t"; goto LBL_charPtr; case 'A': -- cgit v1.2.3