From eff128d7019ea0cd137a5fff6cc67825f90c4e1b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 19 Oct 2013 18:54:32 +0300 Subject: fix code style --- src/gui/popups/beingpopup.cpp | 1 - src/gui/widgets/scrollarea.h | 3 ++- src/gui/widgets/shortcutcontainer.h | 6 +++--- src/gui/windows/npcpostdialog.cpp | 1 - src/particle/animationparticle.h | 8 ++++---- src/particle/imageparticle.h | 3 +-- src/particle/particle.h | 1 - src/particle/rotationalparticle.h | 8 ++++---- src/resources/db/monsterdb.cpp | 2 +- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index d36fcd28d..4699fc5fe 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -64,7 +64,6 @@ BeingPopup::BeingPopup() : getThemeColor(Theme::POPUP_OUTLINE)); mBeingComment->setForegroundColorAll(getThemeColor(Theme::POPUP), getThemeColor(Theme::POPUP_OUTLINE)); - } BeingPopup::~BeingPopup() diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index eeb709768..649ed50ac 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -59,7 +59,8 @@ class ScrollArea final : public gcn::ScrollArea, * * @param content the initial content to show in the scroll area */ - explicit ScrollArea(gcn::Widget *const widget, const bool opaque = true, + explicit ScrollArea(gcn::Widget *const widget, + const bool opaque = true, const std::string &skin = ""); A_DELETE_COPY(ScrollArea) diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 45baabba8..7d37ed18c 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -66,21 +66,21 @@ class ShortcutContainer : public gcn::Widget, /** * Handles mouse when dragged. */ - virtual void mouseDragged(gcn::MouseEvent &event) override + virtual void mouseDragged(gcn::MouseEvent &event A_UNUSED) override { } /** * Handles mouse when pressed. */ - virtual void mousePressed(gcn::MouseEvent &event) override + virtual void mousePressed(gcn::MouseEvent &event A_UNUSED) override { } /** * Handles mouse release. */ - virtual void mouseReleased(gcn::MouseEvent &event) override + virtual void mouseReleased(gcn::MouseEvent &event A_UNUSED) override { } diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp index 2eb20fbf8..de1f2b0e7 100644 --- a/src/gui/windows/npcpostdialog.cpp +++ b/src/gui/windows/npcpostdialog.cpp @@ -48,7 +48,6 @@ NpcPostDialog::NpcPostDialog(const int npcId): mSender(new TextField(this)) { setContentSize(400, 180); - } void NpcPostDialog::postInit() diff --git a/src/particle/animationparticle.h b/src/particle/animationparticle.h index eb864ea86..55f314994 100644 --- a/src/particle/animationparticle.h +++ b/src/particle/animationparticle.h @@ -28,16 +28,16 @@ #include "utils/xml.h" class Animation; -class Map; class SimpleAnimation; class AnimationParticle final : public ImageParticle { public: - AnimationParticle(Animation *const animation); + explicit AnimationParticle(Animation *const animation); - AnimationParticle(XmlNodePtr const animationNode, - const std::string& dyePalettes = std::string()); + explicit AnimationParticle(XmlNodePtr const animationNode, + const std::string& dyePalettes + = std::string()); A_DELETE_COPY(AnimationParticle) diff --git a/src/particle/imageparticle.h b/src/particle/imageparticle.h index 26a5ac651..c05b2316e 100644 --- a/src/particle/imageparticle.h +++ b/src/particle/imageparticle.h @@ -28,7 +28,6 @@ #include class Image; -class Map; /** * A particle that uses an image for its visualization. @@ -42,7 +41,7 @@ class ImageParticle : public Particle * @param map the map this particle appears on * @param image an Image instance, may not be NULL */ - ImageParticle(Image *const image); + explicit ImageParticle(Image *const image); A_DELETE_COPY(ImageParticle) diff --git a/src/particle/particle.h b/src/particle/particle.h index a22fe7041..42dd31e15 100644 --- a/src/particle/particle.h +++ b/src/particle/particle.h @@ -30,7 +30,6 @@ #include #include -class Map; class Particle; class ParticleEmitter; diff --git a/src/particle/rotationalparticle.h b/src/particle/rotationalparticle.h index 6f07f51d5..fcc7e4b07 100644 --- a/src/particle/rotationalparticle.h +++ b/src/particle/rotationalparticle.h @@ -28,16 +28,16 @@ #include "utils/xml.h" class Animation; -class Map; class SimpleAnimation; class RotationalParticle final : public ImageParticle { public: - RotationalParticle(Animation *const animation); + explicit RotationalParticle(Animation *const animation); - RotationalParticle(const XmlNodePtr animationNode, - const std::string& dyePalettes = std::string()); + explicit RotationalParticle(const XmlNodePtr animationNode, + const std::string& dyePalettes + = std::string()); A_DELETE_COPY(RotationalParticle) diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index d8075c962..de695f704 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -152,7 +152,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName) spriteNode, "event", ""); const int delay = XML::getProperty( spriteNode, "delay", 0); - const char *filename = reinterpret_cast( + const char *const filename = reinterpret_cast( spriteNode->xmlChildrenNode->content); if (event == "hit") -- cgit v1.2.3-60-g2f50