6 files changed, 14 insertions, 7 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index e83e91bb8..455a657b5 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -21,7 +21,6 @@
 
 #include "gui/widgets/emoteshortcutcontainer.h"
 
-#include "emoteshortcut.h"
 #include "settings.h"
 
 #include "input/inputmanager.h"
@@ -30,6 +29,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "gui/shortcut/emoteshortcut.h"
+
 #include "gui/popups/textpopup.h"
 
 #include "input/inputactionoperators.h"
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index e17cb711e..8a5e6bca3 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -24,7 +24,6 @@
 
 #include "dragdrop.h"
 #include "graphicsvertexes.h"
-#include "itemshortcut.h"
 
 #include "being/playerinfo.h"
 
@@ -34,6 +33,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "gui/shortcut/itemshortcut.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 4659f4afd..b8fd02217 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -23,10 +23,8 @@
 #include "gui/widgets/itemshortcutcontainer.h"
 
 #include "dragdrop.h"
-#include "itemshortcut.h"
 #include "settings.h"
 #include "spellmanager.h"
-#include "spellshortcut.h"
 
 #include "being/playerinfo.h"
 
@@ -36,6 +34,9 @@
 
 #include "gui/fonts/font.h"
 
+#include "gui/shortcut/itemshortcut.h"
+#include "gui/shortcut/spellshortcut.h"
+
 #include "gui/popups/itempopup.h"
 #include "gui/popups/popupmenu.h"
 #include "gui/popups/skillpopup.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 1d1b15836..7f1ca47fa 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -23,15 +23,16 @@
 #include "gui/widgets/spellshortcutcontainer.h"
 
 #include "dragdrop.h"
-#include "itemshortcut.h"
 #include "settings.h"
 #include "spellmanager.h"
-#include "spellshortcut.h"
 
 #include "gui/viewport.h"
 
 #include "gui/fonts/font.h"
 
+#include "gui/shortcut/itemshortcut.h"
+#include "gui/shortcut/spellshortcut.h"
+
 #include "gui/popups/popupmenu.h"
 #include "gui/popups/spellpopup.h"
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 497f17d2f..36315af34 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -287,6 +287,8 @@ int TextField::getValue() const
 void TextField::keyPressed(KeyEvent &event)
 {
     const int val = event.getKey().getValue();
+    logger->log("TextField::keyPressed %d", val);
+
 #ifdef USE_SDL2
     if (val == Key::TEXTINPUT)
     {
diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp
index 5a8a0432d..43fed340a 100644
--- a/src/gui/widgets/virtshortcutcontainer.cpp
+++ b/src/gui/widgets/virtshortcutcontainer.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/virtshortcutcontainer.h"
 
 #include "dragdrop.h"
-#include "shortcutbase.h"
 #include "settings.h"
 
 #include "being/playerinfo.h"
@@ -32,6 +31,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "gui/shortcut/shortcutbase.h"
+
 #include "gui/popups/itempopup.h"
 #include "gui/popups/popupmenu.h"