fix code style.

35 files changed, 25 insertions, 30 deletions

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 441f59d95..c7d7fd8a1 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -88,7 +88,6 @@
 #include "listeners/mouselistener.h"
 
 #include "input/inputmanager.h"
-#include "input/keydata.h"
 #include "input/keyinput.h"
 #include "input/mouseinput.h"
 
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index c07f99367..99418881f 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -38,6 +38,7 @@
 #include "utils/gettext.h"
 
 #include "resources/image.h"
+#include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
 #include "debug.h"
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index 7f65f23da..aa40181f4 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -26,10 +26,11 @@
 
 #include "gui/widgets/popup.h"
 
-#include "resources/iteminfo.h"
+#include "resources/itemtype.h"
 
 class Icon;
 class Item;
+class ItemInfo;
 class Label;
 class TextBox;
 
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index 5f7ed2be2..28a1ea558 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -27,8 +27,7 @@
 #include "client.h"
 
 #include "resources/image.h"
-
-#include "render/graphics.h"
+#include "resources/imagerect.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 5e1c6e4c8..eb7973bbb 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -30,9 +30,9 @@
 #include "gui/skin.h"
 #include "gui/themeinfo.h"
 
-#include "resources/dye.h"
 #include "resources/dyepalette.h"
 #include "resources/image.h"
+#include "resources/imagerect.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 41a190daa..9a7ed36dc 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -41,7 +41,6 @@
 #include "resources/mapitemtype.h"
 
 #include "resources/map/map.h"
-#include "resources/map/mapitem.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 661dfc66d..f9ea17516 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -71,10 +71,10 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "resources/image.h"
 #include "resources/imageset.h"
+#include "resources/imagerect.h"
 
 #include "gui/gui.h"
 #include "gui/skin.h"
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 48f603532..86ebefd60 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -68,9 +68,9 @@
 #include "client.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "resources/image.h"
+#include "resources/imagerect.h"
 
 #include "gui/gui.h"
 #include "gui/skin.h"
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 71e546faa..dec4e88c6 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -27,7 +27,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/gui.h"
 #include "gui/skin.h"
@@ -39,6 +38,7 @@
 #include "gui/widgets/popuplist.h"
 
 #include "resources/image.h"
+#include "resources/imagerect.h"
 
 #include <algorithm>
 
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index ba2c36713..5374e8a7c 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -29,7 +29,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "listeners/guitableactionlistener.h"
 
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index fcec92a39..c2d84c66a 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -29,7 +29,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "utils/stringutils.h"
 #include "debug.h"
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 1be268d56..ef00913e7 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -48,6 +48,7 @@
 #include "utils/gettext.h"
 
 #include "resources/image.h"
+#include "resources/iteminfo.h"
 
 #include "listeners/selectionlistener.h"
 
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 54078a172..e5c6c06b3 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -37,8 +37,6 @@
 
 #include "listeners/openurllistener.h"
 
-#include "input/mouseinput.h"
-
 #include <string>
 
 #include "debug.h"
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index ab5e8dccb..87a9f43cc 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -68,7 +68,6 @@
 #include "client.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "listeners/selectionlistener.h"
 
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 398ebb7b9..0ffddeeac 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -27,6 +27,8 @@
 
 #include "listeners/mouselistener.h"
 
+#include "resources/imagerect.h"
+
 #include "localconsts.h"
 
 class Being;
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index e45bc4abb..5f425d004 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -27,6 +27,8 @@
 
 #include "listeners/widgetlistener.h"
 
+#include "resources/imagerect.h"
+
 #include <string>
 
 #include "localconsts.h"
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 87621e945..d2d12f1c6 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -68,9 +68,9 @@
 #include "client.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "resources/image.h"
+#include "resources/imagerect.h"
 
 #include "gui/gui.h"
 #include "gui/skin.h"
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 52d3df152..ca29c09fa 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -72,6 +72,7 @@
 #include "gui/skin.h"
 
 #include "resources/image.h"
+#include "resources/imagerect.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 848027c94..c660648d8 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -71,11 +71,11 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/gui.h"
 
 #include "resources/image.h"
+#include "resources/imagerect.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 81cf34dd2..36e3aa093 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -68,7 +68,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 97aa7421f..9aaed0aef 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -215,7 +215,8 @@ void Setup_Input::action(const ActionEvent &event)
             inputManager.setNewKeyIndex(ik);
             refreshAssignedKey(mKeyList->getSelected());
             inputManager.unassignKey();
-            inputManager.setNewKeyIndex(static_cast<int>(InputAction::NO_VALUE));
+            inputManager.setNewKeyIndex(static_cast<int>(
+                InputAction::NO_VALUE));
         }
         mAssignKeyButton->setEnabled(true);
     }
diff --git a/src/gui/widgets/tabs/socialfriendsfunctor.h b/src/gui/widgets/tabs/socialfriendsfunctor.h
index 1ad209adb..f8d110ed9 100644
--- a/src/gui/widgets/tabs/socialfriendsfunctor.h
+++ b/src/gui/widgets/tabs/socialfriendsfunctor.h
@@ -23,6 +23,8 @@
 
 #include "avatar.h"
 
+#include "utils/stringutils.h"
+
 #include "localconsts.h"
 
 class SortFriendsFunctor final
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index c88a47033..2ad0e8ac8 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -75,6 +75,7 @@
 #include "gui/widgets/tabbedarea.h"
 
 #include "resources/image.h"
+#include "resources/imagerect.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 23fa63a07..d85f07b5d 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -66,7 +66,6 @@
 #include "gui/widgets/textbox.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 14faad2f0..72ff8ea87 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -78,6 +78,7 @@
 #include "gui/popups/popupmenu.h"
 
 #include "resources/image.h"
+#include "resources/imagerect.h"
 
 #include "utils/copynpaste.h"
 #include "utils/delete2.h"
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index a14f960cd..fea0883cf 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -73,6 +73,8 @@
 
 #include "gui/widgets/basiccontainer2.h"
 
+#include "resources/imagerect.h"
+
 #include "localconsts.h"
 
 class ContainerPlacer;
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index e8f92e343..90b966259 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -27,7 +27,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/windows/okdialog.h"
 
@@ -44,6 +43,7 @@
 #include "resources/iteminfo.h"
 
 #include "resources/db/chardb.h"
+#include "resources/db/colordb.h"
 #include "resources/db/itemdb.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 73ebb90b6..4ed5075a6 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -29,7 +29,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "being/attributes.h"
 
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index da0de7026..9cc6d863f 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -24,7 +24,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/models/typelistmodel.h"
 
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index f03507320..101f547f0 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -28,7 +28,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "listeners/openurllistener.h"
 
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index c34801c8e..0a9a222cd 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -31,7 +31,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/viewport.h"
 
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index 3a906b00e..b396f591f 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -27,7 +27,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "listeners/wrongdatanoticelistener.h"
 
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 5a0bf0478..cc0a4f184 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -30,7 +30,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 475144f61..2735f85dc 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -28,7 +28,6 @@
 #include "events/keyevent.h"
 
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index f81f14399..6a3dfb7a1 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -24,10 +24,7 @@
 
 #include "client.h"
 
-#include "events/keyevent.h"
-
 #include "input/inputaction.h"
-#include "input/keydata.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"