diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-12 13:35:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-12 13:35:32 +0300 |
| commit | dbf80cecba66c3171ccebb6c22d85c3b52637882 (patch) | |
| tree | 18757d1b8237c4f5e5580fe9de5b67d4b011ac25 /src/gui | |
| parent | 18ba68228c2a8bce02a7bce1569be9998570d5f2 (diff) | |
| download | manaplus-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.gz manaplus-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.bz2 manaplus-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.xz manaplus-dbf80cecba66c3171ccebb6c22d85c3b52637882.zip | |
fix compilation warnings.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/textfield.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 58a1f7e18..b4d72a1a7 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -609,7 +609,7 @@ void TextField::caretDeleteToStart() void TextField::moveCaretWordBack() { - const int oldCaret = mCaretPosition; + const unsigned int oldCaret = mCaretPosition; while (mCaretPosition > 0) { if (!isWordSeparator(mText[mCaretPosition - 1])) @@ -629,7 +629,7 @@ void TextField::moveCaretWordBack() void TextField::moveCaretWordForward() { const unsigned sz = static_cast<unsigned>(mText.size()); - const int oldCaret = mCaretPosition; + const unsigned int oldCaret = mCaretPosition; while (mCaretPosition < sz) { if (!isWordSeparator(mText[mCaretPosition])) diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 7ecfb0d7d..76cfb801f 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -653,9 +653,9 @@ void UpdaterWindow::loadManaPlusUpdates(const std::string &dir, if (strStartWith(name, "manaplus_")) { struct stat statbuf; - std::string file = std::string(fixPath).append("/").append(name); - if (!stat(file.c_str(), &statbuf)) - resman->addToSearchPath(file, false); + std::string fileName = std::string(fixPath).append("/").append(name); + if (!stat(fileName.c_str(), &statbuf)) + resman->addToSearchPath(fileName, false); } } } @@ -1028,10 +1028,10 @@ void UpdaterWindow::loadMods(const std::string &dir, if (it != modsList.end()) { struct stat statbuf; - std::string file = std::string(fixPath).append( + std::string fileName = std::string(fixPath).append( "/").append(name); - if (!stat(file.c_str(), &statbuf)) - resman->addToSearchPath(file, false); + if (!stat(fileName.c_str(), &statbuf)) + resman->addToSearchPath(fileName, false); } } } |