summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-11 17:13:54 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-11 17:13:54 +0300
commit333fa4263ce7278b723b57aca4a21be7fb15ca3d (patch)
tree4ef450fadb152cc170066e32a58918bbf2952c38 /src/gui
parenta5bda75dae5facec9f920af28865aae4d46b545b (diff)
downloadmv-333fa4263ce7278b723b57aca4a21be7fb15ca3d.tar.gz
mv-333fa4263ce7278b723b57aca4a21be7fb15ca3d.tar.bz2
mv-333fa4263ce7278b723b57aca4a21be7fb15ca3d.tar.xz
mv-333fa4263ce7278b723b57aca4a21be7fb15ca3d.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/itempopup.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_other.cpp2
-rw-r--r--src/gui/windows/charcreatedialog.cpp1
-rw-r--r--src/gui/windows/charselectdialog.cpp1
-rw-r--r--src/gui/windows/charselectdialog.h9
5 files changed, 11 insertions, 4 deletions
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 21c00001d..51f1e8108 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -28,8 +28,6 @@
#include "item.h"
#include "units.h"
-#include "being/being.h"
-
#include "gui/gui.h"
#include "gui/fonts/font.h"
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index 4e86abd8c..cdb22490a 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -296,7 +296,7 @@ Setup_Other::Setup_Other(const Widget2 *const widget) :
"enableGuildBotEvent", false);
// TRANSLATORS: settings option
- new SetupItemCheckBox(_("Enable manamarket bot bot support"),
+ new SetupItemCheckBox(_("Enable manamarket bot support"),
"", "enableManaMarketBot", this,
"enableManaMarketBotEvent", false);
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 6af4a6437..9525805d4 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -37,6 +37,7 @@
#include "gui/widgets/tabstrip.h"
#include "gui/widgets/textfield.h"
+#include "net/charserverhandler.h"
#include "net/serverfeatures.h"
#include "resources/iteminfo.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index dd0205347..476cd50b9 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -46,6 +46,7 @@
#include "gui/widgets/createwidget.h"
#include "net/character.h"
+#include "net/charserverhandler.h"
#include "net/logindata.h"
#include "net/loginhandler.h"
#include "net/registrationoptions.h"
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 6827a78ea..39df750ac 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -23,9 +23,11 @@
#ifndef GUI_WINDOWS_CHARSELECTDIALOG_H
#define GUI_WINDOWS_CHARSELECTDIALOG_H
+#include "enums/simpletypes/beingid.h"
+
#include "gui/widgets/window.h"
-#include "net/charserverhandler.h"
+#include "net/characters.h"
#include "listeners/actionlistener.h"
#include "listeners/keylistener.h"
@@ -36,6 +38,11 @@ class CharacterViewBase;
class LoginData;
class TextDialog;
+namespace Net
+{
+ class CharServerHandler;
+}
+
/**
* Character selection dialog.
*