diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-17 01:43:14 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-17 01:43:33 +0300 |
commit | e6e36b25a696212f0262e3e5ef520543b1b3a58b (patch) | |
tree | 70cc6862e11dc45e94bafdb644dfa88b20a3c439 | |
parent | cbe5ad5d45e5ce7da04e0517997f838aec32f3aa (diff) | |
download | manaplus-e6e36b25a696212f0262e3e5ef520543b1b3a58b.tar.gz manaplus-e6e36b25a696212f0262e3e5ef520543b1b3a58b.tar.bz2 manaplus-e6e36b25a696212f0262e3e5ef520543b1b3a58b.tar.xz manaplus-e6e36b25a696212f0262e3e5ef520543b1b3a58b.zip |
ARM fixes.
-rw-r--r-- | src/commandhandler.cpp | 2 | ||||
-rw-r--r-- | src/commandhandler.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/spellshortcutcontainer.cpp | 2 | ||||
-rw-r--r-- | src/utils/copynpaste.cpp | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index d17d2b636..c17234c18 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -228,7 +228,7 @@ void CommandHandler::handleCommand(const std::string &command, tab->chatLog(_("Unknown command.")); } -char CommandHandler::parseBoolean(const std::string &value) +signed char CommandHandler::parseBoolean(const std::string &value) { std::string opt = value.substr(0, 1); diff --git a/src/commandhandler.h b/src/commandhandler.h index ec42573a1..5a73b2335 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -64,7 +64,7 @@ class CommandHandler final static void replaceVars(std::string &str); - static char parseBoolean(const std::string &value); + static signed char parseBoolean(const std::string &value); protected: friend class ChatTab; diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 78d112908..ae215b480 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -51,8 +51,6 @@ SpellShortcutContainer::SpellShortcutContainer(const unsigned number) : mSpellPopup(new SpellPopup), mNumber(number) { - mBoxWidth = mBoxWidth; - addMouseListener(this); addWidgetListener(this); diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 5d7c32e29..82a58f113 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -473,7 +473,7 @@ bool retrieveBuffer(std::string&, size_t&) return false; } -bool sendBuffer(std::string& text) +bool sendBuffer(std::string& text A_UNUSED) { return false; } |