diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-29 14:55:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-29 14:55:40 +0300 |
| commit | 4c6264db7ad4f0ae8a6c001903b47741abb94d8c (patch) | |
| tree | a4e95239130dc4b86d036acd10c95f5fe3b96999 /src/gui/widgets | |
| parent | f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8 (diff) | |
| download | manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.gz manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.bz2 manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.xz manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.zip | |
Fix code style.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/icon.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 97ad5ce85..007f2ce2c 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -211,7 +211,7 @@ void BrowserBox::addRow(const std::string &row, const bool atTop) BrowserLink bLink; // Check for links in format "@@link|Caption@@" - const unsigned int sz = mTextRows.size(); + const uint32_t sz = CAST_U32(mTextRows.size()); if (mEnableKeys) { @@ -386,7 +386,9 @@ void BrowserBox::addRow(const std::string &row, const bool atTop) FOR_EACH (TextRowCIter, i, mTextRows) { std::string tempRow = *i; - for (unsigned int j = 0, sz = tempRow.size(); j < sz; j++) + for (uint32_t j = 0, sz = CAST_U32(tempRow.size()); + j < sz; + j++) { const std::string character = tempRow.substr(j, 1); x += CAST_U32(font->getWidth(character)); diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index 76d5d90b0..3b9bdeaf8 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -30,8 +30,6 @@ #include "resources/loaders/imageloader.h" -#include "resources/resourcemanager/resourcemanager.h" - #include "debug.h" Icon::Icon(const Widget2 *const widget, |