From b280d2eae93fb22b4fdb45218d8a06287a97030e Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 12:49:22 +0000 Subject: replace _tcscmp to mir_tstrcmp git-svn-id: http://svn.miranda-ng.org/main/trunk@13753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/buttonsbar.cpp | 6 +++--- plugins/TabSRMM/src/chat/services.cpp | 2 +- plugins/TabSRMM/src/chat/window.cpp | 2 +- plugins/TabSRMM/src/contactcache.cpp | 2 +- plugins/TabSRMM/src/container.cpp | 4 ++-- plugins/TabSRMM/src/containeroptions.cpp | 4 ++-- plugins/TabSRMM/src/msgdialog.cpp | 2 +- plugins/TabSRMM/src/msgdlgutils.cpp | 2 +- plugins/TabSRMM/src/msgoptions.cpp | 2 +- plugins/TabSRMM/src/selectcontainer.cpp | 4 ++-- plugins/TabSRMM/src/themes.cpp | 16 ++++++++-------- plugins/TabSRMM/src/utils.cpp | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp index e6c34b4eb1..901fbcb4c8 100644 --- a/plugins/TabSRMM/src/buttonsbar.cpp +++ b/plugins/TabSRMM/src/buttonsbar.cpp @@ -376,7 +376,7 @@ static int SaveTree(HWND hToolBarTree) while (tvi.hItem != NULL) { TreeView_GetItem(hToolBarTree, &tvi); - if (_tcscmp(tvi.pszText, MIDDLE_SEPARATOR) == 0) { + if (mir_tstrcmp(tvi.pszText, MIDDLE_SEPARATOR) == 0) { RSide = true; count = TreeView_GetCount(hToolBarTree) * 10 - count; tvi.hItem = TreeView_GetNextSibling(hToolBarTree, tvi.hItem); @@ -715,7 +715,7 @@ INT_PTR CALLBACK DlgProcToolBar(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l tvi.mask = TVIF_TEXT | TVIF_HANDLE | TVIF_PARAM; TreeView_GetItem(hToolBarTree, &tvi); - if (tvi.lParam == 0 || !TreeView_GetCheckState(hToolBarTree, tvi.hItem) || !_tcscmp(tvi.pszText, MIDDLE_SEPARATOR)) + if (tvi.lParam == 0 || !TreeView_GetCheckState(hToolBarTree, tvi.hItem) || !mir_tstrcmp(tvi.pszText, MIDDLE_SEPARATOR)) break; CustomButtonData *cbd = (CustomButtonData*)tvi.lParam; @@ -743,7 +743,7 @@ INT_PTR CALLBACK DlgProcToolBar(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l tvi.hItem = hti; TreeView_GetItem(hToolBarTree, &tvi); - if (!TreeView_GetCheckState(hToolBarTree, tvi.hItem) || !_tcscmp(tvi.pszText, MIDDLE_SEPARATOR)) { + if (!TreeView_GetCheckState(hToolBarTree, tvi.hItem) || !mir_tstrcmp(tvi.pszText, MIDDLE_SEPARATOR)) { Utils::enableDlgControl(hwndDlg, IDC_IMCHECK, false); Utils::enableDlgControl(hwndDlg, IDC_CHATCHECK, false); Utils::enableDlgControl(hwndDlg, IDC_CANBEHIDDEN, false); diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp index 9c5e1e72f8..46c67ba0a1 100644 --- a/plugins/TabSRMM/src/chat/services.cpp +++ b/plugins/TabSRMM/src/chat/services.cpp @@ -167,7 +167,7 @@ void ShowRoom(SESSION_INFO *si, WPARAM, BOOL) TContainerData *pContainer = si->pContainer; if (pContainer == NULL) { GetContainerNameForContact(si->hContact, szName, CONTAINER_NAMELEN); - if (!g_Settings.bOpenInDefault && !_tcscmp(szName, _T("default"))) + if (!g_Settings.bOpenInDefault && !mir_tstrcmp(szName, _T("default"))) _tcsncpy(szName, _T("Chat Rooms"), CONTAINER_NAMELEN); szName[CONTAINER_NAMELEN] = 0; pContainer = FindContainerByName(szName); diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index bcb1e6d30b..c6eb16c2ce 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -3214,7 +3214,7 @@ LABEL_SHOWWINDOW: case DM_CONTAINERSELECTED: { TCHAR *szNewName = (TCHAR*)lParam; - if (!_tcscmp(szNewName, TranslateT("Default container"))) + if (!mir_tstrcmp(szNewName, TranslateT("Default container"))) szNewName = CGlobals::m_default_container_name; int iOldItems = TabCtrl_GetItemCount(hwndTab); if (!_tcsncmp(dat->pContainer->szName, szNewName, CONTAINER_NAMELEN)) diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index de67b789b8..268826c11c 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -120,7 +120,7 @@ bool CContactCache::updateNick() if (m_Valid) { TCHAR *tszNick = pcli->pfnGetContactDisplayName(getActiveContact(), 0); if (tszNick) - fChanged = (_tcscmp(m_szNick, tszNick) ? true : false); + fChanged = (mir_tstrcmp(m_szNick, tszNick) ? true : false); _tcsncpy_s(m_szNick, (tszNick ? tszNick : _T("")), _TRUNCATE); } return fChanged; diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp index 96d552094b..61e9997c1c 100644 --- a/plugins/TabSRMM/src/container.cpp +++ b/plugins/TabSRMM/src/container.cpp @@ -1791,7 +1791,7 @@ TContainerData* TSAPI CreateContainer(const TCHAR *name, int iTemp, MCONTACT hCo _tcsncpy(pContainer->szName, name, CONTAINER_NAMELEN + 1); AppendToContainerList(pContainer); - if (M.GetByte("limittabs", 0) && !_tcscmp(name, _T("default"))) + if (M.GetByte("limittabs", 0) && !mir_tstrcmp(name, _T("default"))) iTemp |= CNT_CREATEFLAG_CLONED; // save container name to the db @@ -2143,7 +2143,7 @@ HMENU TSAPI BuildContainerMenu() break; if (_tcsncmp(tszName, _T("**mir_free**"), CONTAINER_NAMELEN)) - AppendMenu(hMenu, MF_STRING, IDM_CONTAINERMENU + i, !_tcscmp(tszName, _T("default")) ? TranslateT("Default container") : tszName); + AppendMenu(hMenu, MF_STRING, IDM_CONTAINERMENU + i, !mir_tstrcmp(tszName, _T("default")) ? TranslateT("Default container") : tszName); i++; } diff --git a/plugins/TabSRMM/src/containeroptions.cpp b/plugins/TabSRMM/src/containeroptions.cpp index 014b0c29f8..bfea4acde1 100644 --- a/plugins/TabSRMM/src/containeroptions.cpp +++ b/plugins/TabSRMM/src/containeroptions.cpp @@ -151,7 +151,7 @@ INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM wParam, TranslateDialogDefault(hwndDlg); SetWindowText(hwndDlg, TranslateT("Container options")); TCHAR szNewTitle[128]; - mir_sntprintf(szNewTitle, SIZEOF(szNewTitle), _T("%s"), !_tcscmp(pContainer->szName, _T("default")) ? + mir_sntprintf(szNewTitle, SIZEOF(szNewTitle), _T("%s"), !mir_tstrcmp(pContainer->szName, _T("default")) ? TranslateT("Default container") : pContainer->szName); SetDlgItemText(hwndDlg, IDC_HEADERBAR, szNewTitle); Utils::enableDlgControl(hwndDlg, IDC_O_HIDETITLE, !CSkin::m_frameSkins); @@ -334,7 +334,7 @@ INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM wParam, szFilename[MAX_PATH - 1] = 0; PathToAbsoluteT(szFilename, szFinalThemeFile, M.getDataPath()); - if (_tcscmp(szFilename, pContainer->szRelThemeFile)) + if (mir_tstrcmp(szFilename, pContainer->szRelThemeFile)) pContainer->fPrivateThemeChanged = TRUE; if (PathFileExists(szFinalThemeFile)) diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 5db596c1c1..37ec46d0ab 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -2910,7 +2910,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case DM_CONTAINERSELECTED: { TCHAR *szNewName = (TCHAR*)lParam; - if (!_tcscmp(szNewName, TranslateT("Default container"))) + if (!mir_tstrcmp(szNewName, TranslateT("Default container"))) szNewName = CGlobals::m_default_container_name; int iOldItems = TabCtrl_GetItemCount(hwndTab); diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 5d68fc5ef5..0b7eca3e76 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -1760,7 +1760,7 @@ void TSAPI GetMyNick(TWindowData *dat) switch (ci.type) { case CNFT_ASCIIZ: if (mir_tstrlen((TCHAR*)ci.pszVal) == 0 || - !_tcscmp((TCHAR*)ci.pszVal, TranslateT("'(Unknown contact)'"))) { + !mir_tstrcmp((TCHAR*)ci.pszVal, TranslateT("'(Unknown contact)'"))) { _tcsncpy_s(dat->szMyNickname, (dat->myUin[0] ? dat->myUin : TranslateT("'(Unknown contact)'")), _TRUNCATE); } else { diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index a4d23187b8..2878bb767f 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -120,7 +120,7 @@ static int TSAPI ScanSkinDir(const TCHAR* tszFolder, HWND hwndCombobox) mir_sntprintf(tszFinalName, SIZEOF(tszFinalName), _T("%s%s"), tszFolder, fd.cFileName); GetPrivateProfileString(_T("Global"), _T("Name"), _T("None"), szBuf, SIZEOF(szBuf), tszFinalName); - if (!_tcscmp(szBuf, _T("None"))) { + if (!mir_tstrcmp(szBuf, _T("None"))) { fd.cFileName[mir_tstrlen(fd.cFileName) - 4] = 0; _tcsncpy_s(szBuf, fd.cFileName, _TRUNCATE); } diff --git a/plugins/TabSRMM/src/selectcontainer.cpp b/plugins/TabSRMM/src/selectcontainer.cpp index e90e10cc1d..41b7951151 100644 --- a/plugins/TabSRMM/src/selectcontainer.cpp +++ b/plugins/TabSRMM/src/selectcontainer.cpp @@ -183,7 +183,7 @@ INT_PTR CALLBACK SelectContainerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L break; // end of list if (dbv.type == DBVT_ASCIIZ || dbv.type == DBVT_WCHAR) { if (_tcsncmp(dbv.ptszVal, _T("**mir_free**"), CONTAINER_NAMELEN)) { - iItemNew = SendDlgItemMessage(hwndDlg, IDC_CNTLIST, LB_ADDSTRING, 0, (LPARAM)(!_tcscmp(dbv.ptszVal, _T("default")) ? + iItemNew = SendDlgItemMessage(hwndDlg, IDC_CNTLIST, LB_ADDSTRING, 0, (LPARAM)(!mir_tstrcmp(dbv.ptszVal, _T("default")) ? TranslateT("Default container") : dbv.ptszVal)); if (iItemNew != LB_ERR) SendDlgItemMessage(hwndDlg, IDC_CNTLIST, LB_SETITEMDATA, (WPARAM)iItemNew, (LPARAM)iCounter); @@ -200,7 +200,7 @@ INT_PTR CALLBACK SelectContainerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L if (pContainer) { LRESULT iItem; - iItem = SendDlgItemMessage(hwndDlg, IDC_CNTLIST, LB_FINDSTRING, (WPARAM)-1, (LPARAM)(!_tcscmp(pContainer->szName, _T("default")) ? + iItem = SendDlgItemMessage(hwndDlg, IDC_CNTLIST, LB_FINDSTRING, (WPARAM)-1, (LPARAM)(!mir_tstrcmp(pContainer->szName, _T("default")) ? TranslateT("Default container") : pContainer->szName)); if (iItem != LB_ERR) SendDlgItemMessage(hwndDlg, IDC_CNTLIST, LB_SETCURSEL, (WPARAM)iItem, 0); diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index 60af86107e..636fd00b8c 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -804,7 +804,7 @@ TCHAR* CImageItem::Read(const TCHAR *szFilename) TCHAR *szFinalName = 0; GetPrivateProfileString(m_szName, _T("Glyph"), _T("None"), buffer, 500, szFilename); - if (_tcscmp(buffer, _T("None"))) { + if (mir_tstrcmp(buffer, _T("None"))) { _stscanf(buffer, _T("%d,%d,%d,%d"), &m_glyphMetrics[0], &m_glyphMetrics[1], &m_glyphMetrics[2], &m_glyphMetrics[3]); if (m_glyphMetrics[2] > m_glyphMetrics[0] && m_glyphMetrics[3] > m_glyphMetrics[1]) { @@ -815,7 +815,7 @@ TCHAR* CImageItem::Read(const TCHAR *szFilename) } GetPrivateProfileString(m_szName, _T("Image"), _T("None"), buffer, 500, szFilename); - if (_tcscmp(buffer, _T("None")) || m_dwFlags & IMAGE_GLYPH) { + if (mir_tstrcmp(buffer, _T("None")) || m_dwFlags & IMAGE_GLYPH) { szFinalName = new TCHAR[MAX_PATH]; //strncpy(m_szName, &m_szName[1], sizeof(m_szName)); //m_szName[sizeof(m_szName) - 1] = 0; @@ -854,7 +854,7 @@ TCHAR* CImageItem::Read(const TCHAR *szFilename) } } GetPrivateProfileString(m_szName, _T("Fillcolor"), _T("None"), buffer, 500, szFilename); - if (_tcscmp(buffer, _T("None"))) { + if (mir_tstrcmp(buffer, _T("None"))) { COLORREF fillColor = CSkin::HexStringToLong(buffer); m_fillBrush = CreateSolidBrush(fillColor); m_dwFlags |= IMAGE_FILLSOLID; @@ -862,7 +862,7 @@ TCHAR* CImageItem::Read(const TCHAR *szFilename) else m_fillBrush = 0; GetPrivateProfileString(m_szName, _T("Colorkey"), _T("None"), buffer, 500, szFilename); - if (_tcscmp(buffer, _T("None"))) { + if (mir_tstrcmp(buffer, _T("None"))) { CSkin::m_ContainerColorKey = CSkin::HexStringToLong(buffer); if (CSkin::m_ContainerColorKeyBrush) DeleteObject(CSkin::m_ContainerColorKeyBrush); @@ -1318,7 +1318,7 @@ void CSkin::ReadImageItem(const TCHAR *itemname) for (int n = 0;; n++) { mir_sntprintf(szItemNr, SIZEOF(szItemNr), _T("Item%d"), n); GetPrivateProfileString(itemname, szItemNr, _T("None"), buffer, 500, m_tszFileName); - if (!_tcscmp(buffer, _T("None"))) + if (!mir_tstrcmp(buffer, _T("None"))) break; for (int i = 0; i <= ID_EXTBK_LAST; i++) { if (!_tcsicmp(SkinItems[i].szName[0] == '{' ? &SkinItems[i].szName[3] : SkinItems[i].szName, buffer)) { @@ -1434,7 +1434,7 @@ void CSkin::Load(void) m_avatarBorderClr = (COLORREF)HexStringToLong(buffer); GetPrivateProfileString(_T("Global"), _T("SideBarBG"), _T("None"), buffer, 20, m_tszFileName); - if (_tcscmp(buffer, _T("None"))) + if (mir_tstrcmp(buffer, _T("None"))) m_sideBarContainerBG = (COLORREF)HexStringToLong(buffer); else m_sideBarContainerBG = SkinItems[ID_EXTBKSIDEBARBG].COLOR; @@ -1494,7 +1494,7 @@ void CSkin::Load(void) DeleteObject(m_MenuBGBrush); m_MenuBGBrush = 0; } - if (_tcscmp(buffer, _T("None"))) + if (mir_tstrcmp(buffer, _T("None"))) m_MenuBGBrush = CreateSolidBrush(data); GetPrivateProfileString(_T("Global"), _T("LightShadow"), _T("000000"), buffer, 20, m_tszFileName); @@ -1507,7 +1507,7 @@ void CSkin::Load(void) SkinCalcFrameWidth(); GetPrivateProfileString(_T("Global"), _T("FontColor"), _T("None"), buffer, 20, m_tszFileName); - if (_tcscmp(buffer, _T("None"))) + if (mir_tstrcmp(buffer, _T("None"))) CSkin::m_DefaultFontColor = HexStringToLong(buffer); else CSkin::m_DefaultFontColor = GetSysColor(COLOR_BTNTEXT); diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index 4c376925b9..55aeea166a 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -321,7 +321,7 @@ TCHAR* Utils::FormatTitleBar(const TWindowData *dat, const TCHAR *szFormat) break; } case 'c': { - TCHAR *c = (!_tcscmp(dat->pContainer->szName, _T("default")) ? TranslateT("Default container") : dat->pContainer->szName); + TCHAR *c = (!mir_tstrcmp(dat->pContainer->szName, _T("default")) ? TranslateT("Default container") : dat->pContainer->szName); title.insert(tempmark + 2, c); title.erase(tempmark, 2); curpos = tempmark + mir_tstrlen(c); -- cgit v1.2.3