summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-21 22:44:44 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-21 23:18:20 +0300
commit62ffd2023d9073e452fe2e2f50cf6b2f11224d6f (patch)
tree8c45c7c16b0c20ac6a7b722d69c148149e6b651f /src/gui/widgets
parentcfa5391c1be51ef49380e398a72c813255d6316e (diff)
downloadplus-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.gz
plus-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.bz2
plus-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.xz
plus-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.zip
next code style changes.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/browserbox.cpp3
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 2c8f64a02..ea5210eb8 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -228,7 +228,8 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
i != i_end; ++ i)
{
std::string tempRow = *i;
- for (unsigned int j = 0, sz = tempRow.size(); j < sz; j++)
+ for (unsigned int j = 0, sz = static_cast<unsigned int>(
+ tempRow.size()); j < sz; j++)
{
std::string character = tempRow.substr(j, 1);
x += font->getWidth(character);
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 2347edd0c..a1b496dc5 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -131,7 +131,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
graphics->setColor(getForegroundColor());
g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
}
- unsigned sz = mEmoteImg.size();
+ unsigned sz = static_cast<unsigned>(mEmoteImg.size());
for (unsigned i = 0; i < mMaxItems; i++)
{
if (i < sz && mEmoteImg[i] && mEmoteImg[i]->sprite)