diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-06-21 17:05:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-06-21 17:05:33 +0000 |
| commit | 6ba9043d83f28cf2b6c7d10c5d5495d15de344c1 (patch) | |
| tree | 40aeea3b7d6a1198647b4d896b41f725ee85c98b /plugins/Scriver/src/chat | |
| parent | 2072201029bdd799396b37de23410bab71cc653e (diff) | |
own a2t/t2a conversion routines removed from Scriver
git-svn-id: http://svn.miranda-ng.org/main/trunk@5084 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/src/chat')
| -rw-r--r-- | plugins/Scriver/src/chat/log.cpp | 8 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/tools.cpp | 18 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/window.cpp | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp index 27696f1a01..a06be991bb 100644 --- a/plugins/Scriver/src/chat/log.cpp +++ b/plugins/Scriver/src/chat/log.cpp @@ -315,8 +315,8 @@ static void AddEventToBuffer(char **buffer, int *bufferEnd, int *bufferAlloced, TCHAR *ptszTemp = NULL;
TCHAR *ptszText = streamData->lin->ptszText;
if (streamData->si->windowData.codePage != CP_ACP) {
- char *aText = t2acp(streamData->lin->ptszText, CP_ACP);
- ptszText = ptszTemp = a2tcp(aText, streamData->si->windowData.codePage);
+ char *aText = mir_t2a_cp(streamData->lin->ptszText, CP_ACP);
+ ptszText = ptszTemp = mir_a2t_cp(aText, streamData->si->windowData.codePage);
mir_free(aText);
}
@@ -407,8 +407,8 @@ static void AddEventToBufferIEView(TCHAR **buffer, int *bufferEnd, int *bufferAl TCHAR *ptszTemp = NULL;
TCHAR *ptszText = streamData->lin->ptszText;
if (streamData->si->windowData.codePage != CP_ACP) {
- char *aText = t2acp(streamData->lin->ptszText, CP_ACP);
- ptszText = ptszTemp = a2tcp(aText, streamData->si->windowData.codePage);
+ char *aText = mir_t2a_cp(streamData->lin->ptszText, CP_ACP);
+ ptszText = ptszTemp = mir_a2t_cp(aText, streamData->si->windowData.codePage);
mir_free(aText);
}
diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp index b8edb1d1c5..804c347768 100644 --- a/plugins/Scriver/src/chat/tools.cpp +++ b/plugins/Scriver/src/chat/tools.cpp @@ -768,14 +768,14 @@ BOOL DoEventHookAsync(HWND hwnd, const TCHAR* pszID, const char* pszModule, int return FALSE;
if ( !( si->dwFlags & GC_UNICODE )) {
- gcd->pszID = t2a( pszID );
- gch->pszUID = t2a( pszUID );
- gch->pszText = t2a( pszText );
+ gcd->pszID = mir_t2a(pszID);
+ gch->pszUID = mir_t2a(pszUID);
+ gch->pszText = mir_t2a(pszText);
}
else {
- replaceStr( &gcd->ptszID, pszID );
- replaceStr( &gch->ptszUID, pszUID);
- replaceStr( &gch->ptszText, pszText);
+ replaceStr(&gcd->ptszID, pszID);
+ replaceStr(&gch->ptszUID, pszUID);
+ replaceStr(&gch->ptszText, pszText);
}
gcd->iType = iType;
@@ -796,9 +796,9 @@ BOOL DoEventHook(const TCHAR* pszID, const char* pszModule, int iType, const TCH return FALSE;
if ( !(si->dwFlags & GC_UNICODE)) {
- gcd.pszID = t2a(pszID);
- gch.pszUID = t2a(pszUID);
- gch.pszText = t2a(pszText);
+ gcd.pszID = mir_t2a(pszID);
+ gch.pszUID = mir_t2a(pszUID);
+ gch.pszText = mir_t2a(pszText);
}
else {
gcd.ptszID = mir_tstrdup(pszID);
diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index 25a9d74adb..488fbc5366 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -1006,7 +1006,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, * iterate over the (sorted) list of nicknames and search for the
* string we have
*/
- char *str = t2a(si->szSearch);
+ char *str = mir_t2a(si->szSearch);
mir_free(str);
for (i = 0; i < iItems; i++) {
ui = UM_FindUserFromIndex(si->pUsers, i);
|