diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-27 11:50:07 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-27 11:50:07 +0000 |
| commit | ddd1af0fdf37364c9472faedad941b4cc5f1b465 (patch) | |
| tree | d4eb46f481a47b6e16e40b39860e830e40f9dbcf /plugins/Variables | |
| parent | cc3be4384048697fe9b7716c11b7bd726b9ca650 (diff) | |
<tchar.h> removed from <m_system.h>
git-svn-id: http://svn.miranda-ng.org/main/trunk@17136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Variables')
| -rw-r--r-- | plugins/Variables/src/contact.cpp | 4 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_miranda.cpp | 8 | ||||
| -rw-r--r-- | plugins/Variables/src/variables.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp index 416cc360c8..160b78a1ad 100644 --- a/plugins/Variables/src/contact.cpp +++ b/plugins/Variables/src/contact.cpp @@ -86,7 +86,7 @@ static int SortContactCache(const CONTACTCE *p1, const CONTACTCE *p2) if (p1->flags != p2->flags)
return (p1->flags > p2->flags) ? 1 : -1;
- return _tcscmp(p1->tszContact, p2->tszContact);
+ return wcscmp(p1->tszContact, p2->tszContact);
}
/* cache for 'getcontactfromstring' service */
@@ -199,7 +199,7 @@ MCONTACT getContactFromString(const wchar_t *tszContact, DWORD dwFlags, int nMat for (hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
// <_HANDLE_:hContact>
- tmp.Format(L"<%s:%d>", _T(PROTOID_HANDLE), hContact);
+ tmp.Format(L"<%s:%d>", _A2W(PROTOID_HANDLE), hContact);
bool bMatch = (tmp == tszContact);
char *szProto = GetContactProto(hContact);
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index a25e303247..71722f7e45 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -349,19 +349,19 @@ static wchar_t* parseProtoInfo(ARGUMENTSINFO *ai) wchar_t *tszRes = NULL;
ptrA szProto(mir_t2a(ai->targv[1]));
- if (!mir_tstrcmp(ai->targv[2], _T(STR_PINAME)))
+ if (!mir_tstrcmp(ai->targv[2], _A2W(STR_PINAME)))
tszRes = Hlp_GetProtocolName(szProto);
- else if (!mir_tstrcmp(ai->targv[2], _T(STR_PIUIDTEXT))) {
+ else if (!mir_tstrcmp(ai->targv[2], _A2W(STR_PIUIDTEXT))) {
szRes = (char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDTEXT, 0);
if (INT_PTR(szRes) == CALLSERVICE_NOTFOUND)
return NULL;
}
- else if (!mir_tstrcmp(ai->targv[2], _T(STR_PIUIDSETTING))) {
+ else if (!mir_tstrcmp(ai->targv[2], _A2W(STR_PIUIDSETTING))) {
szRes = (char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDSETTING, 0);
if (INT_PTR(szRes) == CALLSERVICE_NOTFOUND)
return NULL;
}
- else if (!mir_tstrcmp(ai->targv[2], _T(STR_PINICK)))
+ else if (!mir_tstrcmp(ai->targv[2], _A2W(STR_PINICK)))
tszRes = Contact_GetInfo(CNF_DISPLAY, NULL, szProto);
if (szRes == NULL && tszRes == NULL)
diff --git a/plugins/Variables/src/variables.cpp b/plugins/Variables/src/variables.cpp index 44920139f4..2b2e13af0f 100644 --- a/plugins/Variables/src/variables.cpp +++ b/plugins/Variables/src/variables.cpp @@ -156,7 +156,7 @@ static wchar_t* replaceDynVars(FORMATINFO *fi) continue; } // remove comments - else if (!wcsncmp(cur, _T(COMMENT_STRING), mir_tstrlen(_T(COMMENT_STRING)))) { + else if (!wcsncmp(cur, _A2W(COMMENT_STRING), _countof(COMMENT_STRING))) { wchar_t *scur = cur; while (wcsncmp(cur, L"\r\n", 2) && *cur != '\n' && *cur != 0) cur++; |