diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-12-03 15:31:12 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-12-03 15:31:12 +0300 |
commit | d69ea30539a6fe816dd6e1d943a0a2adcbd95c19 (patch) | |
tree | 8bc8b6b7826a639ca9e516a0f8939afe83d91d9f /src | |
parent | d43ac6456a95aa3d204272f9bada5d5a28f85072 (diff) | |
download | manaverse-d69ea30539a6fe816dd6e1d943a0a2adcbd95c19.tar.gz manaverse-d69ea30539a6fe816dd6e1d943a0a2adcbd95c19.tar.bz2 manaverse-d69ea30539a6fe816dd6e1d943a0a2adcbd95c19.tar.xz manaverse-d69ea30539a6fe816dd6e1d943a0a2adcbd95c19.zip |
Fix code style.
Diffstat (limited to 'src')
-rw-r--r-- | src/commands.h | 3 | ||||
-rw-r--r-- | src/gui/setup_other.cpp | 5 | ||||
-rw-r--r-- | src/gui/widgets/shortcutcontainer.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/shortcutcontainer.h | 2 | ||||
-rw-r--r-- | src/net/eathena/loginhandler.cpp | 2 | ||||
-rw-r--r-- | src/touchactions.cpp | 2 | ||||
-rw-r--r-- | src/touchmanager.cpp | 2 |
7 files changed, 10 insertions, 8 deletions
diff --git a/src/commands.h b/src/commands.h index 33f86d76b..2f746b9e2 100644 --- a/src/commands.h +++ b/src/commands.h @@ -115,7 +115,8 @@ namespace Commands void replaceVars(std::string &str); } -static const CommandInfo commands[] = { +static const CommandInfo commands[] = +{ {"closeall", &Commands::closeAll}, {"ignoreall", &Commands::ignoreAll}, {"help", &Commands::help}, diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp index 8a02b64f9..c974a3aa5 100644 --- a/src/gui/setup_other.cpp +++ b/src/gui/setup_other.cpp @@ -111,8 +111,9 @@ Setup_Other::Setup_Other(const Widget2 *const widget) : new SetupItemTextField(_("Crazy move A program"), "", "crazyMoveProgram", this, "crazyMoveProgramEvent"); - new SetupItemCheckBox(_("Mouse relative moves (good for touch interfaces)"), - "", "mouseDirectionMove", this, "mouseDirectionMoveEvent"); + new SetupItemCheckBox(_("Mouse relative moves " + "(good for touch interfaces)"), "", "mouseDirectionMove", + this, "mouseDirectionMoveEvent"); new SetupItemLabel(_("Player"), "", this); diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index 245ec90b5..c421a4bdb 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -112,7 +112,7 @@ void ShortcutContainer::drawBackground(Graphics *g) } } -void ShortcutContainer::widgetMoved(const gcn::Event& event) +void ShortcutContainer::widgetMoved(const gcn::Event& event A_UNUSED) { mRedraw = true; } diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 568dc451b..b331782fb 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -96,7 +96,7 @@ class ShortcutContainer : public gcn::Widget, void drawBackground(Graphics *g); void setRedraw(bool b) - { mRedraw = true; } + { mRedraw = b; } protected: /** diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index a8d5398c1..a1a80494d 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -130,7 +130,7 @@ void LoginHandler::changePassword(const std::string &username A_UNUSED, void LoginHandler::sendLoginRegister(const std::string &username, const std::string &password, - const std::string &email) + const std::string &email A_UNUSED) { MessageOut outMsg(0x0064); outMsg.writeInt32(0); // client version diff --git a/src/touchactions.cpp b/src/touchactions.cpp index 40f7e5641..b9d6b2fc9 100644 --- a/src/touchactions.cpp +++ b/src/touchactions.cpp @@ -36,7 +36,7 @@ bool padClicked(false); #ifdef ANDROID -void showKeyboard(const MouseInput &mouseInput) +void showKeyboard(const MouseInput &mouseInput A_UNUSED) { SDL_ANDROID_ToggleScreenKeyboardTextInput(nullptr); } diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp index 8afc35119..79acaafb1 100644 --- a/src/touchmanager.cpp +++ b/src/touchmanager.cpp @@ -40,7 +40,7 @@ TouchManager::TouchManager() : mVertexes(new ImageCollection), mRedraw(true) { - for (int f = 0;f < actionsSize; f ++) + for (int f = 0; f < actionsSize; f ++) mActions[f] = false; } |