diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-12-16 14:23:01 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-12-16 14:23:01 +0000 |
| commit | a67927ff45a5e88a62c33b48f3643ebf5dd69394 (patch) | |
| tree | f0e82e8c9b990dfa99b8b2c433aba7aeb8f06fbe /src | |
| parent | ddac55403efc2fa4de7ad484a057bd96c24335c5 (diff) | |
type conversion warnings fixed
git-svn-id: http://svn.miranda-ng.org/main/trunk@11462 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdchat/src/tools.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgoptions.cpp | 2 | ||||
| -rw-r--r-- | src/modules/chat/chat_opts.cpp | 2 | ||||
| -rw-r--r-- | src/modules/clist/clcutils.cpp | 2 | ||||
| -rw-r--r-- | src/modules/fonts/services.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 38301b960b..4c42a46dfc 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 = (char)db_get_b(NULL, "SRMM", str, -12);
+ lf->lfHeight = 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 9d539bbf4d..ce140012b6 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 = (char)db_get_b(NULL, SRMMMOD, str, fontOptionsList[i].defSize);
+ lf->lfHeight = 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 872bf4a033..d94c6c7f87 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 = (char)db_get_b(NULL, CHATFONT_MODULE, str, FO.defSize);
+ lf->lfHeight = 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 2755f633e7..830fd128ed 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 = (char) db_get_b(NULL, "CLC", idstr, lf->lfHeight);
+ lf->lfHeight = 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 0f5cdadb6c..84851bc6dd 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 = (char)db_get_b(NULL, settings_group, idstr, lf->lfHeight);
+ lf->lfHeight = 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) {
|