GUI: Move major widgets to new directory gui/widgets

Also renamed the source/header files, now they are more closely
aligned to how we rename most other source files

svn-id: r54264

backends/keymapper/remap-dialog.cpp

@@ -27,8 +27,8 @@
 #ifdef ENABLE_KEYMAPPER
 
 #include "gui/GuiManager.h"
-#include "gui/PopUpWidget.h"
-#include "gui/ScrollBarWidget.h"
+#include "gui/widgets/popup.h"
+#include "gui/widgets/scrollbar.h"
 #include "gui/ThemeEval.h"
 
 #include "common/translation.h"

backends/platform/ds/arm9/source/dsoptions.cpp

@@ -27,12 +27,12 @@
 #include "dsmain.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
-#include "gui/TabWidget.h"
+#include "gui/widgets/list.h"
+#include "gui/widgets/tab.h"
 #include "osystem_ds.h"
 #include "engines/scumm/scumm.h"
 #include "touchkeyboard.h"
-#include "gui/PopUpWidget.h"
+#include "gui/widgets/popup.h"
 
 #include "common/translation.h"
 

backends/platform/ds/arm9/source/dsoptions.h

@@ -34,7 +34,7 @@
 #include "gui/object.h"
 #include "gui/widget.h"
 #include "gui/dialog.h"
