From cbc1a498f79b8f9adc28801827b9c87959f1089c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Feb 2014 18:22:32 +0300 Subject: fix code style. --- src/actormanager.h | 2 +- src/being/localplayer.cpp | 3 +-- src/being/playerrelationslistener.h | 2 ++ src/gui/widgets/tabs/whispertab.cpp | 4 +--- src/gui/windows/chatwindow.cpp | 1 + src/gui/windows/debugwindow.cpp | 1 + src/gui/windows/setupwindow.cpp | 1 + src/gui/windows/setupwindow.h | 10 +++++----- src/gui/windows/shortcutwindow.cpp | 1 + src/gui/windows/socialwindow.cpp | 3 ++- src/render/sdl2softwaregraphics.cpp | 2 +- src/resources/mapreader.cpp | 1 - 12 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/actormanager.h b/src/actormanager.h index d7b760d51..17bd696d6 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -297,7 +297,7 @@ class ActorManager final: public ConfigListener int getPickupItemIndex(const std::string &name) const A_WARN_UNUSED; static int getIndexByName(const std::string &name, - const std::map &map) + const std::map &map) A_WARN_UNUSED; bool checkForPickup(const FloorItem *const item) const A_WARN_UNUSED; diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index cc8436408..86db69d8d 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -2818,7 +2818,7 @@ void LocalPlayer::crazyMoveA() move(1, 1); break; case 'U': - move (-1, -1); + move(-1, -1); break; case 'L': move(-1, 1); @@ -3016,7 +3016,6 @@ void LocalPlayer::crazyMoveA() emoteId = static_cast(emo - 'a' + 11); else if (emo >= 'A' && emo <= 'Z') emoteId = static_cast(emo - 'A' + 37); - } if (mMoveProgram[mCrazyMoveState] == 'e') emote(emoteId); diff --git a/src/being/playerrelationslistener.h b/src/being/playerrelationslistener.h index eefd69b9c..983f731e4 100644 --- a/src/being/playerrelationslistener.h +++ b/src/being/playerrelationslistener.h @@ -23,6 +23,8 @@ #ifndef BEING_PLAYERRELATIONSLISTENER_H #define BEING_PLAYERRELATIONSLISTENER_H +#include + class PlayerRelationsListener { public: diff --git a/src/gui/widgets/tabs/whispertab.cpp b/src/gui/widgets/tabs/whispertab.cpp index 908c9ae66..ec02bb70f 100644 --- a/src/gui/widgets/tabs/whispertab.cpp +++ b/src/gui/widgets/tabs/whispertab.cpp @@ -32,8 +32,6 @@ #include "gui/widgets/windowcontainer.h" -#include "utils/gettext.h" - #include "debug.h" WhisperTab::WhisperTab(const Widget2 *const widget, const std::string &nick) : @@ -90,7 +88,7 @@ void WhisperTab::handleCommand(const std::string &msg) } bool WhisperTab::handleCommand(const std::string &restrict type, - const std::string &restrict args) + const std::string &restrict args A_UNUSED) { if (type == "close") { diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 61817053a..26f665052 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -44,6 +44,7 @@ #include "gui/windows/emotewindow.h" #include "gui/windows/setupwindow.h" +#include "gui/widgets/tabbedarea.h" #include "gui/windows/whoisonline.h" #include "gui/widgets/tabs/battletab.h" diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index b4d14e404..30d202054 100644 --- a/src/gui/windows/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -36,6 +36,7 @@ #include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/layouthelper.h" +#include "gui/widgets/tabbedarea.h" #include "resources/imagehelper.h" diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index e17b8f432..0780865aa 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -45,6 +45,7 @@ #include "gui/widgets/tabs/setup_visual.h" #include "gui/widgets/label.h" +#include "gui/widgets/tabbedarea.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h index 65dcf23e5..f5406e8ac 100644 --- a/src/gui/windows/setupwindow.h +++ b/src/gui/windows/setupwindow.h @@ -20,10 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WINDOWS_SETUP_H -#define GUI_WINDOWS_SETUP_H - -#include "gui/widgets/tabbedarea.h" +#ifndef GUI_WINDOWS_SETUPWINDOW_H +#define GUI_WINDOWS_SETUPWINDOW_H #include "gui/widgets/window.h" @@ -31,8 +29,10 @@ #include +class Button; class Label; class SetupTab; +class TabbedArea; /** * The setup dialog. Displays several tabs for configuring different aspects @@ -87,4 +87,4 @@ class SetupWindow final : public Window, extern SetupWindow* setupWindow; -#endif // GUI_WINDOWS_SETUP_H +#endif // GUI_WINDOWS_SETUPWINDOW_H diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 6a7a176a2..96ec8c93c 100644 --- a/src/gui/windows/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -23,6 +23,7 @@ #include "gui/windows/shortcutwindow.h" #include "gui/windows/setupwindow.h" +#include "gui/widgets/tabbedarea.h" #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 8e5f4c312..2385066be 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -46,6 +46,7 @@ #include "gui/widgets/label.h" #include "gui/widgets/popup.h" #include "gui/widgets/scrollarea.h" +#include "gui/widgets/tabbedarea.h" #include "gui/widgets/tabs/chattab.h" @@ -1896,7 +1897,7 @@ void SocialWindow::updateGuildCounter(const int online, const int total) } } -void SocialWindow::updatedPlayer(const std::string &name) +void SocialWindow::updatedPlayer(const std::string &name A_UNUSED) { mNeedUpdate = true; } diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index b693cd132..22a66a911 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -1487,7 +1487,7 @@ bool SDL2SoftwareGraphics::setVideoMode(const int w, const int h, } mSurface = SDL_GetWindowSurface(mWindow); - IimageHelper::dumpSurfaceFormat(mSurface); + ImageHelper::dumpSurfaceFormat(mSurface); SDL2SoftwareImageHelper::setFormat(mSurface->format); int w1 = 0; diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 5cf6d3337..e053e0035 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -211,7 +211,6 @@ void MapReader::addLayerToList(const std::string &fileName) continue; name = toLower(name); logger->log("found patch layer: " + name); - LayerInfoIterator it = mKnownLayers.find(name); mKnownLayers[name] = childNode; mKnownDocs.insert(doc); } -- cgit v1.2.3-60-g2f50