diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-09-13 17:11:58 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-09-13 17:11:58 +0000 |
| commit | f51995e13679a37851baef8e7f52f2d993cbc7c1 (patch) | |
| tree | 25ccd03cf2dc4b897cc0dc6fcbe4cc78ddb122c7 /plugins/IEView | |
| parent | fe1e8456d2488095f409a4f2d38b7251abdedccf (diff) | |
mode old database junk to die
git-svn-id: http://svn.miranda-ng.org/main/trunk@17291 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/IEView')
| -rw-r--r-- | plugins/IEView/src/HTMLBuilder.cpp | 12 | ||||
| -rw-r--r-- | plugins/IEView/src/Utils.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index 8dd3337a13..6e6b4bf3c9 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -283,7 +283,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) eventData->bIsMe = FALSE;
}
if (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_URL || Utils::DbEventIsForMsgWindow(&dbei)) {
- eventData->pszTextW = DbGetEventTextW(&dbei, newEvent.codepage);
+ eventData->pszTextW = DbEvent_GetTextW(&dbei, newEvent.codepage);
if (dbei.eventType == EVENTTYPE_MESSAGE)
eventData->iType = IEED_EVENT_MESSAGE;
else if (dbei.eventType == EVENTTYPE_URL)
@@ -295,25 +295,25 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) //blob is: sequenceid(DWORD),filename(ASCIIZ),description(ASCIIZ)
char* filename = ((char *)dbei.pBlob) + sizeof(DWORD);
char* descr = filename + mir_strlen(filename) + 1;
- eventData->ptszText = DbGetEventStringT(&dbei, filename);
+ eventData->ptszText = DbEvent_GetString(&dbei, filename);
if (*descr != '\0')
- eventData->ptszText2 = DbGetEventStringT(&dbei, descr);
+ eventData->ptszText2 = DbEvent_GetString(&dbei, descr);
eventData->iType = IEED_EVENT_FILE;
}
else if (dbei.eventType == EVENTTYPE_AUTHREQUEST) {
//blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)
eventData->ptszText = mir_wstrdup(TranslateT(" requested authorization"));
- eventData->ptszNick = DbGetEventStringT(&dbei, (char *)dbei.pBlob + 8);
+ eventData->ptszNick = DbEvent_GetString(&dbei, (char *)dbei.pBlob + 8);
eventData->iType = IEED_EVENT_SYSTEM;
}
else if (dbei.eventType == EVENTTYPE_ADDED) {
//blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)
eventData->ptszText = mir_wstrdup(TranslateT(" was added."));
- eventData->ptszNick = DbGetEventStringT(&dbei, (char *)dbei.pBlob + 8);
+ eventData->ptszNick = DbEvent_GetString(&dbei, (char *)dbei.pBlob + 8);
eventData->iType = IEED_EVENT_SYSTEM;
}
else { // custom event
- eventData->pszTextW = DbGetEventTextW(&dbei, newEvent.codepage);
+ eventData->pszTextW = DbEvent_GetTextW(&dbei, newEvent.codepage);
eventData->iType = IEED_EVENT_MESSAGE;
}
free(dbei.pBlob);
diff --git a/plugins/IEView/src/Utils.cpp b/plugins/IEView/src/Utils.cpp index 009c01a19e..2a7e48a0e3 100644 --- a/plugins/IEView/src/Utils.cpp +++ b/plugins/IEView/src/Utils.cpp @@ -118,12 +118,12 @@ void Utils::appendIcon(CMStringA &str, const char *iconFile) bool Utils::DbEventIsForMsgWindow(DBEVENTINFO *dbei)
{
- DBEVENTTYPEDESCR *et = (DBEVENTTYPEDESCR*)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);
+ DBEVENTTYPEDESCR *et = DbEvent_GetType(dbei->szModule, dbei->eventType);
return et && (et->flags & DETF_MSGWINDOW);
}
bool Utils::DbEventIsForHistory(DBEVENTINFO *dbei)
{
- DBEVENTTYPEDESCR *et = (DBEVENTTYPEDESCR*)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);
+ DBEVENTTYPEDESCR *et = DbEvent_GetType(dbei->szModule, dbei->eventType);
return et && (et->flags & DETF_HISTORY);
}
\ No newline at end of file |