From 96d3520f217a55a853b8c1a20f3975eee5c032b6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 1 Sep 2012 13:57:45 +0300
Subject: Fix code style.

---
 src/gui/serverdialog.cpp          | 2 +-
 src/gui/socialwindow.cpp          | 3 ++-
 src/gui/viewport.cpp              | 3 ++-
 src/gui/widgets/avatarlistbox.cpp | 3 ++-
 src/gui/widgets/layouthelper.cpp  | 3 ++-
 src/gui/widgets/tabstrip.cpp      | 2 +-
 src/gui/widgets/tabstrip.h        | 2 +-
 src/gui/widgets/widgetgroup.h     | 2 +-
 src/gui/widgets/window.h          | 3 ++-
 src/maplayer.cpp                  | 4 +++-
 10 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 93f0609ff..0104e2aa5 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -597,7 +597,7 @@ void ServerDialog::loadServers(const bool addNew)
         std::string version = XML::getProperty(serverNode, "minimumVersion",
                                                std::string());
 
-        const bool meetsMinimumVersion = (compareStrI(version, PACKAGE_VERSION)
+        const bool meetsMinimumVersion = (compareStrI(version, SMALL_VERSION)
                                    <= 0);
 
         // For display in the list
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 8d0ce5ea1..eb0dc5549 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -730,7 +730,8 @@ public:
             if (!ava)
                 break;
 
-            const MapItem *const item = map->findPortalXY(ava->getX(), ava->getY());
+            const MapItem *const item = map->findPortalXY(
+                ava->getX(), ava->getY());
             if (item)
             {
                 std::string name = strprintf("%s [%d %d]",
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 6367f147e..77bc7bb16 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -692,7 +692,8 @@ void Viewport::showPopup(const int x, const int y, Button *const button)
     mPopupMenu->showPopup(x, y, button);
 }
 
-void Viewport::showPopup(const int x, const int y, const ProgressBar *const bar)
+void Viewport::showPopup(const int x, const int y,
+                         const ProgressBar *const bar)
 {
     mPopupMenu->showPopup(x, y, bar);
 }
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index a3a4a2334..b33233d73 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -124,7 +124,8 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
         if (a->getType() != MapItem::SEPARATOR)
         {
             // Draw online status
-            const Image *const icon = a->getOnline() ? onlineIcon : offlineIcon;
+            const Image *const icon = a->getOnline()
+                ? onlineIcon : offlineIcon;
             if (icon)
                 graphics->drawImage(icon, 2, y + 1);
         }
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index 9e93f6de5..e0dc82b8f 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -40,7 +40,8 @@ const Layout &LayoutHelper::getLayout() const
     return mLayout;
 }
 
-LayoutCell &LayoutHelper::place(const int x, const int y, gcn::Widget *const wg,
+LayoutCell &LayoutHelper::place(const int x, const int y,
+                                gcn::Widget *const wg,
                                 const int w, const int h)
 {
     mContainer->add(wg);
diff --git a/src/gui/widgets/tabstrip.cpp b/src/gui/widgets/tabstrip.cpp
index 3e408288d..8eb32e038 100644
--- a/src/gui/widgets/tabstrip.cpp
+++ b/src/gui/widgets/tabstrip.cpp
@@ -38,7 +38,7 @@ TabStrip::TabStrip(const int height, const int spacing) :
 {
 }
 
-gcn::Widget *TabStrip::createWidget(std::string text)
+gcn::Widget *TabStrip::createWidget(const std::string &text)
 {
     Button *const widget = new Button();
     widget->setStick(true);
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index d7aa2a700..92d864b79 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -34,7 +34,7 @@ class TabStrip : public WidgetGroup
 
         TabStrip(const int height, const int spacing = 0);
 
-        gcn::Widget *createWidget(std::string name);
+        gcn::Widget *createWidget(const std::string &name);
 
         void action(const gcn::ActionEvent &event);
 };
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index d70aa977f..ad2ee4e64 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -46,7 +46,7 @@ class WidgetGroup : public Container,
 
         void widgetResized(const gcn::Event &event);
 
-        virtual Widget *createWidget(std::string name) = 0;
+        virtual Widget *createWidget(const std::string &name) = 0;
 
     protected:
         int mSpacing;
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 38742a73e..2c6c0ab8e 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -89,7 +89,8 @@ class Window : public gcn::Window, private gcn::WidgetListener
         /**
          * Sets the location relative to the given widget (only horisontally)
          */
-        void setLocationHorisontallyRelativeTo(const gcn::Widget *const widget);
+        void setLocationHorisontallyRelativeTo(const gcn::Widget
+                                               *const widget);
 
         /**
          * Sets the location relative to the given enumerated position.
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index f94542cc6..7ae6e3ae9 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -23,8 +23,10 @@
 #include "maplayer.h"
 
 #include "configuration.h"
-
 #include "graphicsvertexes.h"
+#ifndef USE_OPENGL
+#include "graphics.h"
+#endif
 
 #include "localplayer.h"
 
-- 
cgit v1.2.3-60-g2f50