move windows classes to windows directory.

11 files changed, 24 insertions, 16 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 8b65928a8..76b5ccfc4 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -28,11 +28,12 @@
 
 #include "being/localplayer.h"
 
-#include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
 #include "gui/viewport.h"
 
+#include "gui/windows/chatwindow.h"
+
 #include "resources/image.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index 65812ba4b..c8a38337f 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -24,7 +24,8 @@
 
 #include "units.h"
 
-#include "gui/charselectdialog.h"
+#include "gui/windows/charselectdialog.h"
+
 #include "gui/textpopup.h"
 
 #include "gui/widgets/label.h"
diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h
index 8ef949b7c..21e20e37d 100644
--- a/src/gui/widgets/characterviewbase.h
+++ b/src/gui/widgets/characterviewbase.h
@@ -21,7 +21,7 @@
 #ifndef GUI_WIDGETS_CHARACTERVIEWBASE_H
 #define GUI_WIDGETS_CHARACTERVIEWBASE_H
 
-#include "gui/charselectdialog.h"
+#include "gui/windows/charselectdialog.h"
 
 #include "gui/widgets/container.h"
 
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index aba79034f..e863643d3 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -31,7 +31,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/helpwindow.h"
+#include "gui/windows/helpwindow.h"
 
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/itemlinkhandler.h"
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index c2ac5a45b..07192ab6b 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_CHATTAB_H
 #define GUI_WIDGETS_CHATTAB_H
 
-#include "gui/chatwindow.h"
+#include "gui/windows/chatwindow.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/tab.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 115fcb192..c040d4c3a 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -28,10 +28,11 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/windows/inventorywindow.h"
+
 #include "resources/image.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 0def0ad9e..64cafcd82 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -29,13 +29,14 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/itempopup.h"
-#include "gui/shopwindow.h"
-#include "gui/shortcutwindow.h"
 #include "gui/viewport.h"
 
+#include "gui/windows/chatwindow.h"
+#include "gui/windows/shopwindow.h"
+#include "gui/windows/shortcutwindow.h"
+
 #include "net/net.h"
 #include "net/inventoryhandler.h"
 #include "net/tradehandler.h"
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index fd70e2032..0dff139f6 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -22,11 +22,12 @@
 
 #include "gui/widgets/itemlinkhandler.h"
 
-#include "gui/confirmdialog.h"
-#include "gui/helpwindow.h"
 #include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/windows/confirmdialog.h"
+#include "gui/windows/helpwindow.h"
+
 #include "utils/gettext.h"
 #include "utils/process.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 3334a42e5..e2901c3bb 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -33,12 +33,13 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
-#include "gui/skilldialog.h"
 #include "gui/spellpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/windows/inventorywindow.h"
+#include "gui/windows/skilldialog.h"
+
 #include "gui/widgets/skillinfo.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 652a1402b..0cbfd1a5e 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -24,10 +24,11 @@
 #include "main.h"
 #include "soundmanager.h"
 
-#include "gui/editdialog.h"
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
 
+#include "gui/windows/editdialog.h"
+
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/horizontcontainer.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index cf3fc937b..8e77d3215 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,11 +27,12 @@
 #include "itemshortcut.h"
 #include "spellshortcut.h"
 
-#include "gui/inventorywindow.h"
-#include "gui/shortcutwindow.h"
 #include "gui/spellpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/windows/inventorywindow.h"
+#include "gui/windows/shortcutwindow.h"
+
 #include "resources/image.h"
 
 #include <guichan/font.hpp>