summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-15 02:20:52 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-15 02:20:52 +0300
commit18b8d9888cd5ee8a533a1059f109d8de1c6b04d1 (patch)
treedb753995392ae8e6c5202467f417f31deb8717f0 /src/gui
parentc3b8f951d6e16dfb48cb71bd7ad3d7c43ea56c0a (diff)
downloadManaVerse-18b8d9888cd5ee8a533a1059f109d8de1c6b04d1.tar.gz
ManaVerse-18b8d9888cd5ee8a533a1059f109d8de1c6b04d1.tar.bz2
ManaVerse-18b8d9888cd5ee8a533a1059f109d8de1c6b04d1.tar.xz
ManaVerse-18b8d9888cd5ee8a533a1059f109d8de1c6b04d1.zip
Fix code style again.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/charcreatedialog.cpp4
-rw-r--r--src/gui/connectiondialog.h2
-rw-r--r--src/gui/killstats.h2
-rw-r--r--src/gui/outfitwindow.h2
-rw-r--r--src/gui/palette.h2
-rw-r--r--src/gui/selldialog.h4
-rw-r--r--src/gui/setup_video.cpp4
-rw-r--r--src/gui/socialwindow.h2
-rw-r--r--src/gui/theme.h2
-rw-r--r--src/gui/tradewindow.h4
-rw-r--r--src/gui/widgets/desktop.h2
-rw-r--r--src/gui/widgets/window.h2
12 files changed, 18 insertions, 14 deletions
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 693002789..1ef29c93f 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -58,12 +58,12 @@
#include "debug.h"
-const static Being::Action actions[] =
+static const Being::Action actions[] =
{
Being::STAND, Being::SIT, Being::MOVE, Being::ATTACK, Being::DEAD
};
-const static uint8_t directions[] =
+static const uint8_t directions[] =
{
Being::DOWN, Being::RIGHT, Being::UP, Being::LEFT
};
diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h
index 76d8a952b..a40f7472c 100644
--- a/src/gui/connectiondialog.h
+++ b/src/gui/connectiondialog.h
@@ -34,7 +34,7 @@
*
* \ingroup Interface
*/
-class ConnectionDialog : public Window, gcn::ActionListener
+class ConnectionDialog : public Window, private gcn::ActionListener
{
public:
/**
diff --git a/src/gui/killstats.h b/src/gui/killstats.h
index 64aef4585..6f21fc6ed 100644
--- a/src/gui/killstats.h
+++ b/src/gui/killstats.h
@@ -37,7 +37,7 @@ namespace gcn
class Label;
}
-class KillStats : public Window, gcn::ActionListener, public Listener
+class KillStats : public Window, private gcn::ActionListener, public Listener
{
public:
/**
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h
index 5c5e4778e..21b78addf 100644
--- a/src/gui/outfitwindow.h
+++ b/src/gui/outfitwindow.h
@@ -42,7 +42,7 @@ class CheckBox;
class Item;
class Label;
-class OutfitWindow : public Window, gcn::ActionListener
+class OutfitWindow : public Window, private gcn::ActionListener
{
public:
/**
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 235070990..a4ac5d44b 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -125,7 +125,7 @@ class Palette
*/
static void advanceGradients();
- gcn::Color static produceHPColor(int hp, int maxHp, int alpha = 255);
+ static gcn::Color produceHPColor(int hp, int maxHp, int alpha = 255);
protected:
/** Colors used for the rainbow gradient */
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index dd92e4033..8b1d73ce3 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -47,7 +47,9 @@ namespace gcn
*
* \ingroup Interface
*/
-class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
+class SellDialog : public Window,
+ private gcn::ActionListener,
+ private gcn::SelectionListener
{
public:
/**
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index f6b83807a..1e3f843aa 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -109,9 +109,9 @@ class ModeListModel : public gcn::ListModel
StringVect mVideoModes;
};
-bool modeSorter(std::string mode1, std::string mode2);
+static bool modeSorter(std::string mode1, std::string mode2);
-bool modeSorter(std::string mode1, std::string mode2)
+static bool modeSorter(std::string mode1, std::string mode2)
{
const int width1 = atoi(mode1.substr(0, mode1.find("x")).c_str());
const int height1 = atoi(mode1.substr(mode1.find("x") + 1).c_str());
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index 478b62bfe..246f3e127 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -49,7 +49,7 @@ class PlayersTab;
*
* \ingroup Interface
*/
-class SocialWindow : public Window, gcn::ActionListener
+class SocialWindow : public Window, private gcn::ActionListener
{
public:
SocialWindow();
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 2a3a4aa2d..75446fdbd 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -254,7 +254,7 @@ class Theme : public Palette, public ConfigListener
int alpha = 255)
{ return mInstance->getColor(type, alpha); }
- const static gcn::Color &getThemeColor(char c, bool &valid)
+ static const gcn::Color &getThemeColor(char c, bool &valid)
{ return mInstance->getColor(c, valid); }
static gcn::Color getProgressColor(int type, float progress);
diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h
index c23f006a1..3b6967772 100644
--- a/src/gui/tradewindow.h
+++ b/src/gui/tradewindow.h
@@ -47,7 +47,9 @@ namespace gcn
*
* \ingroup Interface
*/
-class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
+class TradeWindow : public Window,
+ private gcn::ActionListener,
+ private gcn::SelectionListener
{
public:
/**
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 4e8e77003..1ca411732 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -46,7 +46,7 @@ namespace gcn
*
* \ingroup GUI
*/
-class Desktop : public Container, gcn::WidgetListener
+class Desktop : public Container, private gcn::WidgetListener
{
public:
Desktop();
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index a006b3995..86f225db4 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -44,7 +44,7 @@ class WindowContainer;
*
* \ingroup GUI
*/
-class Window : public gcn::Window, gcn::WidgetListener
+class Window : public gcn::Window, private gcn::WidgetListener
{
public:
/**