From d465fbfa8ead75af60f9fcdf936a13c3a4cc11a8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 16 Dec 2014 14:40:44 +0000 Subject: damned magic git-svn-id: http://svn.miranda-ng.org/main/trunk@11464 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IEView/src/ChatHTMLBuilder.cpp | 2 +- plugins/IEView/src/HistoryHTMLBuilder.cpp | 2 +- plugins/IEView/src/MUCCHTMLBuilder.cpp | 2 +- plugins/IEView/src/ScriverHTMLBuilder.cpp | 2 +- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 2 +- plugins/Scriver/src/msgoptions.cpp | 2 +- plugins/TabSRMM/src/chat/options.cpp | 2 +- src/core/stdchat/src/tools.cpp | 2 +- src/core/stdmsg/src/msgoptions.cpp | 2 +- src/modules/chat/chat_opts.cpp | 2 +- src/modules/clist/clcutils.cpp | 2 +- src/modules/fonts/services.cpp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp index 8f239f16bf..d29d519a23 100644 --- a/plugins/IEView/src/ChatHTMLBuilder.cpp +++ b/plugins/IEView/src/ChatHTMLBuilder.cpp @@ -55,7 +55,7 @@ void ChatHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) } if (lf) { mir_snprintf(str, SIZEOF(str), "Font%dSize", i); - lf->lfHeight = db_get_b(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; diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp index 2f4b16927b..1672002100 100644 --- a/plugins/IEView/src/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp @@ -109,7 +109,7 @@ void HistoryHTMLBuilder::loadMsgDlgFont(const char *dbSetting, LOGFONTA * lf, CO } if (lf) { mir_snprintf(str, SIZEOF(str), "Font.%s.Size", dbSetting); - lf->lfHeight = db_get_b(NULL, HPPMOD, str, 10); + lf->lfHeight = (char)db_get_b(NULL, HPPMOD, str, 10); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp index c28ee46257..de4e90fb00 100644 --- a/plugins/IEView/src/MUCCHTMLBuilder.cpp +++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp @@ -51,7 +51,7 @@ void MUCCHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) } if (lf) { mir_snprintf(str, SIZEOF(str), "Font%dSize", i); - lf->lfHeight = db_get_b(NULL, MUCCMOD, str, 10); + lf->lfHeight = (char)db_get_b(NULL, MUCCMOD, str, 10); lf->lfHeight = abs(lf->lfHeight); lf->lfWidth = 0; lf->lfEscapement = 0; diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index cdb52c91d3..e15d709236 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -93,7 +93,7 @@ void ScriverHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) } if (lf) { mir_snprintf(str, SIZEOF(str), "SRMFont%dSize", i); - lf->lfHeight = db_get_b(NULL, SRMMMOD, str, 10); + lf->lfHeight = (char)db_get_b(NULL, SRMMMOD, str, 10); lf->lfHeight = abs(lf->lfHeight); lf->lfWidth = 0; lf->lfEscapement = 0; diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index ae655f9407..d574d6b034 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -123,7 +123,7 @@ void TabSRMMHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) if (lf) { HDC hdc = GetDC(NULL); mir_snprintf(str, SIZEOF(str), "Font%dSize", i); - lf->lfHeight = db_get_b(NULL, TABSRMM_FONTMODULE, str, 10); + lf->lfHeight = (char)db_get_b(NULL, TABSRMM_FONTMODULE, str, 10); ReleaseDC(NULL, hdc); lf->lfWidth = 0; diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 4bc082cdca..e476d5a419 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -173,7 +173,7 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour) if (lf) { mir_snprintf(str, SIZEOF(str), "%s%dSize", "SRMFont", i); - lf->lfHeight = db_get_b(NULL, SRMMMOD, str, fontOptionsList[i].defSize); + lf->lfHeight = (char)db_get_b(NULL, SRMMMOD, str, fontOptionsList[i].defSize); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index 610d867924..86e9645505 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -192,7 +192,7 @@ void LoadMsgDlgFont(int section, int i, LOGFONT *lf, COLORREF* colour, char *szM if (lf) { mir_snprintf(str, SIZEOF(str), "Font%dSize", i); - lf->lfHeight = M.GetByte(szMod, str, fol[j].defSize); + lf->lfHeight = (char)M.GetByte(szMod, str, fol[j].defSize); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 4c42a46dfc..38301b960b 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -33,7 +33,7 @@ bool LoadMessageFont(LOGFONT *lf, COLORREF *colour) } if (lf) { mir_snprintf(str, SIZEOF(str), "SRMFont%dSize", i); - lf->lfHeight = db_get_b(NULL, "SRMM", str, -12); + lf->lfHeight = (char)db_get_b(NULL, "SRMM", str, -12); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index ce140012b6..9d539bbf4d 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -64,7 +64,7 @@ bool LoadMsgDlgFont(int i, LOGFONT* lf, COLORREF * colour) } if (lf) { mir_snprintf(str, SIZEOF(str), "SRMFont%dSize", i); - lf->lfHeight = db_get_b(NULL, SRMMMOD, str, fontOptionsList[i].defSize); + lf->lfHeight = (char)db_get_b(NULL, SRMMMOD, str, fontOptionsList[i].defSize); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; diff --git a/src/modules/chat/chat_opts.cpp b/src/modules/chat/chat_opts.cpp index d94c6c7f87..872bf4a033 100644 --- a/src/modules/chat/chat_opts.cpp +++ b/src/modules/chat/chat_opts.cpp @@ -102,7 +102,7 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour) } if (lf) { mir_snprintf(str, SIZEOF(str), "Font%dSize", i); - lf->lfHeight = db_get_b(NULL, CHATFONT_MODULE, str, FO.defSize); + lf->lfHeight = (char)db_get_b(NULL, CHATFONT_MODULE, str, FO.defSize); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp index 830fd128ed..a3d5c8dc6c 100644 --- a/src/modules/clist/clcutils.cpp +++ b/src/modules/clist/clcutils.cpp @@ -697,7 +697,7 @@ void fnGetFontSetting(int i, LOGFONT* lf, COLORREF* colour) *colour = db_get_dw(NULL, "CLC", idstr, *colour); mir_snprintf(idstr, SIZEOF(idstr), "Font%dSize", i); - lf->lfHeight = db_get_b(NULL, "CLC", idstr, lf->lfHeight); + lf->lfHeight = (char)db_get_b(NULL, "CLC", idstr, lf->lfHeight); mir_snprintf(idstr, SIZEOF(idstr), "Font%dSty", i); BYTE style = (BYTE)db_get_b(NULL, "CLC", idstr, (lf->lfWeight == FW_NORMAL ? 0 : DBFONTF_BOLD) | (lf->lfItalic ? DBFONTF_ITALIC : 0) | (lf->lfUnderline ? DBFONTF_UNDERLINE : 0)); diff --git a/src/modules/fonts/services.cpp b/src/modules/fonts/services.cpp index 84851bc6dd..0f5cdadb6c 100644 --- a/src/modules/fonts/services.cpp +++ b/src/modules/fonts/services.cpp @@ -159,7 +159,7 @@ int GetFontSettingFromDB(char *settings_group, char *prefix, LOGFONT* lf, COLORR } mir_snprintf(idstr, SIZEOF(idstr), "%sSize", prefix); - lf->lfHeight = db_get_b(NULL, settings_group, idstr, lf->lfHeight); + lf->lfHeight = (char)db_get_b(NULL, settings_group, idstr, lf->lfHeight); //mir_snprintf(idstr, SIZEOF(idstr), "%sFlags", prefix); //if (db_get_dw(NULL, settings_group, idstr, 0) & FIDF_SAVEACTUALHEIGHT) { -- cgit v1.2.3