From c10177d08a6185431559bea19a296f2f7934340e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 10 Feb 2016 18:21:31 +0300
Subject: Fix compilation warnings.
---
src/gui/windows/charcreatedialog.cpp | 14 +++++++-------
src/gui/windows/charcreatedialog.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 57d956ca5..1375b4b25 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -127,7 +127,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
mMaxRace(CharDB::getMaxRace()),
mHairStyle(0),
mHairColor(0),
- mMaxY(0),
+ mMaxY(0U),
mSlot(slot),
mDefaultGender(Gender::FEMALE),
mGender(Gender::UNSPECIFIED),
@@ -299,12 +299,12 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
mNameField->setDimension(Rect(60, 2,
300, mNameField->getHeight()));
- const int labelPadding = getOption("labelPadding", 2);
- const int leftX = 120 + mPadding;
- const int rightX = 300 + mPadding;
- const int labelX = mPadding;
- int nameX = leftX + labelPadding;
- int y = 30;
+ const uint32_t labelPadding = getOption("labelPadding", 2);
+ const uint32_t leftX = 120 + mPadding;
+ const uint32_t rightX = 300 + mPadding;
+ const uint32_t labelX = mPadding;
+ uint32_t nameX = leftX + labelPadding;
+ uint32_t y = 30;
if (mPrevHairColorButton)
nameX += mPrevHairColorButton->getWidth();
else if (mPrevHairStyleButton)
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index e41b17157..5f2885049 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -152,7 +152,7 @@ class CharCreateDialog final : public Window,
int mHairStyle;
int mHairColor;
- int mMaxY;
+ uint32_t mMaxY;
int mSlot;
--
cgit v1.2.3-70-g09d2