summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-14 18:22:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-14 18:38:12 +0300
commitcbc1a498f79b8f9adc28801827b9c87959f1089c (patch)
treef88bb4dbb8191cc2e8adc29a5dd4350509fd4d17 /src/gui
parente0bea9ae2681668da02870719fd2ec48678a15f3 (diff)
downloadmv-cbc1a498f79b8f9adc28801827b9c87959f1089c.tar.gz
mv-cbc1a498f79b8f9adc28801827b9c87959f1089c.tar.bz2
mv-cbc1a498f79b8f9adc28801827b9c87959f1089c.tar.xz
mv-cbc1a498f79b8f9adc28801827b9c87959f1089c.zip
fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/tabs/whispertab.cpp4
-rw-r--r--src/gui/windows/chatwindow.cpp1
-rw-r--r--src/gui/windows/debugwindow.cpp1
-rw-r--r--src/gui/windows/setupwindow.cpp1
-rw-r--r--src/gui/windows/setupwindow.h10
-rw-r--r--src/gui/windows/shortcutwindow.cpp1
-rw-r--r--src/gui/windows/socialwindow.cpp3
7 files changed, 12 insertions, 9 deletions
diff --git a/src/gui/widgets/tabs/whispertab.cpp b/src/gui/widgets/tabs/whispertab.cpp
index 908c9ae66..ec02bb70f 100644
--- a/src/gui/widgets/tabs/whispertab.cpp
+++ b/src/gui/widgets/tabs/whispertab.cpp
@@ -32,8 +32,6 @@
#include "gui/widgets/windowcontainer.h"
-#include "utils/gettext.h"
-
#include "debug.h"
WhisperTab::WhisperTab(const Widget2 *const widget, const std::string &nick) :
@@ -90,7 +88,7 @@ void WhisperTab::handleCommand(const std::string &msg)
}
bool WhisperTab::handleCommand(const std::string &restrict type,
- const std::string &restrict args)
+ const std::string &restrict args A_UNUSED)
{
if (type == "close")
{
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 61817053a..26f665052 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -44,6 +44,7 @@
#include "gui/windows/emotewindow.h"
#include "gui/windows/setupwindow.h"
+#include "gui/widgets/tabbedarea.h"
#include "gui/windows/whoisonline.h"
#include "gui/widgets/tabs/battletab.h"
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index b4d14e404..30d202054 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -36,6 +36,7 @@
#include "gui/widgets/label.h"
#include "gui/widgets/layout.h"
#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/tabbedarea.h"
#include "resources/imagehelper.h"
diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp
index e17b8f432..0780865aa 100644
--- a/src/gui/windows/setupwindow.cpp
+++ b/src/gui/windows/setupwindow.cpp
@@ -45,6 +45,7 @@
#include "gui/widgets/tabs/setup_visual.h"
#include "gui/widgets/label.h"
+#include "gui/widgets/tabbedarea.h"
#include "utils/dtor.h"
#include "utils/gettext.h"
diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h
index 65dcf23e5..f5406e8ac 100644
--- a/src/gui/windows/setupwindow.h
+++ b/src/gui/windows/setupwindow.h
@@ -20,10 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_WINDOWS_SETUP_H
-#define GUI_WINDOWS_SETUP_H
-
-#include "gui/widgets/tabbedarea.h"
+#ifndef GUI_WINDOWS_SETUPWINDOW_H
+#define GUI_WINDOWS_SETUPWINDOW_H
#include "gui/widgets/window.h"
@@ -31,8 +29,10 @@
#include <list>
+class Button;
class Label;
class SetupTab;
+class TabbedArea;
/**
* The setup dialog. Displays several tabs for configuring different aspects
@@ -87,4 +87,4 @@ class SetupWindow final : public Window,
extern SetupWindow* setupWindow;
-#endif // GUI_WINDOWS_SETUP_H
+#endif // GUI_WINDOWS_SETUPWINDOW_H
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 6a7a176a2..96ec8c93c 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -23,6 +23,7 @@
#include "gui/windows/shortcutwindow.h"
#include "gui/windows/setupwindow.h"
+#include "gui/widgets/tabbedarea.h"
#include "gui/widgets/layout.h"
#include "gui/widgets/scrollarea.h"
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 8e5f4c312..2385066be 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -46,6 +46,7 @@
#include "gui/widgets/label.h"
#include "gui/widgets/popup.h"
#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/tabbedarea.h"
#include "gui/widgets/tabs/chattab.h"
@@ -1896,7 +1897,7 @@ void SocialWindow::updateGuildCounter(const int online, const int total)
}
}
-void SocialWindow::updatedPlayer(const std::string &name)
+void SocialWindow::updatedPlayer(const std::string &name A_UNUSED)
{
mNeedUpdate = true;
}