-#include "gui/TabWidget.h"
+#include "gui/widgets/tab.h"
 #include "scumm/dialogs.h"
 
 namespace DS {

backends/platform/wii/options.h

@@ -25,8 +25,8 @@
 
 #include "common/str.h"
 #include "gui/dialog.h"
-#include "gui/TabWidget.h"
-#include "gui/EditTextWidget.h"
+#include "gui/widgets/tab.h"
+#include "gui/widgets/edittext.h"
 
 using namespace GUI;
 

engines/dialogs.cpp

@@ -35,7 +35,7 @@
 #include "gui/about.h"
 #include "gui/GuiManager.h"
 #include "gui/launcher.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/message.h"
 #include "gui/options.h"
 #include "gui/saveload.h"

engines/mohawk/dialogs.h

@@ -33,7 +33,7 @@
 #include "gui/dialog.h"
 #include "gui/options.h"
 #include "gui/widget.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 
 namespace Mohawk {
 

engines/parallaction/saveload.cpp

@@ -29,7 +29,7 @@
 #include "gui/dialog.h"
 #include "gui/saveload.h"
 #include "gui/widget.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/message.h"
 
 #include "parallaction/parallaction.h"

engines/scumm/dialogs.cpp

@@ -37,7 +37,7 @@
 #include "gui/about.h"
 
 #include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/ThemeEval.h"
 
 #include "scumm/dialogs.h"

engines/testbed/config.h

@@ -31,7 +31,7 @@
 #include "common/str-array.h"
 #include "common/tokenizer.h"
 
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/options.h"
 #include "gui/ThemeEngine.h"
 

gui/KeysDialog.h

@@ -28,7 +28,7 @@
 
 #include "gui/GuiManager.h"
 #include "gui/dialog.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "common/str.h"
 #include "common/translation.h"
 

gui/browser.cpp

@@ -24,7 +24,7 @@
 
 #include "gui/browser.h"
 #include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 
 #include "common/config-manager.h"
 #include "common/system.h"

gui/browser_osx.mm

@@ -26,8 +26,6 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #include "gui/browser.h"
-#include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
 
 #include "common/config-manager.h"
 #include "common/system.h"

gui/chooser.cpp

@@ -26,7 +26,7 @@
 #include "common/translation.h"
 #include "gui/chooser.h"
 #include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 
 namespace GUI {
 

gui/console.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "gui/console.h"
-#include "gui/ScrollBarWidget.h"
+#include "gui/widgets/scrollbar.h"
 #include "gui/ThemeEval.h"
 
 #include "engines/engine.h"

gui/dialog.cpp

@@ -27,7 +27,7 @@
 #include "gui/GuiManager.h"
 #include "gui/dialog.h"
 #include "gui/widget.h"
-#include "gui/PopUpWidget.h"
+#include "gui/widgets/popup.h"
 
 #include "common/system.h"
 

gui/launcher.cpp

@@ -41,10 +41,10 @@
 #include "gui/GuiManager.h"
 #include "gui/options.h"
 #include "gui/saveload.h"
-#include "gui/EditTextWidget.h"
-#include "gui/ListWidget.h"
-#include "gui/TabWidget.h"
-#include "gui/PopUpWidget.h"
+#include "gui/widgets/edittext.h"
+#include "gui/widgets/list.h"
+#include "gui/widgets/tab.h"
+#include "gui/widgets/popup.h"
 #include "gui/ThemeEval.h"
 
 #include "graphics/cursorman.h"

gui/massadd.cpp

@@ -33,7 +33,7 @@
 #include "gui/massadd.h"
 #include "gui/GuiManager.h"
 #include "gui/widget.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 
 
 namespace GUI {

gui/module.mk

@@ -6,27 +6,27 @@ MODULE_OBJS := \
 	console.o \
 	debugger.o \
 	dialog.o \
-	editable.o \
 	error.o \
-	EditTextWidget.o \
 	GuiManager.o \
 	launcher.o \
-	ListWidget.o \
 	massadd.o \
 	message.o \
 	object.o \
 	options.o \
-	PopUpWidget.o \
 	saveload.o \
-	ScrollBarWidget.o \
-	TabWidget.o \
 	themebrowser.o \
 	ThemeEngine.o \
 	ThemeEval.o \
 	ThemeLayout.o \
 	ThemeParser.o \
 	Tooltip.o \
-	widget.o
+	widget.o \
+	widgets/editable.o \
+	widgets/edittext.o \
+	widgets/list.o \
+	widgets/popup.o \
+	widgets/scrollbar.o \
+	widgets/tab.o
 
 ifdef MACOSX
 MODULE_OBJS += \

gui/options.cpp

@@ -29,8 +29,8 @@
 #include "gui/GuiManager.h"
 #include "gui/ThemeEval.h"
 #include "gui/options.h"
-#include "gui/PopUpWidget.h"
-#include "gui/TabWidget.h"
+#include "gui/widgets/popup.h"
+#include "gui/widgets/tab.h"
 
 #include "common/fs.h"
 #include "common/config-manager.h"

gui/options.h

@@ -26,7 +26,6 @@
 #define OPTIONS_DIALOG_H
 
 #include "gui/dialog.h"
-#include "gui/TabWidget.h"
 #include "common/str.h"
 #include "sound/musicplugin.h"
 
@@ -42,6 +41,7 @@ class PopUpWidget;
 class SliderWidget;
 class StaticTextWidget;
 class ListWidget;
+class TabWidget;
 
 class OptionsDialog : public Dialog {
 public:

gui/saveload.cpp

@@ -25,7 +25,7 @@
 #include "common/config-manager.h"
 #include "common/translation.h"
 
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/message.h"
 #include "gui/saveload.h"
 #include "gui/ThemeEval.h"

gui/themebrowser.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "gui/themebrowser.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/widget.h"
 
 #include "common/translation.h"

gui/widgets/editable.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "common/events.h"
-#include "gui/editable.h"
+#include "gui/widgets/editable.h"
 #include "gui/GuiManager.h"
 
 namespace GUI {

gui/widgets/editable.h

@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef GUI_EDITABLE_H
-#define GUI_EDITABLE_H
+#ifndef GUI_WIDGETS_EDITABLE_H
+#define GUI_WIDGETS_EDITABLE_H
 
 #include "common/str.h"
 #include "common/rect.h"

gui/widgets/edittext.cpp

@@ -22,7 +22,7 @@
  * $Id$
  */
 
-#include "gui/EditTextWidget.h"
+#include "gui/widgets/edittext.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
 

gui/widgets/edittext.h

@@ -22,10 +22,10 @@
  * $Id$
  */
 
-#ifndef GUI_EDITTEXTWIDGET_H
-#define GUI_EDITTEXTWIDGET_H
+#ifndef GUI_WIDGETS_EDITTEXT_H
+#define GUI_WIDGETS_EDITTEXT_H
 
-#include "gui/editable.h"
+#include "gui/widgets/editable.h"
 #include "common/str.h"
 
 namespace GUI {

gui/widgets/list.cpp

@@ -27,8 +27,8 @@
 #include "common/frac.h"
 #include "common/tokenizer.h"
 
-#include "gui/ListWidget.h"
-#include "gui/ScrollBarWidget.h"
+#include "gui/widgets/list.h"
+#include "gui/widgets/scrollbar.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
 

gui/widgets/list.h

@@ -22,10 +22,10 @@
  * $Id$
  */
 
-#ifndef GUI_LISTWIDGET_H
-#define GUI_LISTWIDGET_H
+#ifndef GUI_WIDGETS_LIST_H
+#define GUI_WIDGETS_LIST_H
 
-#include "gui/editable.h"
+#include "gui/widgets/editable.h"
 #include "common/str.h"
 
 #include "gui/ThemeEngine.h"

gui/widgets/popup.cpp

@@ -26,7 +26,7 @@
 #include "common/events.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
-#include "gui/PopUpWidget.h"
+#include "gui/widgets/popup.h"
 #include "engines/engine.h"
 
 #include "gui/ThemeEval.h"

gui/widgets/popup.h

@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef POPUPWIDGET_H
-#define POPUPWIDGET_H
+#ifndef GUI_WIDGETS_POPUP_H
+#define GUI_WIDGETS_POPUP_H
 
 #include "gui/widget.h"
 #include "common/str.h"

gui/widgets/scrollbar.cpp

@@ -22,7 +22,7 @@
  * $Id$
  */
 
-#include "ScrollBarWidget.h"
+#include "gui/widgets/scrollbar.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
 

gui/widgets/scrollbar.h

@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef SCROLLBARWIDGET_H
-#define SCROLLBARWIDGET_H
+#ifndef GUI_WIDGETS_SCROLLBAR_H
+#define GUI_WIDGETS_SCROLLBAR_H
 
 #include "gui/widget.h"
 

gui/widgets/tab.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "common/util.h"
-#include "gui/TabWidget.h"
+#include "gui/widgets/tab.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
 

gui/widgets/tab.h

@@ -22,10 +22,10 @@
  * $Id$
  */
 
-#ifndef TABWIDGET_H
-#define TABWIDGET_H
+#ifndef GUI_WIDGETS_TAB_H
+#define GUI_WIDGETS_TAB_H
 
-#include "widget.h"
+#include "gui/widget.h"
 #include "common/str.h"
 #include "common/array.h"