fix code style.

23 files changed, 13 insertions, 28 deletions

diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index 0a3e06f27..cf5c80029 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -46,9 +46,7 @@ TEST(browserbox, test1)
 {
     PHYSFS_init("manaplus");
     dirSeparator = "/";
-    Client::Options options;
-    client = new Client(options);
-
+    client = new Client;
     logger = new Logger();
     imageHelper = new SDLImageHelper();
     theme = new Theme;
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index e67f77056..54d15391b 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/button.h"
 
-#include "client.h"
 #include "graphicsvertexes.h"
 #include "settings.h"
 
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 508bfead4..15ad7e3ec 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/checkbox.h"
 
-#include "client.h"
 #include "settings.h"
 
 #include "input/inputaction.h"
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index ab6b0dab0..6647a768f 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/dropdown.h"
 
-#include "client.h"
 #include "settings.h"
 
 #include "events/keyevent.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 150c94f77..087f4b372 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/dropshortcutcontainer.h"
 
-#include "client.h"
 #include "dragdrop.h"
 #include "dropshortcut.h"
 #include "settings.h"
@@ -40,6 +39,7 @@
 #include "resources/image.h"
 
 #include "utils/delete2.h"
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 6c6c82b43..85e07e2b7 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -22,7 +22,6 @@
 #include "gui/widgets/emoteshortcutcontainer.h"
 
 #include "animatedsprite.h"
-#include "client.h"
 #include "emoteshortcut.h"
 #include "settings.h"
 
@@ -39,6 +38,8 @@
 
 #include "resources/db/emotedb.h"
 
+#include "utils/stringutils.h"
+
 #include "debug.h"
 
 static const int MAX_ITEMS = 48;
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index c3725b46f..7f4a18858 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/guitable.h"
 
-#include "client.h"
 #include "settings.h"
 
 #include "gui/gui.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index e7e2455bb..670807ed5 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/itemshortcutcontainer.h"
 
-#include "client.h"
 #include "dragdrop.h"
 #include "inventory.h"
 #include "item.h"
@@ -50,6 +49,7 @@
 #include "resources/skillconsts.h"
 
 #include "utils/delete2.h"
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 8953fc5e2..68b50c458 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/listbox.h"
 
-#include "client.h"
 #include "settings.h"
 
 #include "input/inputaction.h"
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index b77b1bc42..c7a3a84b5 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/playerbox.h"
 
-#include "client.h"
 #include "settings.h"
 
 #include "being/being.h"
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 68db6ee1d..9a10eedb7 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/progressbar.h"
 
-#include "client.h"
 #include "graphicsvertexes.h"
 #include "settings.h"
 
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index e0d031908..d4bae8273 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/radiobutton.h"
 
-#include "client.h"
 #include "settings.h"
 
 #include "input/inputaction.h"
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index d439765af..fc7ae91d5 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/scrollarea.h"
 
-#include "client.h"
 #include "graphicsvertexes.h"
 #include "settings.h"
 
@@ -76,6 +75,7 @@
 #include "resources/imagerect.h"
 
 #include "utils/delete2.h"
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index cd250d274..4c7242866 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/shoplistbox.h"
 
-#include "client.h"
 #include "settings.h"
 #include "shopitem.h"
 
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 444480ae1..6c2224150 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/slider.h"
 
-#include "client.h"
 #include "graphicsvertexes.h"
 #include "settings.h"
 
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 1b3355265..014fa4354 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/spellshortcutcontainer.h"
 
-#include "client.h"
 #include "dragdrop.h"
 #include "itemshortcut.h"
 #include "settings.h"
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index 36e4b5437..684b9d4d5 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/tabs/chattab.h"
 
 #include "chatlogger.h"
-#include "client.h"
 #include "commands.h"
 #include "commandhandler.h"
 #include "configuration.h"
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 54b17396a..6bc8d07e9 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/tabs/setup_video.h"
 
-#include "client.h"
 #include "configuration.h"
 
 #include "graphicsmanager.h"
diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index e90008ac1..fff876d14 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -29,10 +29,9 @@
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "client.h"
-
 #include "utils/delete2.h"
 #include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 73c38343b..16018e5c3 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/tabs/tab.h"
 
-#include "client.h"
 #include "graphicsvertexes.h"
 #include "settings.h"
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 0eb16867a..fb1bcc1db 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/textfield.h"
 
-#include "client.h"
 #include "settings.h"
 
 #include "input/inputmanager.h"
@@ -73,6 +72,9 @@
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
+#ifdef ANDROID
+#include "gui/windowmanager.h"
+#endif
 
 #include "gui/fonts/font.h"
 
@@ -83,6 +85,7 @@
 
 #include "utils/copynpaste.h"
 #include "utils/delete2.h"
+#include "utils/stringutils.h"
 #include "utils/timer.h"
 
 #undef DELETE  // Win32 compatibility hack
@@ -700,7 +703,7 @@ void TextField::fontChanged()
 void TextField::mousePressed(MouseEvent &event)
 {
 #ifdef ANDROID
-    if (!client->isKeyboardVisible())
+    if (!WindowManager::isKeyboardVisible())
         inputManager.executeAction(InputAction::SHOW_KEYBOARD);
 #endif
     event.consume();
@@ -737,7 +740,7 @@ void TextField::mousePressed(MouseEvent &event)
 void TextField::focusGained(const Event &event A_UNUSED)
 {
 #ifdef ANDROID
-    if (!client->isKeyboardVisible())
+    if (!WindowManager::isKeyboardVisible())
         inputManager.executeAction(InputAction::SHOW_KEYBOARD);
 #endif
 }
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index febd1b6ba..a4bf738c9 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/textpreview.h"
 
-#include "client.h"
 #include "settings.h"
 
 #include "gui/gui.h"
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 453bb125c..74c6d1cfc 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -76,7 +76,6 @@
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
-#include "gui/windowmanager.h"
 
 #include "gui/fonts/font.h"