summaryrefslogtreecommitdiff
path: root/src/guichan
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/guichan
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/guichan')
-rw-r--r--src/guichan/focushandler.cpp3
-rw-r--r--src/guichan/font.cpp3
-rw-r--r--src/guichan/widgets/tabbedarea.cpp5
3 files changed, 7 insertions, 4 deletions
diff --git a/src/guichan/focushandler.cpp b/src/guichan/focushandler.cpp
index 3a5424851..9be06c582 100644
--- a/src/guichan/focushandler.cpp
+++ b/src/guichan/focushandler.cpp
@@ -74,7 +74,8 @@ namespace gcn
return;
int toBeFocusedIndex = -1;
- for (unsigned int i = 0, sz = mWidgets.size(); i < sz; ++i)
+ for (unsigned int i = 0, sz = static_cast<unsigned int>(
+ mWidgets.size()); i < sz; ++i)
{
if (mWidgets[i] == widget)
{
diff --git a/src/guichan/font.cpp b/src/guichan/font.cpp
index ea4652814..bb8006b95 100644
--- a/src/guichan/font.cpp
+++ b/src/guichan/font.cpp
@@ -56,7 +56,8 @@ namespace gcn
{
int Font::getStringIndexAt(const std::string& text, int x) const
{
- for (unsigned int i = 0, sz = text.size(); i < sz; ++i)
+ for (unsigned int i = 0, sz = static_cast<unsigned int>(text.size());
+ i < sz; ++i)
{
if (getWidth(text.substr(0, i)) > x)
return i;
diff --git a/src/guichan/widgets/tabbedarea.cpp b/src/guichan/widgets/tabbedarea.cpp
index 487549b6a..141bbf96e 100644
--- a/src/guichan/widgets/tabbedarea.cpp
+++ b/src/guichan/widgets/tabbedarea.cpp
@@ -160,7 +160,8 @@ namespace gcn
int TabbedArea::getSelectedTabIndex() const
{
- for (unsigned int i = 0, sz = mTabs.size(); i < sz; i++)
+ for (unsigned int i = 0, sz = static_cast<unsigned int>(mTabs.size());
+ i < sz; i++)
{
if (mTabs[i].first == mSelectedTab)
return i;
@@ -258,7 +259,7 @@ namespace gcn
{
int maxTabHeight = 0;
unsigned int i;
- const unsigned int sz = mTabs.size();
+ const unsigned int sz = static_cast<unsigned int>(mTabs.size());
for (i = 0; i < sz; i++)
{
if (mTabs[i].first->getHeight() > maxTabHeight)