fix code style and compilation warnings.

3 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 3e696fbda..15372b928 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -47,13 +47,13 @@ bool Minimap::mShow = true;
 Minimap::Minimap() :
     // TRANSLATORS: mini map window name
     Window(_("Map"), false, nullptr, "map.xml"),
-    mMapImage(nullptr),
     mWidthProportion(0.5),
     mHeightProportion(0.5),
-    mCustomMapImage(false),
+    mMapImage(nullptr),
     mMapOriginX(0),
     mMapOriginY(0),
     mTextPopup(new TextPopup),
+    mCustomMapImage(false),
     mAutoResize(config.getBoolValue("autoresizeminimaps"))
 {
     setWindowName("Minimap");
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 6efe8a786..fab7efea9 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -73,15 +73,15 @@ class Minimap final : public Window, public ConfigListener
         void optionChanged(const std::string &name);
 
     private:
-        Image *mMapImage;
         float mWidthProportion;
         float mHeightProportion;
-        static bool mShow;
-        bool mCustomMapImage;
+        Image *mMapImage;
         int mMapOriginX;
         int mMapOriginY;
         TextPopup *mTextPopup;
+        bool mCustomMapImage;
         bool mAutoResize;
+        static bool mShow;
 };
 
 extern Minimap *minimap;
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index de0306f7c..7c5f84f61 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -99,17 +99,17 @@ void CharacterDisplay::update()
     distributeResizedEvent();
 }
 
-void CharacterDisplay::widgetHidden(const gcn::Event &event)
+void CharacterDisplay::widgetHidden(const gcn::Event &event A_UNUSED)
 {
     mPopup->setVisible(false);
 }
 
-void CharacterDisplay::mouseExited(gcn::MouseEvent &event)
+void CharacterDisplay::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     mPopup->setVisible(false);
 }
 
-void CharacterDisplay::mouseMoved(gcn::MouseEvent &event)
+void CharacterDisplay::mouseMoved(gcn::MouseEvent &event A_UNUSED)
 {
     int mouseX = 0;
     int mouseY = 0;