From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - rest of menus cleared; - old database macroses wiped out from all plugins (left in m_database.h for compatibility) git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IEView/src/ChatHTMLBuilder.cpp | 16 ++--- plugins/IEView/src/HistoryHTMLBuilder.cpp | 20 +++--- plugins/IEView/src/MUCCHTMLBuilder.cpp | 14 ++--- plugins/IEView/src/Options.cpp | 98 +++++++++++++++--------------- plugins/IEView/src/ScriverHTMLBuilder.cpp | 44 +++++++------- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 42 ++++++------- plugins/IEView/src/TemplateHTMLBuilder.cpp | 12 ++-- 7 files changed, 123 insertions(+), 123 deletions(-) (limited to 'plugins/IEView') diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp index 636f070464..ff441a8642 100644 --- a/plugins/IEView/src/ChatHTMLBuilder.cpp +++ b/plugins/IEView/src/ChatHTMLBuilder.cpp @@ -49,33 +49,33 @@ void ChatHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) { DBVARIANT dbv; if (colour) { wsprintfA(str, "Font%dCol", i); - *colour = DBGetContactSettingDword(NULL, CHATFONTMOD, str, 0x000000); + *colour = db_get_dw(NULL, CHATFONTMOD, str, 0x000000); } if (lf) { wsprintfA(str, "Font%dSize", i); - lf->lfHeight = (char) DBGetContactSettingByte(NULL, CHATFONTMOD, str, 10); + lf->lfHeight = (char) db_get_b(NULL, CHATFONTMOD, str, 10); lf->lfHeight = abs(lf->lfHeight); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; wsprintfA(str, "Font%dSty", i); - style = DBGetContactSettingByte(NULL, CHATFONTMOD, str, 0); + style = db_get_b(NULL, CHATFONTMOD, str, 0); lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL; lf->lfItalic = style & FONTF_ITALIC ? 1 : 0; lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0; lf->lfStrikeOut = 0; wsprintfA(str, "Font%dSet", i); - lf->lfCharSet = DBGetContactSettingByte(NULL, CHATFONTMOD, str, DEFAULT_CHARSET); + lf->lfCharSet = db_get_b(NULL, CHATFONTMOD, str, DEFAULT_CHARSET); lf->lfOutPrecision = OUT_DEFAULT_PRECIS; lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; wsprintfA(str, "Font%d", i); - if (DBGetContactSetting(NULL, CHATFONTMOD, str, &dbv)) + if (db_get(NULL, CHATFONTMOD, str, &dbv)) lstrcpyA(lf->lfFaceName, "Verdana"); else { lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName)); - DBFreeVariant(&dbv); + db_free(&dbv); } } } @@ -115,7 +115,7 @@ void ChatHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) { ReleaseDC(NULL, hdc); Utils::appendText(&output, &outputSize, ""); Utils::appendText(&output, &outputSize, "