Cleanup GUI classes

Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.

1 files changed, 26 insertions, 26 deletions

diff --git a/mana.files b/mana.files
index b50299e8..c8d9a4f8 100644
--- a/mana.files
+++ b/mana.files
@@ -83,16 +83,12 @@ src/gui/debugwindow.cpp
 src/gui/debugwindow.h
 src/gui/emotepopup.cpp
 src/gui/emotepopup.h
-src/gui/emoteshortcutcontainer.cpp
-src/gui/emoteshortcutcontainer.h
 src/gui/equipmentwindow.cpp
 src/gui/equipmentwindow.h
 src/gui/focushandler.cpp
 src/gui/focushandler.h
 src/gui/gui.cpp
 src/gui/gui.h
-src/gui/guildlistbox.cpp
-src/gui/guildlistbox.h
 src/gui/guildwindow.cpp
 src/gui/guildwindow.h
 src/gui/help.cpp
@@ -101,15 +97,8 @@ src/gui/inventorywindow.cpp
 src/gui/inventorywindow.h
 src/gui/itemamount.cpp
 src/gui/itemamount.h
-src/gui/itemcontainer.cpp
-src/gui/itemcontainer.h
-src/gui/itemlinkhandler.cpp
-src/gui/itemlinkhandler.h
 src/gui/itempopup.cpp
 src/gui/itempopup.h
-src/gui/itemshortcutcontainer.cpp
-src/gui/itemshortcutcontainer.h
-src/gui/linkhandler.h
 src/gui/login.cpp
 src/gui/login.h
 src/gui/minimap.cpp
@@ -128,8 +117,6 @@ src/gui/palette.cpp
 src/gui/palette.h
 src/gui/partywindow.cpp
 src/gui/partywindow.h
-src/gui/playerbox.cpp
-src/gui/playerbox.h
 src/gui/popupmenu.cpp
 src/gui/popupmenu.h
 src/gui/quitdialog.cpp
@@ -158,14 +145,6 @@ src/gui/setup_players.cpp
 src/gui/setup_players.h
 src/gui/setup_video.cpp
 src/gui/setup_video.h
-src/gui/setuptab.cpp
-src/gui/setuptab.h
-src/gui/shop.cpp
-src/gui/shop.h
-src/gui/shoplistbox.cpp
-src/gui/shoplistbox.h
-src/gui/shortcutcontainer.cpp
-src/gui/shortcutcontainer.h
 src/gui/shortcutwindow.cpp
 src/gui/shortcutwindow.h
 src/gui/skilldialog.cpp
@@ -180,13 +159,8 @@ src/gui/statuswindow.cpp
 src/gui/statuswindow.h
 src/gui/storagewindow.cpp
 src/gui/storagewindow.h
-src/gui/table.cpp
-src/gui/table.h
-src/gui/tablemodel.cpp
-src/gui/tablemodel.h
 src/gui/textdialog.cpp
 src/gui/textdialog.h
-src/gui/textrenderer.h
 src/gui/trade.cpp
 src/gui/trade.h
 src/gui/truetypefont.cpp
@@ -215,22 +189,35 @@ src/gui/widgets/desktop.cpp
 src/gui/widgets/desktop.h
 src/gui/widgets/dropdown.cpp
 src/gui/widgets/dropdown.h
+src/gui/widgets/emoteshortcutcontainer.cpp
+src/gui/widgets/emoteshortcutcontainer.h
 src/gui/widgets/flowcontainer.cpp
 src/gui/widgets/flowcontainer.h
+src/gui/widgets/guildlistbox.cpp
+src/gui/widgets/guildlistbox.h
 src/gui/widgets/icon.cpp
 src/gui/widgets/icon.h
 src/gui/widgets/inttextfield.cpp
 src/gui/widgets/inttextfield.h
+src/gui/widgets/itemcontainer.cpp
+src/gui/widgets/itemcontainer.h
+src/gui/widgets/itemlinkhandler.cpp
+src/gui/widgets/itemlinkhandler.h
+src/gui/widgets/itemshortcutcontainer.cpp
+src/gui/widgets/itemshortcutcontainer.h
 src/gui/widgets/label.cpp
 src/gui/widgets/label.h
 src/gui/widgets/layout.cpp
 src/gui/widgets/layout.h
 src/gui/widgets/layouthelper.cpp
 src/gui/widgets/layouthelper.h
+src/gui/widgets/linkhandler.h
 src/gui/widgets/listbox.cpp
 src/gui/widgets/listbox.h
 src/gui/widgets/passwordfield.cpp
 src/gui/widgets/passwordfield.h
+src/gui/widgets/playerbox.cpp
+src/gui/widgets/playerbox.h
 src/gui/widgets/popup.cpp
 src/gui/widgets/popup.h
 src/gui/widgets/progressbar.cpp
@@ -241,12 +228,24 @@ src/gui/widgets/resizegrip.cpp
 src/gui/widgets/resizegrip.h
 src/gui/widgets/scrollarea.cpp
 src/gui/widgets/scrollarea.h
+src/gui/widgets/setuptab.cpp
+src/gui/widgets/setuptab.h
+src/gui/widgets/shopitems.cpp
+src/gui/widgets/shopitems.h
+src/gui/widgets/shoplistbox.cpp
+src/gui/widgets/shoplistbox.h
+src/gui/widgets/shortcutcontainer.cpp
+src/gui/widgets/shortcutcontainer.h
 src/gui/widgets/slider.cpp
 src/gui/widgets/slider.h
 src/gui/widgets/tab.cpp
 src/gui/widgets/tab.h
 src/gui/widgets/tabbedarea.cpp
 src/gui/widgets/tabbedarea.h
+src/gui/widgets/table.cpp
+src/gui/widgets/table.h
+src/gui/widgets/tablemodel.cpp
+src/gui/widgets/tablemodel.h
 src/gui/widgets/textbox.cpp
 src/gui/widgets/textbox.h
 src/gui/widgets/textfield.cpp
@@ -490,6 +489,7 @@ src/textmanager.cpp
 src/textmanager.h
 src/textparticle.cpp
 src/textparticle.h
+src/textrenderer.h
 src/tileset.h
 src/units.cpp
 src/units.h