From 2492b561385859b7ef76fe816a8dc845f0b9bd09 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Feb 2016 01:53:51 +0300 Subject: Fix some casts between signed and unsigned in some files. --- src/gui/widgets/colorpage.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/gui/widgets/colorpage.cpp') diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp index 6c087663b..078f5bb48 100644 --- a/src/gui/widgets/colorpage.cpp +++ b/src/gui/widgets/colorpage.cpp @@ -36,10 +36,12 @@ ColorPage::ColorPage(const Widget2 *const widget, mItemPadding = mSkin ? mSkin->getOption("itemPadding") : 1; mRowHeight = 13; const Font *const font = getFont(); - mRowHeight = font->getHeight() + 2 * mItemPadding; + mRowHeight = static_cast(font->getHeight() + + 2 * mItemPadding); if (mListModel) { - setHeight(getRowHeight() * mListModel->getNumberOfElements() + setHeight(static_cast(getRowHeight()) * + mListModel->getNumberOfElements() + 2 * mPadding + 20); } } @@ -55,11 +57,11 @@ void ColorPage::draw(Graphics *graphics) const ColorModel *const model = static_cast( mListModel); - mHighlightColor.a = static_cast(mAlpha * 255.0F); + mHighlightColor.a = static_cast(mAlpha * 255.0F); updateAlpha(); Font *const font = getFont(); - const int rowHeight = getRowHeight(); + const int rowHeight = static_cast(getRowHeight()); const int width = mDimension.width; if (mSelected >= 0) @@ -113,8 +115,9 @@ void ColorPage::adjustSize() BLOCK_START("ColorPage::adjustSize") if (mListModel) { - setHeight(getRowHeight() * mListModel->getNumberOfElements() - + 2 * mPadding + 20); + setHeight(static_cast(getRowHeight()) * + mListModel->getNumberOfElements() + + 2 * mPadding + 20); } BLOCK_END("ColorPage::adjustSize") } -- cgit v1.2.3-60-g2f50