summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-01 22:19:21 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-01 22:19:21 +0300
commit869c7fe8852248f03849c930c894d8fa218631b5 (patch)
treef86356b6565f68ebd8ba8f6b69ea3a6b5e87b251 /src/gui/widgets
parentf659dfb18c130896f5c51fffca7fbe79f6eba502 (diff)
downloadmv-869c7fe8852248f03849c930c894d8fa218631b5.tar.gz
mv-869c7fe8852248f03849c930c894d8fa218631b5.tar.bz2
mv-869c7fe8852248f03849c930c894d8fa218631b5.tar.xz
mv-869c7fe8852248f03849c930c894d8fa218631b5.zip
Fix code style.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/itemcontainer.cpp10
-rw-r--r--src/gui/widgets/setuptab.cpp5
-rw-r--r--src/gui/widgets/setuptabscroll.cpp2
-rw-r--r--src/gui/widgets/setuptouchitem.cpp2
4 files changed, 9 insertions, 10 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index e11e27fd6..0764aee08 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -62,7 +62,7 @@ class ItemIdPair final
Item* mItem;
};
-class SortItemAlphaFunctor final
+static const class SortItemAlphaFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -76,7 +76,7 @@ class SortItemAlphaFunctor final
}
} itemAlphaSorter;
-class SortItemIdFunctor final
+static const class SortItemIdFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -89,7 +89,7 @@ class SortItemIdFunctor final
}
} itemIdSorter;
-class SortItemWeightFunctor final
+static const class SortItemWeightFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -109,7 +109,7 @@ class SortItemWeightFunctor final
}
} itemWeightSorter;
-class SortItemAmountFunctor final
+static const class SortItemAmountFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -129,7 +129,7 @@ class SortItemAmountFunctor final
}
} itemAmountSorter;
-class SortItemTypeFunctor final
+static const class SortItemTypeFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/setuptab.cpp
index 227b74d98..9aeec73dc 100644
--- a/src/gui/widgets/setuptab.cpp
+++ b/src/gui/widgets/setuptab.cpp
@@ -22,13 +22,12 @@
#include "gui/widgets/setuptab.h"
-#include "logger.h"
-
#include "debug.h"
SetupTab::SetupTab(const Widget2 *const widget) :
Container(widget),
- gcn::ActionListener()
+ gcn::ActionListener(),
+ gcn::WidgetListener()
{
setOpaque(false);
addWidgetListener(this);
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index 64060aaad..89077dd8c 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -119,7 +119,7 @@ void SetupTabScroll::externalUpdated()
}
}
-void SetupTabScroll::widgetResized(const gcn::Event &event)
+void SetupTabScroll::widgetResized(const gcn::Event &event A_UNUSED)
{
mScroll->setWidth(getWidth() - 12);
mScroll->setHeight(getHeight() - 12 - 12);
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index 8f8ec500c..e75b0a724 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -27,7 +27,7 @@
#include "debug.h"
-class SortTouchActionFunctor final
+static const class SortTouchActionFunctor final
{
public:
bool operator() (const SetupActionData *const data1,