From f51995e13679a37851baef8e7f52f2d993cbc7c1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 13 Sep 2016 17:11:58 +0000
Subject: mode old database junk to die

git-svn-id: http://svn.miranda-ng.org/main/trunk@17291 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdfile/src/filerecvdlg.cpp |  4 ++--
 src/core/stdmsg/src/msglog.cpp       | 10 +++++-----
 src/core/stduihist/src/history.cpp   |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp
index 2d38df4c64..4a55490432 100644
--- a/src/core/stdfile/src/filerecvdlg.cpp
+++ b/src/core/stdfile/src/filerecvdlg.cpp
@@ -231,13 +231,13 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				dat->fs = cle->lParam ? (HANDLE)cle->lParam : (HANDLE)*(PDWORD)dbei.pBlob;
 
 				char *str = (char*)dbei.pBlob + 4;
-				ptrW ptszFileName(DbGetEventStringT(&dbei, str));
+				ptrW ptszFileName(DbEvent_GetString(&dbei, str));
 				SetDlgItemText(hwndDlg, IDC_FILENAMES, ptszFileName);
 
 				unsigned len = (unsigned)mir_strlen(str) + 1;
 				if (len + 4 < dbei.cbBlob) {
 					str += len;
-					ptrW pwszDescription(DbGetEventStringT(&dbei, str));
+					ptrW pwszDescription(DbEvent_GetString(&dbei, str));
 					SetDlgItemText(hwndDlg, IDC_MSG, pwszDescription);
 				}
 			}
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index bb813b25a2..51e8900b93 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -193,7 +193,7 @@ static char* SetToStyle(int style)
 
 int 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);
 }
 
@@ -304,7 +304,7 @@ static char* CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT
 		AppendToBufferWithRTF(buffer, szName);
 		AppendToBufferWithRTF(buffer, L" ");
 
-		msg = DbGetEventTextW(&dbei, CP_ACP);
+		msg = DbEvent_GetTextW(&dbei, CP_ACP);
 		if (msg) {
 			AppendToBufferWithRTF(buffer, msg);
 			mir_free(msg);
@@ -316,14 +316,14 @@ static char* CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT
 			char* filename = (char*)dbei.pBlob + sizeof(DWORD);
 			char* descr = filename + mir_strlen(filename) + 1;
 			
-			ptrW ptszFileName(DbGetEventStringT(&dbei, filename));
+			ptrW ptszFileName(DbEvent_GetString(&dbei, filename));
 			buffer.AppendFormat(" %s ", SetToStyle(MSGFONTID_NOTICE));
 			AppendToBufferWithRTF(buffer, (dbei.flags & DBEF_SENT) ? TranslateT("File sent") : TranslateT("File received"));
 			buffer.Append(": ");
 			AppendToBufferWithRTF(buffer, ptszFileName);
 
 			if (*descr != 0) {
-				ptrW ptszDescr(DbGetEventStringT(&dbei, descr));
+				ptrW ptszDescr(DbEvent_GetString(&dbei, descr));
 				buffer.Append(" (");
 				AppendToBufferWithRTF(buffer, ptszDescr);
 				buffer.Append(")");
@@ -333,7 +333,7 @@ static char* CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT
 
 	case EVENTTYPE_MESSAGE:
 	default:
-		msg = DbGetEventTextW(&dbei, CP_ACP);
+		msg = DbEvent_GetTextW(&dbei, CP_ACP);
 		buffer.AppendFormat(" %s ", SetToStyle((dbei.eventType == EVENTTYPE_MESSAGE) ? ((dbei.flags & DBEF_SENT) ? MSGFONTID_MYMSG : MSGFONTID_YOURMSG) : MSGFONTID_NOTICE));
 		AppendToBufferWithRTF(buffer, msg);
 		mir_free(msg);
diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp
index d87b602c8d..8131f4eb3d 100644
--- a/src/core/stduihist/src/history.cpp
+++ b/src/core/stduihist/src/history.cpp
@@ -39,7 +39,7 @@ static HGENMENU hContactMenu = 0;
 
 static void GetMessageDescription(DBEVENTINFO *dbei, wchar_t* buf, int cbBuf)
 {
-	wchar_t *msg = DbGetEventTextW(dbei, CP_ACP);
+	wchar_t *msg = DbEvent_GetTextW(dbei, CP_ACP);
 	wcsncpy(buf, msg ? msg : TranslateT("Invalid message"), cbBuf);
 	buf[ cbBuf-1 ] = 0;
 	mir_free(msg);
@@ -87,7 +87,7 @@ static void GetObjectDescription(DBEVENTINFO *dbei, wchar_t* str, int cbStr)
 		break;
 
 	default:
-		DBEVENTTYPEDESCR *et = (DBEVENTTYPEDESCR*)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);
+		DBEVENTTYPEDESCR *et = DbEvent_GetType(dbei->szModule, dbei->eventType);
 		if (et && (et->flags & DETF_HISTORY))
 			GetMessageDescription(dbei, str, cbStr);
 		else
@@ -115,7 +115,7 @@ static void GetObjectSummary(DBEVENTINFO *dbei, wchar_t* str, int cbStr)
 		break;
 
 	default:
-		DBEVENTTYPEDESCR* et = (DBEVENTTYPEDESCR*)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);
+		DBEVENTTYPEDESCR* et = DbEvent_GetType(dbei->szModule, dbei->eventType);
 		if (et && (et->flags & DETF_HISTORY)) {
 			pszTmp = mir_a2u(et->descr);
 			pszSrc = TranslateW(pszTmp);
-- 
cgit v1.2.3