From b7c74cd5b22618d544a3f4ae124985d4837e3a22 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 4 Jun 2015 22:12:13 +0000 Subject: new mir_snprintf templates without SIZEOF git-svn-id: http://svn.miranda-ng.org/main/trunk@14002 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IEView/src/ChatHTMLBuilder.cpp | 10 +++++----- plugins/IEView/src/HTMLBuilder.cpp | 4 ++-- plugins/IEView/src/HistoryHTMLBuilder.cpp | 14 +++++++------- plugins/IEView/src/MUCCHTMLBuilder.cpp | 10 +++++----- plugins/IEView/src/ScriverHTMLBuilder.cpp | 10 +++++----- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 10 +++++----- 6 files changed, 29 insertions(+), 29 deletions(-) (limited to 'plugins/IEView/src') diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp index b8264298bb..46c079293b 100644 --- a/plugins/IEView/src/ChatHTMLBuilder.cpp +++ b/plugins/IEView/src/ChatHTMLBuilder.cpp @@ -50,29 +50,29 @@ void ChatHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) int style; DBVARIANT dbv; if (colour) { - mir_snprintf(str, SIZEOF(str), "Font%dCol", i); + mir_snprintf(str, "Font%dCol", i); *colour = db_get_dw(NULL, CHATFONTMOD, str, 0x000000); } if (lf) { - mir_snprintf(str, SIZEOF(str), "Font%dSize", i); + mir_snprintf(str, "Font%dSize", i); lf->lfHeight = (char)db_get_b(NULL, CHATFONTMOD, str, 10); lf->lfHeight = abs(lf->lfHeight); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; - mir_snprintf(str, SIZEOF(str), "Font%dSty", i); + mir_snprintf(str, "Font%dSty", i); 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; - mir_snprintf(str, SIZEOF(str), "Font%dSet", i); + mir_snprintf(str, "Font%dSet", i); 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; - mir_snprintf(str, SIZEOF(str), "Font%d", i); + mir_snprintf(str, "Font%d", i); if (db_get(NULL, CHATFONTMOD, str, &dbv)) mir_strcpy(lf->lfFaceName, "Verdana"); else { diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index 3a4031f2ec..611d7c74de 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -205,7 +205,7 @@ void HTMLBuilder::getUINs(MCONTACT hContact, char *&uinIn, char *&uinOut) mir_free(ci.pszVal); break; case CNFT_DWORD: - mir_snprintf(buf, SIZEOF(buf), "%u", ci.dVal); + mir_snprintf(buf, "%u", ci.dVal); break; } } @@ -219,7 +219,7 @@ void HTMLBuilder::getUINs(MCONTACT hContact, char *&uinIn, char *&uinOut) mir_free(ci.pszVal); break; case CNFT_DWORD: - mir_snprintf(buf, SIZEOF(buf), "%u", ci.dVal); + mir_snprintf(buf, "%u", ci.dVal); break; } } diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp index 03c083eaef..513e8eb9ae 100644 --- a/plugins/IEView/src/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp @@ -100,34 +100,34 @@ void HistoryHTMLBuilder::loadMsgDlgFont(const char *dbSetting, LOGFONTA * lf, CO int style; DBVARIANT dbv; if (bkgColour) { - mir_snprintf(str, SIZEOF(str), "Back.%s", dbSetting); + mir_snprintf(str, "Back.%s", dbSetting); *bkgColour = db_get_dw(NULL, HPPMOD, str, 0xFFFFFF); } if (colour) { - mir_snprintf(str, SIZEOF(str), "Font.%s.Color", dbSetting); + mir_snprintf(str, "Font.%s.Color", dbSetting); *colour = db_get_dw(NULL, HPPMOD, str, 0x000000); } if (lf) { - mir_snprintf(str, SIZEOF(str), "Font.%s.Size", dbSetting); + mir_snprintf(str, "Font.%s.Size", dbSetting); lf->lfHeight = (char)db_get_b(NULL, HPPMOD, str, 10); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; - mir_snprintf(str, SIZEOF(str), "Font.%s.Style.Bold", dbSetting); + mir_snprintf(str, "Font.%s.Style.Bold", dbSetting); style = db_get_b(NULL, HPPMOD, str, 0); lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL; - mir_snprintf(str, SIZEOF(str), "Font.%s.Style.Italic", dbSetting); + mir_snprintf(str, "Font.%s.Style.Italic", dbSetting); style = db_get_b(NULL, HPPMOD, str, 0) << 1; lf->lfItalic = style & FONTF_ITALIC ? 1 : 0; lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0; lf->lfStrikeOut = 0; - mir_snprintf(str, SIZEOF(str), "Font.%s.Charset", dbSetting); + mir_snprintf(str, "Font.%s.Charset", dbSetting); lf->lfCharSet = db_get_b(NULL, HPPMOD, str, DEFAULT_CHARSET); lf->lfOutPrecision = OUT_DEFAULT_PRECIS; lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; - mir_snprintf(str, SIZEOF(str), "Font.%s.Name", dbSetting); + mir_snprintf(str, "Font.%s.Name", dbSetting); if (db_get(NULL, HPPMOD, str, &dbv)) mir_strcpy(lf->lfFaceName, "Verdana"); else { diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp index dc34b47dca..c34e794f41 100644 --- a/plugins/IEView/src/MUCCHTMLBuilder.cpp +++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp @@ -46,29 +46,29 @@ void MUCCHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) int style; DBVARIANT dbv; if (colour) { - mir_snprintf(str, SIZEOF(str), "Font%dCol", i); + mir_snprintf(str, "Font%dCol", i); *colour = db_get_dw(NULL, MUCCMOD, str, 0x000000); } if (lf) { - mir_snprintf(str, SIZEOF(str), "Font%dSize", i); + mir_snprintf(str, "Font%dSize", i); lf->lfHeight = (char)db_get_b(NULL, MUCCMOD, str, 10); lf->lfHeight = abs(lf->lfHeight); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; - mir_snprintf(str, SIZEOF(str), "Font%dStyle", i); + mir_snprintf(str, "Font%dStyle", i); style = db_get_b(NULL, MUCCMOD, 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; - mir_snprintf(str, SIZEOF(str), "Font%dSet", i); + mir_snprintf(str, "Font%dSet", i); lf->lfCharSet = db_get_b(NULL, MUCCMOD, str, DEFAULT_CHARSET); lf->lfOutPrecision = OUT_DEFAULT_PRECIS; lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; - mir_snprintf(str, SIZEOF(str), "Font%dFace", i); + mir_snprintf(str, "Font%dFace", i); if (db_get(NULL, MUCCMOD, str, &dbv)) mir_strcpy(lf->lfFaceName, "Verdana"); else { diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index 8d9e6aa737..ec87e8877c 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -88,29 +88,29 @@ void ScriverHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) int style; DBVARIANT dbv; if (colour) { - mir_snprintf(str, SIZEOF(str), "SRMFont%dCol", i); + mir_snprintf(str, "SRMFont%dCol", i); *colour = db_get_dw(NULL, SRMMMOD, str, 0x000000); } if (lf) { - mir_snprintf(str, SIZEOF(str), "SRMFont%dSize", i); + mir_snprintf(str, "SRMFont%dSize", i); lf->lfHeight = (char)db_get_b(NULL, SRMMMOD, str, 10); lf->lfHeight = abs(lf->lfHeight); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; - mir_snprintf(str, SIZEOF(str), "SRMFont%dSty", i); + mir_snprintf(str, "SRMFont%dSty", i); style = db_get_b(NULL, SRMMMOD, 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; - mir_snprintf(str, SIZEOF(str), "SRMFont%dSet", i); + mir_snprintf(str, "SRMFont%dSet", i); lf->lfCharSet = db_get_b(NULL, SRMMMOD, str, DEFAULT_CHARSET); lf->lfOutPrecision = OUT_DEFAULT_PRECIS; lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; - mir_snprintf(str, SIZEOF(str), "SRMFont%d", i); + mir_snprintf(str, "SRMFont%d", i); if (db_get(NULL, SRMMMOD, str, &dbv)) mir_strcpy(lf->lfFaceName, "Verdana"); else { diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index d64d1851d7..aa08a7b73a 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -117,31 +117,31 @@ void TabSRMMHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) int style; DBVARIANT dbv; if (colour) { - mir_snprintf(str, SIZEOF(str), "Font%dCol", i); + mir_snprintf(str, "Font%dCol", i); *colour = db_get_dw(NULL, TABSRMM_FONTMODULE, str, 0x000000); } if (lf) { HDC hdc = GetDC(NULL); - mir_snprintf(str, SIZEOF(str), "Font%dSize", i); + mir_snprintf(str, "Font%dSize", i); lf->lfHeight = (char)db_get_b(NULL, TABSRMM_FONTMODULE, str, 10); ReleaseDC(NULL, hdc); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; - mir_snprintf(str, SIZEOF(str), "Font%dSty", i); + mir_snprintf(str, "Font%dSty", i); style = db_get_b(NULL, TABSRMM_FONTMODULE, 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; - mir_snprintf(str, SIZEOF(str), "Font%dSet", i); + mir_snprintf(str, "Font%dSet", i); lf->lfCharSet = db_get_b(NULL, TABSRMM_FONTMODULE, str, DEFAULT_CHARSET); lf->lfOutPrecision = OUT_DEFAULT_PRECIS; lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; - mir_snprintf(str, SIZEOF(str), "Font%d", i); + mir_snprintf(str, "Font%d", i); if (db_get(NULL, TABSRMM_FONTMODULE, str, &dbv)) mir_strcpy(lf->lfFaceName, "Verdana"); else { -- cgit v1.2.3