diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 18:07:17 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 18:38:03 +0300 |
| commit | cde42202d69e178da73c698065deca54b24054fd (patch) | |
| tree | d636965ecde85db8de36fa65735920826e8e191b | |
| parent | 21e63bbf54679ec236d1f09ed435959ff6a04db2 (diff) | |
| download | manaverse-cde42202d69e178da73c698065deca54b24054fd.tar.gz manaverse-cde42202d69e178da73c698065deca54b24054fd.tar.bz2 manaverse-cde42202d69e178da73c698065deca54b24054fd.tar.xz manaverse-cde42202d69e178da73c698065deca54b24054fd.zip | |
move exguichan files into gui/base/
237 files changed, 577 insertions, 583 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fafeeaf5d..f540d2552 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,7 +62,6 @@ IF (USE_X11) ENDIF (USE_X11) INCLUDE_DIRECTORIES( - "guichan/include" ${CMAKE_CURRENT_SOURCE_DIR} ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} @@ -770,81 +769,78 @@ SET(SRCS vector.h walklayer.cpp walklayer.h - ) - -SET(SRCS_GUICHAN - guichan/include/guichan/actionevent.hpp - guichan/include/guichan/actionlistener.hpp - guichan/include/guichan/basiccontainer.hpp - guichan/include/guichan/cliprectangle.hpp - guichan/include/guichan/color.hpp - guichan/include/guichan/deathlistener.hpp - guichan/include/guichan/event.hpp - guichan/include/guichan/exception.hpp - guichan/include/guichan/focushandler.hpp - guichan/include/guichan/focuslistener.hpp - guichan/include/guichan/font.hpp - guichan/include/guichan/graphics.hpp - guichan/include/guichan/gui.hpp - guichan/include/guichan/image.hpp - guichan/include/guichan/input.hpp - guichan/include/guichan/inputevent.hpp - guichan/include/guichan/key.hpp - guichan/include/guichan/keyevent.hpp - guichan/include/guichan/keyinput.hpp - guichan/include/guichan/keylistener.hpp - guichan/include/guichan/listmodel.hpp - guichan/include/guichan/mouseevent.hpp - guichan/include/guichan/mouseinput.hpp - guichan/include/guichan/mouselistener.hpp - guichan/include/guichan/rectangle.hpp - guichan/include/guichan/selectionevent.hpp - guichan/include/guichan/selectionlistener.hpp - guichan/include/guichan/sdl/sdlpixel.hpp - guichan/include/guichan/widget.hpp - guichan/include/guichan/widgetlistener.hpp - guichan/include/guichan/widgets/button.hpp - guichan/include/guichan/widgets/checkbox.hpp - guichan/include/guichan/widgets/container.hpp - guichan/include/guichan/widgets/label.hpp - guichan/include/guichan/widgets/listbox.hpp - guichan/include/guichan/widgets/radiobutton.hpp - guichan/include/guichan/widgets/scrollarea.hpp - guichan/include/guichan/widgets/slider.hpp - guichan/include/guichan/widgets/textbox.hpp - guichan/include/guichan/widgets/textfield.hpp - guichan/include/guichan/widgets/window.hpp - guichan/actionevent.cpp - guichan/basiccontainer.cpp - guichan/cliprectangle.cpp - guichan/color.cpp - guichan/event.cpp - guichan/exception.cpp - guichan/focushandler.cpp - guichan/font.cpp - guichan/graphics.cpp - guichan/gui.cpp - guichan/image.cpp - guichan/inputevent.cpp - guichan/key.cpp - guichan/keyevent.cpp - guichan/keyinput.cpp - guichan/mouseevent.cpp - guichan/mouseinput.cpp - guichan/rectangle.cpp - guichan/selectionevent.cpp - guichan/widget.cpp - guichan/widgets/button.cpp - guichan/widgets/checkbox.cpp - guichan/widgets/container.cpp - guichan/widgets/label.cpp - guichan/widgets/listbox.cpp - guichan/widgets/radiobutton.cpp - guichan/widgets/scrollarea.cpp - guichan/widgets/slider.cpp - guichan/widgets/textbox.cpp - guichan/widgets/textfield.cpp - guichan/widgets/window.cpp + gui/base/actionevent.hpp + gui/base/actionlistener.hpp + gui/base/basiccontainer.hpp + gui/base/cliprectangle.hpp + gui/base/color.hpp + gui/base/deathlistener.hpp + gui/base/event.hpp + gui/base/exception.hpp + gui/base/focushandler.hpp + gui/base/focuslistener.hpp + gui/base/font.hpp + gui/base/graphics.hpp + gui/base/gui.hpp + gui/base/image.hpp + gui/base/input.hpp + gui/base/inputevent.hpp + gui/base/key.hpp + gui/base/keyevent.hpp + gui/base/keyinput.hpp + gui/base/keylistener.hpp + gui/base/listmodel.hpp + gui/base/mouseevent.hpp + gui/base/mouseinput.hpp + gui/base/mouselistener.hpp + gui/base/rectangle.hpp + gui/base/selectionevent.hpp + gui/base/selectionlistener.hpp + gui/base/sdl/sdlpixel.hpp + gui/base/widget.hpp + gui/base/widgetlistener.hpp + gui/base/widgets/button.hpp + gui/base/widgets/checkbox.hpp + gui/base/widgets/container.hpp + gui/base/widgets/label.hpp + gui/base/widgets/listbox.hpp + gui/base/widgets/radiobutton.hpp + gui/base/widgets/scrollarea.hpp + gui/base/widgets/slider.hpp + gui/base/widgets/textbox.hpp + gui/base/widgets/textfield.hpp + gui/base/widgets/window.hpp + gui/base/actionevent.cpp + gui/base/basiccontainer.cpp + gui/base/cliprectangle.cpp + gui/base/color.cpp + gui/base/event.cpp + gui/base/exception.cpp + gui/base/focushandler.cpp + gui/base/font.cpp + gui/base/graphics.cpp + gui/base/gui.cpp + gui/base/image.cpp + gui/base/inputevent.cpp + gui/base/key.cpp + gui/base/keyevent.cpp + gui/base/keyinput.cpp + gui/base/mouseevent.cpp + gui/base/mouseinput.cpp + gui/base/rectangle.cpp + gui/base/selectionevent.cpp + gui/base/widget.cpp + gui/base/widgets/button.cpp + gui/base/widgets/checkbox.cpp + gui/base/widgets/container.cpp + gui/base/widgets/label.cpp + gui/base/widgets/listbox.cpp + gui/base/widgets/radiobutton.cpp + gui/base/widgets/scrollarea.cpp + gui/base/widgets/slider.cpp + gui/base/widgets/textbox.cpp + gui/base/widgets/textfield.cpp + gui/base/widgets/window.cpp ) SET(SRCS_EVOL @@ -1000,9 +996,9 @@ ENDIF () SET (PROGRAMS manaplus) IF (ENABLE_EATHENA) - ADD_EXECUTABLE(manaplus WIN32 ${SRCS_GUICHAN} ${SRCS} ${SRCS_EATHENA} ${SRCS_TMWA} ${SRCS_EVOL}) + ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_EATHENA} ${SRCS_TMWA} ${SRCS_EVOL}) ELSE(ENABLE_EATHENA) - ADD_EXECUTABLE(manaplus WIN32 ${SRCS_GUICHAN} ${SRCS} ${SRCS_TMWA} ${SRCS_EVOL}) + ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_TMWA} ${SRCS_EVOL}) ENDIF(ENABLE_EATHENA) TARGET_LINK_LIBRARIES(manaplus diff --git a/src/Makefile.am b/src/Makefile.am index 0c50b6da5..f53c0f432 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,25 +25,25 @@ else manaplus_SOURCES = endif -dyecmd_CXXFLAGS = -I$(srcdir)/guichan/include -DUSE_INTERNALGUICHAN -dyecmd_SOURCES = guichan/actionevent.cpp \ - guichan/cliprectangle.cpp \ - guichan/color.cpp \ - guichan/event.cpp \ - guichan/exception.cpp \ - guichan/font.cpp \ - guichan/graphics.cpp \ - guichan/rectangle.cpp \ - guichan/widget.cpp \ - guichan/include/guichan/actionevent.hpp \ - guichan/include/guichan/cliprectangle.hpp \ - guichan/include/guichan/color.hpp \ - guichan/include/guichan/event.hpp \ - guichan/include/guichan/exception.hpp \ - guichan/include/guichan/font.hpp \ - guichan/include/guichan/graphics.hpp \ - guichan/include/guichan/rectangle.hpp \ - guichan/include/guichan/widget.hpp +dyecmd_CXXFLAGS = +dyecmd_SOURCES = gui/base/actionevent.cpp \ + gui/base/cliprectangle.cpp \ + gui/base/color.cpp \ + gui/base/event.cpp \ + gui/base/exception.cpp \ + gui/base/font.cpp \ + gui/base/graphics.cpp \ + gui/base/rectangle.cpp \ + gui/base/widget.cpp \ + gui/base/actionevent.hpp \ + gui/base/cliprectangle.hpp \ + gui/base/color.hpp \ + gui/base/event.hpp \ + gui/base/exception.hpp \ + gui/base/font.hpp \ + gui/base/graphics.hpp \ + gui/base/rectangle.hpp \ + gui/base/widget.hpp dyecmd_SOURCES += dyetool/dyemain.cpp \ animatedsprite.cpp \ @@ -158,80 +158,78 @@ manaplus_CXXFLAGS += -DUSE_SDL2 endif endif -manaplus_CXXFLAGS += -I$(srcdir)/guichan/include -DUSE_INTERNALGUICHAN -manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ - guichan/include/guichan/actionlistener.hpp \ - guichan/include/guichan/basiccontainer.hpp \ - guichan/include/guichan/cliprectangle.hpp \ - guichan/include/guichan/color.hpp \ - guichan/include/guichan/deathlistener.hpp \ - guichan/include/guichan/event.hpp \ - guichan/include/guichan/exception.hpp \ - guichan/include/guichan/focushandler.hpp \ - guichan/include/guichan/focuslistener.hpp \ - guichan/include/guichan/font.hpp \ - guichan/include/guichan/graphics.hpp \ - guichan/include/guichan/gui.hpp \ - guichan/include/guichan/image.hpp \ - guichan/include/guichan/input.hpp \ - guichan/include/guichan/inputevent.hpp \ - guichan/include/guichan/key.hpp \ - guichan/include/guichan/keyevent.hpp \ - guichan/include/guichan/keyinput.hpp \ - guichan/include/guichan/keylistener.hpp \ - guichan/include/guichan/listmodel.hpp \ - guichan/include/guichan/mouseevent.hpp \ - guichan/include/guichan/mouseinput.hpp \ - guichan/include/guichan/mouselistener.hpp \ - guichan/include/guichan/rectangle.hpp \ - guichan/include/guichan/selectionevent.hpp \ - guichan/include/guichan/selectionlistener.hpp \ - guichan/include/guichan/sdl/sdlpixel.hpp \ - guichan/include/guichan/widget.hpp \ - guichan/include/guichan/widgetlistener.hpp \ - guichan/include/guichan/widgets/button.hpp \ - guichan/include/guichan/widgets/checkbox.hpp \ - guichan/include/guichan/widgets/container.hpp \ - guichan/include/guichan/widgets/label.hpp \ - guichan/include/guichan/widgets/listbox.hpp \ - guichan/include/guichan/widgets/radiobutton.hpp \ - guichan/include/guichan/widgets/scrollarea.hpp \ - guichan/include/guichan/widgets/slider.hpp \ - guichan/include/guichan/widgets/textbox.hpp \ - guichan/include/guichan/widgets/textfield.hpp \ - guichan/include/guichan/widgets/window.hpp - -manaplus_SOURCES += guichan/actionevent.cpp \ - guichan/basiccontainer.cpp \ - guichan/cliprectangle.cpp \ - guichan/color.cpp \ - guichan/event.cpp \ - guichan/exception.cpp \ - guichan/focushandler.cpp \ - guichan/font.cpp \ - guichan/graphics.cpp \ - guichan/gui.cpp \ - guichan/image.cpp \ - guichan/inputevent.cpp \ - guichan/key.cpp \ - guichan/keyevent.cpp \ - guichan/keyinput.cpp \ - guichan/mouseevent.cpp \ - guichan/mouseinput.cpp \ - guichan/rectangle.cpp \ - guichan/selectionevent.cpp \ - guichan/widget.cpp \ - guichan/widgets/button.cpp \ - guichan/widgets/checkbox.cpp \ - guichan/widgets/container.cpp \ - guichan/widgets/label.cpp \ - guichan/widgets/listbox.cpp \ - guichan/widgets/radiobutton.cpp \ - guichan/widgets/scrollarea.cpp \ - guichan/widgets/slider.cpp \ - guichan/widgets/textbox.cpp \ - guichan/widgets/textfield.cpp \ - guichan/widgets/window.cpp +manaplus_SOURCES += gui/base/actionevent.hpp \ + gui/base/actionlistener.hpp \ + gui/base/basiccontainer.hpp \ + gui/base/cliprectangle.hpp \ + gui/base/color.hpp \ + gui/base/deathlistener.hpp \ + gui/base/event.hpp \ + gui/base/exception.hpp \ + gui/base/focushandler.hpp \ + gui/base/focuslistener.hpp \ + gui/base/font.hpp \ + gui/base/graphics.hpp \ + gui/base/gui.hpp \ + gui/base/image.hpp \ + gui/base/input.hpp \ + gui/base/inputevent.hpp \ + gui/base/key.hpp \ + gui/base/keyevent.hpp \ + gui/base/keyinput.hpp \ + gui/base/keylistener.hpp \ + gui/base/listmodel.hpp \ + gui/base/mouseevent.hpp \ + gui/base/mouseinput.hpp \ + gui/base/mouselistener.hpp \ + gui/base/rectangle.hpp \ + gui/base/selectionevent.hpp \ + gui/base/selectionlistener.hpp \ + gui/base/sdl/sdlpixel.hpp \ + gui/base/widget.hpp \ + gui/base/widgetlistener.hpp \ + gui/base/widgets/button.hpp \ + gui/base/widgets/checkbox.hpp \ + gui/base/widgets/container.hpp \ + gui/base/widgets/label.hpp \ + gui/base/widgets/listbox.hpp \ + gui/base/widgets/radiobutton.hpp \ + gui/base/widgets/scrollarea.hpp \ + gui/base/widgets/slider.hpp \ + gui/base/widgets/textbox.hpp \ + gui/base/widgets/textfield.hpp \ + gui/base/widgets/window.hpp \ + gui/base/actionevent.cpp \ + gui/base/basiccontainer.cpp \ + gui/base/cliprectangle.cpp \ + gui/base/color.cpp \ + gui/base/event.cpp \ + gui/base/exception.cpp \ + gui/base/focushandler.cpp \ + gui/base/font.cpp \ + gui/base/graphics.cpp \ + gui/base/gui.cpp \ + gui/base/image.cpp \ + gui/base/inputevent.cpp \ + gui/base/key.cpp \ + gui/base/keyevent.cpp \ + gui/base/keyinput.cpp \ + gui/base/mouseevent.cpp \ + gui/base/mouseinput.cpp \ + gui/base/rectangle.cpp \ + gui/base/selectionevent.cpp \ + gui/base/widget.cpp \ + gui/base/widgets/button.cpp \ + gui/base/widgets/checkbox.cpp \ + gui/base/widgets/container.cpp \ + gui/base/widgets/label.cpp \ + gui/base/widgets/listbox.cpp \ + gui/base/widgets/radiobutton.cpp \ + gui/base/widgets/scrollarea.cpp \ + gui/base/widgets/slider.cpp \ + gui/base/widgets/textbox.cpp \ + gui/base/widgets/textfield.cpp \ + gui/base/widgets/window.cpp manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/avatarlistbox.h \ diff --git a/src/being/being.h b/src/being/being.h index b9039bce3..c8da2d97c 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -27,7 +27,7 @@ #include "resources/beinginfo.h" -#include <guichan/color.hpp> +#include "gui/base/color.hpp" #include <map> diff --git a/src/being/localplayer.h b/src/being/localplayer.h index 6ba12bd56..1bbf7dcc8 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -30,7 +30,7 @@ #include "gui/userpalette.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <vector> diff --git a/src/client.h b/src/client.h index 22567ae94..c26e91eae 100644 --- a/src/client.h +++ b/src/client.h @@ -27,7 +27,7 @@ #include "net/serverinfo.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <SDL.h> diff --git a/src/guichan/actionevent.cpp b/src/gui/base/actionevent.cpp index 2a31bfc8b..7fcc1ee84 100644 --- a/src/guichan/actionevent.cpp +++ b/src/gui/base/actionevent.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/actionevent.hpp" +#include "gui/base/actionevent.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/actionevent.hpp b/src/gui/base/actionevent.hpp index b0f75a039..621499864 100644 --- a/src/guichan/include/guichan/actionevent.hpp +++ b/src/gui/base/actionevent.hpp @@ -64,7 +64,7 @@ #ifndef GCN_ACTIONEVENT_HPP #define GCN_ACTIONEVENT_HPP -#include "guichan/event.hpp" +#include "gui/base/event.hpp" #include <string> diff --git a/src/guichan/include/guichan/actionlistener.hpp b/src/gui/base/actionlistener.hpp index 0f017873b..8a40fbb8c 100644 --- a/src/guichan/include/guichan/actionlistener.hpp +++ b/src/gui/base/actionlistener.hpp @@ -66,7 +66,7 @@ #include <string> -#include "guichan/actionevent.hpp" +#include "gui/base/actionevent.hpp" namespace gcn { diff --git a/src/guichan/basiccontainer.cpp b/src/gui/base/basiccontainer.cpp index 239a8544e..45bb1e231 100644 --- a/src/guichan/basiccontainer.cpp +++ b/src/gui/base/basiccontainer.cpp @@ -65,14 +65,14 @@ * For comments regarding functions please see the header file. */ -#include "guichan/basiccontainer.hpp" +#include "gui/base/basiccontainer.hpp" #include <algorithm> -#include "guichan/exception.hpp" -#include "guichan/focushandler.hpp" -#include "guichan/graphics.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/focushandler.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/gui/base/basiccontainer.hpp index a3fb18528..d6dd38b63 100644 --- a/src/guichan/include/guichan/basiccontainer.hpp +++ b/src/gui/base/basiccontainer.hpp @@ -67,8 +67,8 @@ #include <list> #include <vector> -#include "guichan/deathlistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/deathlistener.hpp" +#include "gui/base/widget.hpp" namespace gcn { diff --git a/src/guichan/cliprectangle.cpp b/src/gui/base/cliprectangle.cpp index c09990087..f52bc384a 100644 --- a/src/guichan/cliprectangle.cpp +++ b/src/gui/base/cliprectangle.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/cliprectangle.hpp" +#include "gui/base/cliprectangle.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/cliprectangle.hpp b/src/gui/base/cliprectangle.hpp index 148a73d5a..1fdbfbe8d 100644 --- a/src/guichan/include/guichan/cliprectangle.hpp +++ b/src/gui/base/cliprectangle.hpp @@ -64,7 +64,7 @@ #ifndef GCN_CLIPRECTANGLE_HPP #define GCN_CLIPRECTANGLE_HPP -#include "guichan/rectangle.hpp" +#include "gui/base/rectangle.hpp" #include "localconsts.h" diff --git a/src/guichan/color.cpp b/src/gui/base/color.cpp index 27612876f..764259efc 100644 --- a/src/guichan/color.cpp +++ b/src/gui/base/color.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/color.hpp" +#include "gui/base/color.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/color.hpp b/src/gui/base/color.hpp index c32adb2e9..c32adb2e9 100644 --- a/src/guichan/include/guichan/color.hpp +++ b/src/gui/base/color.hpp diff --git a/src/guichan/include/guichan/deathlistener.hpp b/src/gui/base/deathlistener.hpp index cc8d11990..b325166c2 100644 --- a/src/guichan/include/guichan/deathlistener.hpp +++ b/src/gui/base/deathlistener.hpp @@ -66,7 +66,7 @@ #include <string> -#include "guichan/event.hpp" +#include "gui/base/event.hpp" namespace gcn { diff --git a/src/guichan/event.cpp b/src/gui/base/event.cpp index f4a03bc19..359b780bf 100644 --- a/src/guichan/event.cpp +++ b/src/gui/base/event.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/event.hpp" +#include "gui/base/event.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/event.hpp b/src/gui/base/event.hpp index 2a1f4ca4b..2a1f4ca4b 100644 --- a/src/guichan/include/guichan/event.hpp +++ b/src/gui/base/event.hpp diff --git a/src/guichan/exception.cpp b/src/gui/base/exception.cpp index b02df93eb..998db928d 100644 --- a/src/guichan/exception.cpp +++ b/src/gui/base/exception.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/exception.hpp" +#include "gui/base/exception.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/exception.hpp b/src/gui/base/exception.hpp index a60152c96..a60152c96 100644 --- a/src/guichan/include/guichan/exception.hpp +++ b/src/gui/base/exception.hpp diff --git a/src/guichan/focushandler.cpp b/src/gui/base/focushandler.cpp index 3249703a3..6984d1fcd 100644 --- a/src/guichan/focushandler.cpp +++ b/src/gui/base/focushandler.cpp @@ -65,11 +65,11 @@ * For comments regarding functions please see the header file. */ -#include "guichan/focushandler.hpp" +#include "gui/base/focushandler.hpp" -#include "guichan/focuslistener.hpp" -#include "guichan/exception.hpp" -#include "guichan/widget.hpp" +#include "gui/base/focuslistener.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/widget.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/gui/base/focushandler.hpp index 6cd326d33..aab3f2464 100644 --- a/src/guichan/include/guichan/focushandler.hpp +++ b/src/gui/base/focushandler.hpp @@ -66,7 +66,7 @@ #include <vector> -#include "guichan/event.hpp" +#include "gui/base/event.hpp" namespace gcn { diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/gui/base/focuslistener.hpp index 6b3de5c83..f6a7da5ea 100644 --- a/src/guichan/include/guichan/focuslistener.hpp +++ b/src/gui/base/focuslistener.hpp @@ -66,7 +66,7 @@ #include <string> -#include "guichan/event.hpp" +#include "gui/base/event.hpp" #include "localconsts.h" diff --git a/src/guichan/font.cpp b/src/gui/base/font.cpp index 982e1ac8c..ccb2f7022 100644 --- a/src/guichan/font.cpp +++ b/src/gui/base/font.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/font.hpp" +#include "gui/base/font.hpp" #include <string> diff --git a/src/guichan/include/guichan/font.hpp b/src/gui/base/font.hpp index 8e8ad18c9..8e8ad18c9 100644 --- a/src/guichan/include/guichan/font.hpp +++ b/src/gui/base/font.hpp diff --git a/src/guichan/graphics.cpp b/src/gui/base/graphics.cpp index b63c4b58c..229543bc9 100644 --- a/src/guichan/graphics.cpp +++ b/src/gui/base/graphics.cpp @@ -65,11 +65,11 @@ * For comments regarding functions please see the header file. */ -#include "guichan/graphics.hpp" +#include "gui/base/graphics.hpp" -#include "guichan/exception.hpp" -#include "guichan/font.hpp" -#include "guichan/image.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/font.hpp" +#include "gui/base/image.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/graphics.hpp b/src/gui/base/graphics.hpp index dd15827fd..d3128c8ae 100644 --- a/src/guichan/include/guichan/graphics.hpp +++ b/src/gui/base/graphics.hpp @@ -67,7 +67,7 @@ #include <iosfwd> #include <stack> -#include "guichan/cliprectangle.hpp" +#include "gui/base/cliprectangle.hpp" namespace gcn { diff --git a/src/guichan/gui.cpp b/src/gui/base/gui.cpp index fa50812de..e4827f716 100644 --- a/src/guichan/gui.cpp +++ b/src/gui/base/gui.cpp @@ -65,18 +65,18 @@ * For comments regarding functions please see the header file. */ -#include "guichan/gui.hpp" - -#include "guichan/basiccontainer.hpp" -#include "guichan/exception.hpp" -#include "guichan/focushandler.hpp" -#include "guichan/graphics.hpp" -#include "guichan/input.hpp" -#include "guichan/keyinput.hpp" -#include "guichan/keylistener.hpp" -#include "guichan/mouseinput.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/gui.hpp" + +#include "gui/base/basiccontainer.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/focushandler.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/input.hpp" +#include "gui/base/keyinput.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouseinput.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/gui.hpp b/src/gui/base/gui.hpp index 5aca51f4e..b1daba0fc 100644 --- a/src/guichan/include/guichan/gui.hpp +++ b/src/gui/base/gui.hpp @@ -67,9 +67,9 @@ #include <list> #include <deque> -#include "guichan/keyevent.hpp" -#include "guichan/mouseevent.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/keyevent.hpp" +#include "gui/base/mouseevent.hpp" +#include "gui/base/mouseinput.hpp" namespace gcn { diff --git a/src/guichan/image.cpp b/src/gui/base/image.cpp index d60df27a7..01e30dc20 100644 --- a/src/guichan/image.cpp +++ b/src/gui/base/image.cpp @@ -65,9 +65,9 @@ * For comments regarding functions please see the header file. */ -#include "guichan/image.hpp" +#include "gui/base/image.hpp" -#include "guichan/exception.hpp" +#include "gui/base/exception.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/image.hpp b/src/gui/base/image.hpp index c39fe21ab..c39fe21ab 100644 --- a/src/guichan/include/guichan/image.hpp +++ b/src/gui/base/image.hpp diff --git a/src/guichan/include/guichan/input.hpp b/src/gui/base/input.hpp index 71a15ce85..71a15ce85 100644 --- a/src/guichan/include/guichan/input.hpp +++ b/src/gui/base/input.hpp diff --git a/src/guichan/inputevent.cpp b/src/gui/base/inputevent.cpp index ac7eea5bd..3251a102f 100644 --- a/src/guichan/inputevent.cpp +++ b/src/gui/base/inputevent.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/inputevent.hpp" +#include "gui/base/inputevent.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/inputevent.hpp b/src/gui/base/inputevent.hpp index 30b46676d..166edf038 100644 --- a/src/guichan/include/guichan/inputevent.hpp +++ b/src/gui/base/inputevent.hpp @@ -64,7 +64,7 @@ #ifndef GCN_INPUTEVENT_HPP #define GCN_INPUTEVENT_HPP -#include "guichan/event.hpp" +#include "gui/base/event.hpp" namespace gcn { diff --git a/src/guichan/key.cpp b/src/gui/base/key.cpp index 24d817fdb..8cf21bdfe 100644 --- a/src/guichan/key.cpp +++ b/src/gui/base/key.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/key.hpp" +#include "gui/base/key.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/key.hpp b/src/gui/base/key.hpp index 46b36a179..46b36a179 100644 --- a/src/guichan/include/guichan/key.hpp +++ b/src/gui/base/key.hpp diff --git a/src/guichan/keyevent.cpp b/src/gui/base/keyevent.cpp index 1f325ef1d..35c4f06a5 100644 --- a/src/guichan/keyevent.cpp +++ b/src/gui/base/keyevent.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/keyevent.hpp" +#include "gui/base/keyevent.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/keyevent.hpp b/src/gui/base/keyevent.hpp index b3a91f640..4f2fa05a3 100644 --- a/src/guichan/include/guichan/keyevent.hpp +++ b/src/gui/base/keyevent.hpp @@ -64,8 +64,8 @@ #ifndef GCN_KEYEVENT_HPP #define GCN_KEYEVENT_HPP -#include "guichan/inputevent.hpp" -#include "guichan/key.hpp" +#include "gui/base/inputevent.hpp" +#include "gui/base/key.hpp" namespace gcn { diff --git a/src/guichan/keyinput.cpp b/src/gui/base/keyinput.cpp index a18113c8d..8b7ff3c8a 100644 --- a/src/guichan/keyinput.cpp +++ b/src/gui/base/keyinput.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/keyinput.hpp" +#include "gui/base/keyinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/keyinput.hpp b/src/gui/base/keyinput.hpp index 421165d1c..422d9046c 100644 --- a/src/guichan/include/guichan/keyinput.hpp +++ b/src/gui/base/keyinput.hpp @@ -64,7 +64,7 @@ #ifndef GCN_KEYINPUT_HPP #define GCN_KEYINPUT_HPP -#include "guichan/key.hpp" +#include "gui/base/key.hpp" namespace gcn { diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/gui/base/keylistener.hpp index bb676052d..088a937a6 100644 --- a/src/guichan/include/guichan/keylistener.hpp +++ b/src/gui/base/keylistener.hpp @@ -64,7 +64,7 @@ #ifndef GCN_KEYLISTENER_HPP #define GCN_KEYLISTENER_HPP -#include "guichan/keyevent.hpp" +#include "gui/base/keyevent.hpp" #include "localconsts.h" diff --git a/src/guichan/include/guichan/listmodel.hpp b/src/gui/base/listmodel.hpp index 4b98f46fe..4b98f46fe 100644 --- a/src/guichan/include/guichan/listmodel.hpp +++ b/src/gui/base/listmodel.hpp diff --git a/src/guichan/mouseevent.cpp b/src/gui/base/mouseevent.cpp index c24be1252..653974a83 100644 --- a/src/guichan/mouseevent.cpp +++ b/src/gui/base/mouseevent.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/mouseevent.hpp" +#include "gui/base/mouseevent.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/mouseevent.hpp b/src/gui/base/mouseevent.hpp index 57af098ab..93c1fc0a7 100644 --- a/src/guichan/include/guichan/mouseevent.hpp +++ b/src/gui/base/mouseevent.hpp @@ -64,7 +64,7 @@ #ifndef GCN_MOUSEEVENT_HPP #define GCN_MOUSEEVENT_HPP -#include "guichan/inputevent.hpp" +#include "gui/base/inputevent.hpp" namespace gcn { diff --git a/src/guichan/mouseinput.cpp b/src/gui/base/mouseinput.cpp index b13708bb7..bc5d6c8e0 100644 --- a/src/guichan/mouseinput.cpp +++ b/src/gui/base/mouseinput.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/mouseinput.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/mouseinput.hpp b/src/gui/base/mouseinput.hpp index 018205740..018205740 100644 --- a/src/guichan/include/guichan/mouseinput.hpp +++ b/src/gui/base/mouseinput.hpp diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/gui/base/mouselistener.hpp index a024d202f..32486e56f 100644 --- a/src/guichan/include/guichan/mouselistener.hpp +++ b/src/gui/base/mouselistener.hpp @@ -64,7 +64,7 @@ #ifndef GCN_MOUSELISTENER_HPP #define GCN_MOUSELISTENER_HPP -#include "guichan/mouseevent.hpp" +#include "gui/base/mouseevent.hpp" #include "localconsts.h" diff --git a/src/guichan/rectangle.cpp b/src/gui/base/rectangle.cpp index 3aca53a0a..a29069b18 100644 --- a/src/guichan/rectangle.cpp +++ b/src/gui/base/rectangle.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/rectangle.hpp" +#include "gui/base/rectangle.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/rectangle.hpp b/src/gui/base/rectangle.hpp index b8503db98..b8503db98 100644 --- a/src/guichan/include/guichan/rectangle.hpp +++ b/src/gui/base/rectangle.hpp diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/gui/base/sdl/sdlpixel.hpp index 99818d42e..06a22f65f 100644 --- a/src/guichan/include/guichan/sdl/sdlpixel.hpp +++ b/src/gui/base/sdl/sdlpixel.hpp @@ -65,7 +65,7 @@ #define GCN_SDLPIXEL_HPP #include "SDL.h" -#include "guichan/color.hpp" +#include "gui/base/color.hpp" namespace gcn { diff --git a/src/guichan/selectionevent.cpp b/src/gui/base/selectionevent.cpp index 2606d84ef..04318be06 100644 --- a/src/guichan/selectionevent.cpp +++ b/src/gui/base/selectionevent.cpp @@ -65,7 +65,7 @@ * For comments regarding functions please see the header file. */ -#include "guichan/selectionevent.hpp" +#include "gui/base/selectionevent.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/selectionevent.hpp b/src/gui/base/selectionevent.hpp index a4a3da0b3..543b3a9ad 100644 --- a/src/guichan/include/guichan/selectionevent.hpp +++ b/src/gui/base/selectionevent.hpp @@ -64,7 +64,7 @@ #ifndef GCN_SELECTIONEVENT_HPP #define GCN_SELECTIONEVENT_HPP -#include "guichan/event.hpp" +#include "gui/base/event.hpp" #include "localconsts.h" diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/gui/base/selectionlistener.hpp index 0d7f63bd8..b1a4d73ba 100644 --- a/src/guichan/include/guichan/selectionlistener.hpp +++ b/src/gui/base/selectionlistener.hpp @@ -66,7 +66,7 @@ #include <string> -#include "guichan/selectionevent.hpp" +#include "gui/base/selectionevent.hpp" #include "localconsts.h" diff --git a/src/guichan/widget.cpp b/src/gui/base/widget.cpp index 0cd7883d7..2e8719446 100644 --- a/src/guichan/widget.cpp +++ b/src/gui/base/widget.cpp @@ -65,21 +65,21 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widget.hpp" - -#include "guichan/actionevent.hpp" -#include "guichan/actionlistener.hpp" -#include "guichan/basiccontainer.hpp" -#include "guichan/deathlistener.hpp" -#include "guichan/event.hpp" -#include "guichan/exception.hpp" -#include "guichan/focushandler.hpp" -#include "guichan/graphics.hpp" -#include "guichan/keyinput.hpp" -#include "guichan/keylistener.hpp" -#include "guichan/mouseinput.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widgetlistener.hpp" +#include "gui/base/widget.hpp" + +#include "gui/base/actionevent.hpp" +#include "gui/base/actionlistener.hpp" +#include "gui/base/basiccontainer.hpp" +#include "gui/base/deathlistener.hpp" +#include "gui/base/event.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/focushandler.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/keyinput.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouseinput.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widgetlistener.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widget.hpp b/src/gui/base/widget.hpp index fe02d3b14..fe02d3b14 100644 --- a/src/guichan/include/guichan/widget.hpp +++ b/src/gui/base/widget.hpp diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/gui/base/widgetlistener.hpp index eb584b0ed..3dd74bb4d 100644 --- a/src/guichan/include/guichan/widgetlistener.hpp +++ b/src/gui/base/widgetlistener.hpp @@ -66,7 +66,7 @@ #include <string> -#include "guichan/event.hpp" +#include "gui/base/event.hpp" #include "localconsts.h" diff --git a/src/guichan/widgets/button.cpp b/src/gui/base/widgets/button.cpp index 1226e157a..a52bf2d78 100644 --- a/src/guichan/widgets/button.cpp +++ b/src/gui/base/widgets/button.cpp @@ -65,14 +65,14 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/button.hpp" - -#include "guichan/exception.hpp" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" -#include "guichan/mouseevent.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/widgets/button.hpp" + +#include "gui/base/exception.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/key.hpp" +#include "gui/base/mouseevent.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/gui/base/widgets/button.hpp index 91c526d4f..4ae08eb16 100644 --- a/src/guichan/include/guichan/widgets/button.hpp +++ b/src/gui/base/widgets/button.hpp @@ -66,12 +66,12 @@ #include <string> -#include "guichan/focuslistener.hpp" -#include "guichan/graphics.hpp" -#include "guichan/keylistener.hpp" -#include "guichan/mouseevent.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/focuslistener.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouseevent.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" namespace gcn { diff --git a/src/guichan/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp index 4b3c7b966..908b4f509 100644 --- a/src/guichan/widgets/checkbox.cpp +++ b/src/gui/base/widgets/checkbox.cpp @@ -65,12 +65,12 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/checkbox.hpp" +#include "gui/base/widgets/checkbox.hpp" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/key.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/gui/base/widgets/checkbox.hpp index 465de566d..c9b723879 100644 --- a/src/guichan/include/guichan/widgets/checkbox.hpp +++ b/src/gui/base/widgets/checkbox.hpp @@ -66,9 +66,9 @@ #include <string> -#include "guichan/keylistener.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" namespace gcn { diff --git a/src/guichan/widgets/container.cpp b/src/gui/base/widgets/container.cpp index 7ea07e529..1e6de018b 100644 --- a/src/guichan/widgets/container.cpp +++ b/src/gui/base/widgets/container.cpp @@ -65,10 +65,10 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/container.hpp" +#include "gui/base/widgets/container.hpp" -#include "guichan/exception.hpp" -#include "guichan/graphics.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/graphics.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/container.hpp b/src/gui/base/widgets/container.hpp index b6efbf361..a5cbdb31b 100644 --- a/src/guichan/include/guichan/widgets/container.hpp +++ b/src/gui/base/widgets/container.hpp @@ -66,8 +66,8 @@ #include <list> -#include "guichan/basiccontainer.hpp" -#include "guichan/graphics.hpp" +#include "gui/base/basiccontainer.hpp" +#include "gui/base/graphics.hpp" namespace gcn { diff --git a/src/guichan/widgets/label.cpp b/src/gui/base/widgets/label.cpp index 92962e907..42fcd78f4 100644 --- a/src/guichan/widgets/label.cpp +++ b/src/gui/base/widgets/label.cpp @@ -65,11 +65,11 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/label.hpp" +#include "gui/base/widgets/label.hpp" -#include "guichan/exception.hpp" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/label.hpp b/src/gui/base/widgets/label.hpp index a8c2ae7ea..f1ef30b89 100644 --- a/src/guichan/include/guichan/widgets/label.hpp +++ b/src/gui/base/widgets/label.hpp @@ -66,8 +66,8 @@ #include <string> -#include "guichan/graphics.hpp" -#include "guichan/widget.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/widget.hpp" namespace gcn { diff --git a/src/guichan/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp index 9122e8cc8..b97bf47d4 100644 --- a/src/guichan/widgets/listbox.cpp +++ b/src/gui/base/widgets/listbox.cpp @@ -65,15 +65,15 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/listbox.hpp" - -#include "guichan/basiccontainer.hpp" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" -#include "guichan/listmodel.hpp" -#include "guichan/mouseinput.hpp" -#include "guichan/selectionlistener.hpp" +#include "gui/base/widgets/listbox.hpp" + +#include "gui/base/basiccontainer.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/key.hpp" +#include "gui/base/listmodel.hpp" +#include "gui/base/mouseinput.hpp" +#include "gui/base/selectionlistener.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/gui/base/widgets/listbox.hpp index d28664455..f2780f130 100644 --- a/src/guichan/include/guichan/widgets/listbox.hpp +++ b/src/gui/base/widgets/listbox.hpp @@ -66,10 +66,10 @@ #include <list> -#include "guichan/keylistener.hpp" -#include "guichan/listmodel.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/listmodel.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" namespace gcn { diff --git a/src/guichan/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp index 26ce731ed..bfd5b1ff8 100644 --- a/src/guichan/widgets/radiobutton.cpp +++ b/src/gui/base/widgets/radiobutton.cpp @@ -65,12 +65,12 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/radiobutton.hpp" +#include "gui/base/widgets/radiobutton.hpp" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/key.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/gui/base/widgets/radiobutton.hpp index 2a93a82ee..07e3d656a 100644 --- a/src/guichan/include/guichan/widgets/radiobutton.hpp +++ b/src/gui/base/widgets/radiobutton.hpp @@ -67,9 +67,9 @@ #include <map> #include <string> -#include "guichan/keylistener.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" namespace gcn { diff --git a/src/guichan/widgets/scrollarea.cpp b/src/gui/base/widgets/scrollarea.cpp index ddc4405e2..e3dcfc61c 100644 --- a/src/guichan/widgets/scrollarea.cpp +++ b/src/gui/base/widgets/scrollarea.cpp @@ -65,10 +65,10 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/scrollarea.hpp" +#include "gui/base/widgets/scrollarea.hpp" -#include "guichan/exception.hpp" -#include "guichan/graphics.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/graphics.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/gui/base/widgets/scrollarea.hpp index 30fa64abc..e75390ec0 100644 --- a/src/guichan/include/guichan/widgets/scrollarea.hpp +++ b/src/gui/base/widgets/scrollarea.hpp @@ -66,8 +66,8 @@ #include <string> -#include "guichan/basiccontainer.hpp" -#include "guichan/mouselistener.hpp" +#include "gui/base/basiccontainer.hpp" +#include "gui/base/mouselistener.hpp" namespace gcn { diff --git a/src/guichan/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp index 849101fd8..a1a106303 100644 --- a/src/guichan/widgets/slider.cpp +++ b/src/gui/base/widgets/slider.cpp @@ -65,11 +65,11 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/slider.hpp" +#include "gui/base/widgets/slider.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/key.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/gui/base/widgets/slider.hpp index 04f774b21..32cdfefb9 100644 --- a/src/guichan/include/guichan/widgets/slider.hpp +++ b/src/gui/base/widgets/slider.hpp @@ -64,9 +64,9 @@ #ifndef GCN_SLIDER_HPP #define GCN_SLIDER_HPP -#include "guichan/keylistener.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" namespace gcn { diff --git a/src/guichan/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp index e3bfd39f5..2e9ca0563 100644 --- a/src/guichan/widgets/textbox.cpp +++ b/src/gui/base/widgets/textbox.cpp @@ -65,13 +65,13 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/textbox.hpp" +#include "gui/base/widgets/textbox.hpp" -#include "guichan/basiccontainer.hpp" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/basiccontainer.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/key.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/gui/base/widgets/textbox.hpp index a75b52115..0a540a2c1 100644 --- a/src/guichan/include/guichan/widgets/textbox.hpp +++ b/src/gui/base/widgets/textbox.hpp @@ -68,9 +68,9 @@ #include <string> #include <vector> -#include "guichan/keylistener.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" namespace gcn { diff --git a/src/guichan/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp index 1e4309266..586e49663 100644 --- a/src/guichan/widgets/textfield.cpp +++ b/src/gui/base/widgets/textfield.cpp @@ -65,12 +65,12 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/textfield.hpp" +#include "gui/base/widgets/textfield.hpp" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/key.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/gui/base/widgets/textfield.hpp index b1293045f..bc227eb55 100644 --- a/src/guichan/include/guichan/widgets/textfield.hpp +++ b/src/gui/base/widgets/textfield.hpp @@ -64,9 +64,9 @@ #ifndef GCN_TEXTFIELD_HPP #define GCN_TEXTFIELD_HPP -#include "guichan/keylistener.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" #include <string> diff --git a/src/guichan/widgets/window.cpp b/src/gui/base/widgets/window.cpp index 8865444e0..c7a108ab8 100644 --- a/src/guichan/widgets/window.cpp +++ b/src/gui/base/widgets/window.cpp @@ -65,12 +65,12 @@ * For comments regarding functions please see the header file. */ -#include "guichan/widgets/window.hpp" +#include "gui/base/widgets/window.hpp" -#include "guichan/exception.hpp" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" -#include "guichan/mouseinput.hpp" +#include "gui/base/exception.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/gui/base/widgets/window.hpp index bf5dd2e7c..9c7e6bcbf 100644 --- a/src/guichan/include/guichan/widgets/window.hpp +++ b/src/gui/base/widgets/window.hpp @@ -66,8 +66,8 @@ #include <string> -#include "guichan/mouselistener.hpp" -#include "guichan/widgets/container.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widgets/container.hpp" namespace gcn { diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index e32b9afa1..b051fe300 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -23,7 +23,7 @@ #ifndef GUI_FOCUSHANDLER_H #define GUI_FOCUSHANDLER_H -#include <guichan/focushandler.hpp> +#include "gui/base/focushandler.hpp" #include <list> diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 126fc9a3b..00a3da25e 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -51,7 +51,7 @@ #include "utils/langs.h" #include "utils/timer.h" -#include <guichan/exception.hpp> +#include "gui/base/exception.hpp" #include "debug.h" diff --git a/src/gui/gui.h b/src/gui/gui.h index 5fddc7df7..4737c62fb 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -23,9 +23,9 @@ #ifndef GUI_GUI_H #define GUI_GUI_H -#include <guichan/color.hpp> -#include <guichan/focuslistener.hpp> -#include <guichan/gui.hpp> +#include "gui/base/color.hpp" +#include "gui/base/focuslistener.hpp" +#include "gui/base/gui.hpp" #include "localconsts.h" diff --git a/src/gui/palette.h b/src/gui/palette.h index 26ea6817c..1377822ca 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -26,7 +26,7 @@ #include "logger.h" -#include <guichan/color.hpp> +#include "gui/base/color.hpp" #if defined __native_client__ #include <stdlib.h> diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 6d3077130..623b19d00 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -31,7 +31,7 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 1fd496dec..07c950706 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -38,7 +38,7 @@ #include "resources/image.h" #include "resources/resourcemanager.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 52cf1d5d6..4d12e835e 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -79,7 +79,7 @@ #include "utils/gettext.h" #include "utils/process.h" -#include <guichan/listmodel.hpp> +#include "gui/base/listmodel.hpp" #include "debug.h" diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index 0970f34b6..498132ded 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -28,8 +28,8 @@ #include "being/actorsprite.h" -#include <guichan/actionlistener.hpp> -#include <guichan/listmodel.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/listmodel.hpp" #include "localconsts.h" diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp index e32a6bb4d..dd8f9ada9 100644 --- a/src/gui/popups/speechbubble.cpp +++ b/src/gui/popups/speechbubble.cpp @@ -30,7 +30,7 @@ #include "gui/widgets/label.h" #include "gui/widgets/textbox.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index 1d696fe82..2332e20a9 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -33,7 +33,7 @@ #include "utils/stringutils.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp index 9a7f1d3e4..14f31f84f 100644 --- a/src/gui/popups/textpopup.cpp +++ b/src/gui/popups/textpopup.cpp @@ -25,7 +25,7 @@ #include "gui/widgets/label.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index f97970a26..8246cea94 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -39,7 +39,7 @@ #include "utils/stringutils.h" #include "utils/timer.h" -#include <guichan/exception.hpp> +#include "gui/base/exception.hpp" #include "debug.h" diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h index b2638f835..79ee0fbfb 100644 --- a/src/gui/sdlfont.h +++ b/src/gui/sdlfont.h @@ -24,8 +24,8 @@ #ifndef GUI_SDLFONT_H #define GUI_SDLFONT_H -#include <guichan/color.hpp> -#include <guichan/font.hpp> +#include "gui/base/color.hpp" +#include "gui/base/font.hpp" #include <SDL_ttf.h> diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 193a35dfe..c81f11802 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -90,7 +90,7 @@ #include <SDL_keyboard.h> #include <SDL_timer.h> -#include <guichan/exception.hpp> +#include "gui/base/exception.hpp" SDLInput::SDLInput() : mKeyInputQueue(), diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index b07a57a00..345e939c5 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -84,9 +84,9 @@ #include <SDL_events.h> -#include <guichan/input.hpp> -#include <guichan/keyinput.hpp> -#include <guichan/mouseinput.hpp> +#include "gui/base/input.hpp" +#include "gui/base/keyinput.hpp" +#include "gui/base/mouseinput.hpp" #include <queue> diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 18fe1cbe2..fbba415b8 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -26,7 +26,7 @@ #include "gui/palette.h" -#include <guichan/listmodel.hpp> +#include "gui/base/listmodel.hpp" /** * Class controlling the game's color palette. diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 341af1f0b..9982840de 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -42,7 +42,7 @@ #include "gui/windows/ministatuswindow.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/viewport.h b/src/gui/viewport.h index dcddc003c..848a1ae8c 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -28,7 +28,7 @@ #include "gui/widgets/windowcontainer.h" -#include <guichan/mouselistener.hpp> +#include "gui/base/mouselistener.hpp" class ActorSprite; class Button; diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index b676a7e94..4a477b802 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -36,7 +36,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index b91c095b7..d7ce9ab12 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -37,9 +37,9 @@ #include "utils/stringutils.h" #include "utils/timer.h" -#include <guichan/graphics.hpp> -#include <guichan/font.hpp> -#include <guichan/cliprectangle.hpp> +#include "gui/base/graphics.hpp" +#include "gui/base/font.hpp" +#include "gui/base/cliprectangle.hpp" #include <algorithm> diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 09f06bc39..deefd886a 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -26,8 +26,8 @@ #include "gui/widgets/widget2.h" -#include <guichan/mouselistener.hpp> -#include <guichan/widget.hpp> +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" #include <list> #include <vector> diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 0042b07e3..faefd6f6c 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -30,7 +30,7 @@ #include "resources/imageset.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 3dd783e52..aeec63b82 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -25,8 +25,8 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/button.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgets/button.hpp" +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h index eb5ec6dfc..ebb0d46da 100644 --- a/src/gui/widgets/characterdisplay.h +++ b/src/gui/widgets/characterdisplay.h @@ -29,7 +29,7 @@ #include "net/charserverhandler.h" #include "net/net.h" -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h index a7c9d2240..af3722e4b 100644 --- a/src/gui/widgets/characterviewbase.h +++ b/src/gui/widgets/characterviewbase.h @@ -25,7 +25,7 @@ #include "gui/widgets/container.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 47d9f2b57..fa227f5ca 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -29,7 +29,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index 2d4581327..d0864d0d5 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/checkbox.hpp> +#include "gui/base/widgets/checkbox.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/colormodel.h b/src/gui/widgets/colormodel.h index 8b9226159..4d29e24d3 100644 --- a/src/gui/widgets/colormodel.h +++ b/src/gui/widgets/colormodel.h @@ -23,8 +23,8 @@ #include "utils/stringvector.h" -#include <guichan/color.hpp> -#include <guichan/listmodel.hpp> +#include "gui/base/color.hpp" +#include "gui/base/listmodel.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp index 11dd1f07e..9730f7006 100644 --- a/src/gui/widgets/colorpage.cpp +++ b/src/gui/widgets/colorpage.cpp @@ -22,7 +22,7 @@ #include "gui/widgets/colormodel.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h index 8f3933357..a83ec8d48 100644 --- a/src/gui/widgets/container.h +++ b/src/gui/widgets/container.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/container.hpp> +#include "gui/base/widgets/container.hpp" /** * A widget container. diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index b62ae96ef..88034fbbc 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -24,7 +24,7 @@ #include "gui/widgets/container.h" -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 59cdec6fb..3669d3eab 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -32,7 +32,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include <algorithm> diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index ed93dc358..da2eb64f9 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -25,13 +25,13 @@ #include "gui/widgets/widget2.h" -#include <guichan/actionlistener.hpp> -#include <guichan/basiccontainer.hpp> -#include <guichan/focuslistener.hpp> -#include <guichan/keylistener.hpp> -#include <guichan/listmodel.hpp> -#include <guichan/mouselistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/basiccontainer.hpp" +#include "gui/base/focuslistener.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/listmodel.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/selectionlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index 73547b770..857eed024 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -36,7 +36,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h index 132cfb8e9..1603bab5e 100644 --- a/src/gui/widgets/emotepage.h +++ b/src/gui/widgets/emotepage.h @@ -23,9 +23,9 @@ #include "gui/widgets/widget2.h" -#include <guichan/mouselistener.hpp> -#include <guichan/widget.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index d080a6072..8d83ffeae 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -33,7 +33,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index bd3a35964..6aaf85bbe 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -22,9 +22,9 @@ #include "gui/widgets/extendedlistmodel.h" -#include <guichan/font.hpp> -#include <guichan/graphics.hpp> -#include <guichan/listmodel.hpp> +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/listmodel.hpp" #include "debug.h" diff --git a/src/gui/widgets/extendedlistmodel.h b/src/gui/widgets/extendedlistmodel.h index 0299ef7ed..0b9c4d819 100644 --- a/src/gui/widgets/extendedlistmodel.h +++ b/src/gui/widgets/extendedlistmodel.h @@ -23,7 +23,7 @@ #include "resources/image.h" -#include <guichan/listmodel.hpp> +#include "gui/base/listmodel.hpp" class ExtendedListModel : public gcn::ListModel { diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index 81043b450..1967258dd 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -24,7 +24,7 @@ #include "gui/widgets/container.h" -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index ae0dd14c5..9630f5c17 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -29,9 +29,9 @@ #include "utils/dtor.h" -#include <guichan/actionlistener.hpp> -#include <guichan/graphics.hpp> -#include <guichan/key.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/key.hpp" #include "debug.h" diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 5529ce842..e91482078 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -28,9 +28,9 @@ #include "gui/widgets/tablemodel.h" #include "gui/widgets/widget2.h" -#include <guichan/keylistener.hpp> -#include <guichan/mouselistener.hpp> -#include <guichan/widget.hpp> +#include "gui/base/keylistener.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" #include <vector> diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h index be30220e8..517cb6fd9 100644 --- a/src/gui/widgets/horizontcontainer.h +++ b/src/gui/widgets/horizontcontainer.h @@ -24,7 +24,7 @@ #include "gui/widgets/container.h" -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index 1cbd3158c..98cb83b61 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widget.hpp> +#include "gui/base/widget.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 2014d3ffe..0361c54e7 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -46,8 +46,8 @@ #include "resources/image.h" -#include <guichan/font.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/font.hpp" +#include "gui/base/selectionlistener.hpp" #include <algorithm> diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index f4a73af9f..c7ca851d9 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -25,10 +25,10 @@ #include "gui/widgets/widget2.h" -#include <guichan/keylistener.hpp> -#include <guichan/mouselistener.hpp> -#include <guichan/widget.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/keylistener.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" +#include "gui/base/widgetlistener.hpp" #include <list> diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index cb74a658b..c10979bef 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -37,8 +37,8 @@ #include <string> -#include <guichan/actionlistener.hpp> -#include <guichan/mouseinput.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/mouseinput.hpp" #include "debug.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index cdeb83af7..1334afae7 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -45,7 +45,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index 7a16b800c..767830f5d 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -21,7 +21,7 @@ #include "gui/widgets/label.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h index 3546f17b4..2fc2393fb 100644 --- a/src/gui/widgets/label.h +++ b/src/gui/widgets/label.h @@ -24,7 +24,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/label.hpp> +#include "gui/base/widgets/label.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index b03c10c1f..013963bfa 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -25,7 +25,7 @@ #include "localconsts.h" -#include <guichan/widgets/container.hpp> +#include "gui/base/widgets/container.hpp" #include <vector> diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index 4f8ed8708..1a3a3a69f 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -25,7 +25,7 @@ #include "gui/widgets/layout.h" -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgetlistener.hpp" /** * A helper class for adding a layout to a Guichan container widget. The layout diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h index 744ff0b29..f79f1bf50 100644 --- a/src/gui/widgets/linkhandler.h +++ b/src/gui/widgets/linkhandler.h @@ -25,7 +25,7 @@ #include <string> -#include <guichan/mouselistener.hpp> +#include "gui/base/mouselistener.hpp" /** * A simple interface to windows that need to handle links from BrowserBox diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 9a1a074b3..767067801 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -29,10 +29,10 @@ #include "gui/gui.h" -#include <guichan/focushandler.hpp> -#include <guichan/font.hpp> -#include <guichan/graphics.hpp> -#include <guichan/listmodel.hpp> +#include "gui/base/focushandler.hpp" +#include "gui/base/font.hpp" +#include "gui/base/graphics.hpp" +#include "gui/base/listmodel.hpp" #include "debug.h" diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index b1a2f0da5..784193fdf 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/listbox.hpp> +#include "gui/base/widgets/listbox.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h index b7c0cc94c..d98a70130 100644 --- a/src/gui/widgets/mouseevent.h +++ b/src/gui/widgets/mouseevent.h @@ -22,8 +22,8 @@ #ifndef GUI_WIDGETS_MOUSEEVENT_H #define GUI_WIDGETS_MOUSEEVENT_H -#include <guichan/mouseevent.hpp> -#include <guichan/widget.hpp> +#include "gui/base/mouseevent.hpp" +#include "gui/base/widget.hpp" class MouseEvent final : public gcn::MouseEvent { diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h index f70dd2571..5e8b47d23 100644 --- a/src/gui/widgets/namesmodel.h +++ b/src/gui/widgets/namesmodel.h @@ -23,7 +23,7 @@ #include "utils/stringvector.h" -#include <guichan/listmodel.hpp> +#include "gui/base/listmodel.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index 3ebae9be4..b78c8c3f1 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/scrollarea.hpp> +#include "gui/base/widgets/scrollarea.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 1ba4083cd..c0de328e7 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -27,7 +27,7 @@ #include "gui/viewport.h" -#include <guichan/exception.hpp> +#include "gui/base/exception.hpp" #include "debug.h" diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 711ac97b7..7e7001891 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -26,8 +26,8 @@ #include "gui/widgets/container.h" -#include <guichan/mouselistener.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/mouselistener.hpp" +#include "gui/base/widgetlistener.hpp" class ImageCollection; class Skin; diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h index f41b9f631..dfe93c0ae 100644 --- a/src/gui/widgets/popuplist.h +++ b/src/gui/widgets/popuplist.h @@ -23,8 +23,8 @@ #include "gui/widgets/popup.h" -#include <guichan/focuslistener.hpp> -#include <guichan/listmodel.hpp> +#include "gui/base/focuslistener.hpp" +#include "gui/base/listmodel.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 38257e0a8..61ecc9080 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -28,7 +28,7 @@ #include "gui/gui.h" #include "gui/sdlfont.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index eefabe83a..ca32fc165 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -25,8 +25,8 @@ #include "gui/widgets/widget2.h" -#include <guichan/widget.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/widget.hpp" +#include "gui/base/widgetlistener.hpp" #include <string> diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h index 61a72dd67..fc9ab5b5f 100644 --- a/src/gui/widgets/progressindicator.h +++ b/src/gui/widgets/progressindicator.h @@ -24,7 +24,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widget.hpp> +#include "gui/base/widget.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index e0643a8ac..a81afa037 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -29,7 +29,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index f5ff43f4c..dca2d1167 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/radiobutton.hpp> +#include "gui/base/widgets/radiobutton.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h index 1863a348c..0fd1f2605 100644 --- a/src/gui/widgets/radiogroup.h +++ b/src/gui/widgets/radiogroup.h @@ -23,7 +23,7 @@ #include "gui/widgets/widgetgroup.h" -#include <guichan/widget.hpp> +#include "gui/base/widget.hpp" class RadioGroup final : public WidgetGroup { diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index 13e5e3665..58bd73107 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -25,8 +25,8 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/scrollarea.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgets/scrollarea.hpp" +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 2cb7f60d1..4f0ea025d 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -41,7 +41,7 @@ #include "utils/gettext.h" #include "utils/mathutils.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index c72bb39ef..027f91824 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -24,7 +24,7 @@ #include "gui/widgets/button.h" #include "gui/widgets/tabs/setuptabscroll.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <list> #include <vector> diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h index 4803d6fed..54de95cc0 100644 --- a/src/gui/widgets/shopitems.h +++ b/src/gui/widgets/shopitems.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_SHOPITEMS_H #define GUI_WIDGETS_SHOPITEMS_H -#include <guichan/listmodel.hpp> +#include "gui/base/listmodel.hpp" #include <string> #include <vector> diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 58f9ec8eb..4a7fda039 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -35,8 +35,8 @@ #include "resources/image.h" -#include <guichan/font.hpp> -#include <guichan/listmodel.hpp> +#include "gui/base/font.hpp" +#include "gui/base/listmodel.hpp" #include "debug.h" diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 8bd84758d..88e27320a 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -25,9 +25,9 @@ #include "gui/widgets/widget2.h" -#include <guichan/mouselistener.hpp> -#include <guichan/widget.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/mouselistener.hpp" +#include "gui/base/widget.hpp" +#include "gui/base/widgetlistener.hpp" class Image; class ImageCollection; diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index d268b3438..a201f3274 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_SKILLINFO_H #define GUI_WIDGETS_SKILLINFO_H -#include <guichan/color.hpp> +#include "gui/base/color.hpp" #include <vector> #include <map> diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h index 0f77dccfe..b1a682fd9 100644 --- a/src/gui/widgets/skillmodel.h +++ b/src/gui/widgets/skillmodel.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_SKILLMODEL_H #include "gui/widgets/skillinfo.h" -#include <guichan/listmodel.hpp> +#include "gui/base/listmodel.hpp" #include <string> diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index a0f7829ac..d5d4a30fe 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/slider.hpp> +#include "gui/base/widgets/slider.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp index 60d7926d1..4416a00b7 100644 --- a/src/gui/widgets/sliderlist.cpp +++ b/src/gui/widgets/sliderlist.cpp @@ -25,7 +25,7 @@ #include "gui/widgets/button.h" #include "gui/widgets/label.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h index 73f8c6f5c..016a60290 100644 --- a/src/gui/widgets/sliderlist.h +++ b/src/gui/widgets/sliderlist.h @@ -21,9 +21,9 @@ #ifndef GUI_WIDGETS_SLIDERLIST_H #define GUI_WIDGETS_SLIDERLIST_H -#include <guichan/actionlistener.hpp> -#include <guichan/listmodel.hpp> -#include <guichan/mouselistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/listmodel.hpp" +#include "gui/base/mouselistener.hpp" #include "gui/widgets/container.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index bf14f21fe..e59b9fbdb 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -36,7 +36,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 3b0cf1db5..8cb8fd78a 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -29,7 +29,7 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabs/tab.h" -#include <guichan/widgets/container.hpp> +#include "gui/base/widgets/container.hpp" #include "debug.h" diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index d0f97b688..7a023903f 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -25,11 +25,11 @@ #include "gui/widgets/widget2.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> -#include <guichan/mouselistener.hpp> -#include <guichan/widgetlistener.hpp> -#include <guichan/widgets/container.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widgetlistener.hpp" +#include "gui/base/widgets/container.hpp" class Button; class Image; diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp index f244f51f4..7b6b8048e 100644 --- a/src/gui/widgets/tablemodel.cpp +++ b/src/gui/widgets/tablemodel.cpp @@ -24,7 +24,7 @@ #include "utils/dtor.h" -#include <guichan/widget.hpp> +#include "gui/base/widget.hpp" #include "debug.h" diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h index b2f860415..38f0f2687 100644 --- a/src/gui/widgets/tabs/setup_colors.h +++ b/src/gui/widgets/tabs/setup_colors.h @@ -24,7 +24,7 @@ #include "gui/widgets/tabs/setuptab.h" -#include <guichan/selectionlistener.hpp> +#include "gui/base/selectionlistener.hpp" #include <string> diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index 9ce6fd616..b079974d5 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -38,7 +38,7 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabstrip.h" -#include <guichan/listmodel.hpp> +#include "gui/base/listmodel.hpp" #include "debug.h" diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 45ada01df..f35f75413 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -46,7 +46,7 @@ #include "test/testmain.h" -#include <guichan/listmodel.hpp> +#include "gui/base/listmodel.hpp" #include <algorithm> diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h index 22d55c121..25ecfabd6 100644 --- a/src/gui/widgets/tabs/setup_video.h +++ b/src/gui/widgets/tabs/setup_video.h @@ -25,7 +25,7 @@ #include "gui/widgets/tabs/setuptab.h" -#include <guichan/keylistener.hpp> +#include "gui/base/keylistener.hpp" class Button; class CheckBox; diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h index 388b0a988..d8e76f812 100644 --- a/src/gui/widgets/tabs/setuptab.h +++ b/src/gui/widgets/tabs/setuptab.h @@ -25,8 +25,8 @@ #include "gui/widgets/container.h" -#include <guichan/actionlistener.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/widgetlistener.hpp" #include <string> diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index 118b1f0e2..fa9846ab4 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -25,9 +25,9 @@ #include "gui/widgets/widget2.h" -#include <guichan/basiccontainer.hpp> -#include <guichan/mouselistener.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/basiccontainer.hpp" +#include "gui/base/mouselistener.hpp" +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h index 622ccba81..3e954aec5 100644 --- a/src/gui/widgets/tabstrip.h +++ b/src/gui/widgets/tabstrip.h @@ -23,7 +23,7 @@ #include "gui/widgets/widgetgroup.h" -#include <guichan/widget.hpp> +#include "gui/base/widget.hpp" class TabStrip final : public WidgetGroup { diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index f59bc0ceb..3f56ecfcf 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -25,7 +25,7 @@ #include "input/keydata.h" #include "input/keyevent.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include <sstream> diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 501744515..797707716 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgets/textbox.hpp> +#include "gui/base/widgets/textbox.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 269ace775..b655de830 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -39,7 +39,7 @@ #include "utils/copynpaste.h" #include "utils/timer.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #undef DELETE // Win32 compatibility hack diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index abff9cf2a..d8ab2c830 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -25,8 +25,8 @@ #include "gui/widgets/widget2.h" -#include <guichan/focuslistener.hpp> -#include <guichan/widgets/textfield.hpp> +#include "gui/base/focuslistener.hpp" +#include "gui/base/widgets/textfield.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h index eeb6805fb..bfb361a9b 100644 --- a/src/gui/widgets/textpreview.h +++ b/src/gui/widgets/textpreview.h @@ -25,7 +25,7 @@ #include "gui/widgets/widget2.h" -#include <guichan/widget.hpp> +#include "gui/base/widget.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 76f6354dd..d194a00c3 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -24,7 +24,7 @@ #include "gui/widgets/container.h" -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgetlistener.hpp" #include <vector> diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h index 3d63b02f8..897183839 100644 --- a/src/gui/widgets/widgetgroup.h +++ b/src/gui/widgets/widgetgroup.h @@ -23,8 +23,8 @@ #include "gui/widgets/container.h" -#include <guichan/actionlistener.hpp> -#include <guichan/widgetlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/widgetlistener.hpp" #include "localconsts.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index c716445f3..c78582a91 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -37,9 +37,9 @@ #include "resources/cursor.h" #include "resources/image.h" -#include <guichan/exception.hpp> -#include <guichan/focushandler.hpp> -#include <guichan/font.hpp> +#include "gui/base/exception.hpp" +#include "gui/base/focushandler.hpp" +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index bb0f19bb3..29fd589a5 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -27,9 +27,9 @@ #include "gui/widgets/widget2.h" -#include <guichan/widgetlistener.hpp> +#include "gui/base/widgetlistener.hpp" -#include <guichan/widgets/window.hpp> +#include "gui/base/widgets/window.hpp" #include "localconsts.h" diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index 38ee090a7..a87f655d8 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -28,8 +28,8 @@ #include "gui/widgets/container.h" #include "gui/widgets/button.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" #include "localconsts.h" diff --git a/src/gui/windows/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h index d3615957d..e7c9ecbb0 100644 --- a/src/gui/windows/botcheckerwindow.h +++ b/src/gui/windows/botcheckerwindow.h @@ -27,7 +27,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" struct BOTCHK final { diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index e11317cde..594fd0a30 100644 --- a/src/gui/windows/buydialog.h +++ b/src/gui/windows/buydialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" class Button; class DropDown; diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h index 34a716ee1..107730b2d 100644 --- a/src/gui/windows/buyselldialog.h +++ b/src/gui/windows/buyselldialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h index 31ffa7b39..4a13d5e52 100644 --- a/src/gui/windows/changeemaildialog.h +++ b/src/gui/windows/changeemaildialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class LoginData; diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h index ce45e6f47..011229d15 100644 --- a/src/gui/windows/changepassworddialog.h +++ b/src/gui/windows/changepassworddialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class LoginData; diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 0d73bf805..c59b631dc 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -27,8 +27,8 @@ #include "gui/windows/charselectdialog.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" class Label; class PlayerBox; diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 3ac5d664f..df08c9058 100644 --- a/src/gui/windows/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h @@ -29,8 +29,8 @@ #include "net/charserverhandler.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" class Button; class CharacterDisplay; diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 26f665052..a21efbe52 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -68,7 +68,7 @@ #include "resources/resourcemanager.h" -#include <guichan/focushandler.hpp> +#include "gui/base/focushandler.hpp" #include <sstream> diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 3093c52e9..742c79876 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -29,8 +29,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" #include <list> #include <map> diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp index e48427a5b..1ba3ebf65 100644 --- a/src/gui/windows/confirmdialog.cpp +++ b/src/gui/windows/confirmdialog.cpp @@ -29,7 +29,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h index 0b092e234..9d5c9f23b 100644 --- a/src/gui/windows/confirmdialog.h +++ b/src/gui/windows/confirmdialog.h @@ -29,7 +29,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class TextBox; diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h index 2f861bc52..dd3c84e5e 100644 --- a/src/gui/windows/connectiondialog.h +++ b/src/gui/windows/connectiondialog.h @@ -27,7 +27,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" /** * The connection dialog. diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h index 942bcf41c..85bbe8107 100644 --- a/src/gui/windows/didyouknowwindow.h +++ b/src/gui/windows/didyouknowwindow.h @@ -26,7 +26,7 @@ #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class BrowserBox; diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h index fa4a02bf7..9c84558a6 100644 --- a/src/gui/windows/editdialog.h +++ b/src/gui/windows/editdialog.h @@ -28,7 +28,7 @@ #include "gui/widgets/window.h" #include "gui/widgets/textfield.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #define ACTION_EDIT_OK "edit ok" diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h index 525005429..cbb789fbb 100644 --- a/src/gui/windows/editserverdialog.h +++ b/src/gui/windows/editserverdialog.h @@ -31,9 +31,9 @@ class ServerDialog; #include "net/serverinfo.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> -#include <guichan/listmodel.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/listmodel.hpp" /** * Server Type List Model diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 3b97e12d7..c796c8433 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -46,7 +46,7 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 7387fb249..4b6ae8b4c 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -30,7 +30,7 @@ #include "utils/xml.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <vector> diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h index 72c0d4aba..a9d1a0279 100644 --- a/src/gui/windows/helpwindow.h +++ b/src/gui/windows/helpwindow.h @@ -26,7 +26,7 @@ #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include "localconsts.h" diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 6fd2ab95b..23c1980be 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -57,7 +57,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include <string> diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 4e32f6fa2..da6e56a77 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -28,9 +28,9 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/selectionlistener.hpp" class Button; class DropDown; diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index 7625c4a71..dd3b498fb 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/keylistener.hpp> -#include <guichan/actionlistener.hpp> +#include "gui/base/keylistener.hpp" +#include "gui/base/actionlistener.hpp" class DropDown; class Icon; diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h index 094147383..181e43a51 100644 --- a/src/gui/windows/killstats.h +++ b/src/gui/windows/killstats.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_KILLSTATS_H #define GUI_WINDOWS_KILLSTATS_H -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include "depricatedlistener.h" diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h index c9d2ad61f..5099644ea 100644 --- a/src/gui/windows/logindialog.h +++ b/src/gui/windows/logindialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" #include <string> diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index b441b724c..093f17e29 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -59,7 +59,7 @@ #include "utils/copynpaste.h" #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 5e679d7d1..21c3f93e5 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -30,7 +30,7 @@ #include "utils/stringvector.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <list> diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h index e111f150e..b8237a694 100644 --- a/src/gui/windows/npcpostdialog.h +++ b/src/gui/windows/npcpostdialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class TextBox; class TextField; diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index c16123abd..c1ce6f13f 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -30,7 +30,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h index 7d2ff070b..7e63c9787 100644 --- a/src/gui/windows/okdialog.h +++ b/src/gui/windows/okdialog.h @@ -27,7 +27,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class TextBox; diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index eeedc2ec6..6d54889e6 100644 --- a/src/gui/windows/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" const unsigned int OUTFITS_COUNT = 100; const unsigned int OUTFIT_ITEM_COUNT = 16; diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h index 7ecc86c84..edb9d845e 100644 --- a/src/gui/windows/questswindow.h +++ b/src/gui/windows/questswindow.h @@ -27,7 +27,7 @@ #include "utils/xml.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <map> #include <vector> diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index ab395c7f4..d5d315074 100644 --- a/src/gui/windows/quitdialog.h +++ b/src/gui/windows/quitdialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" #include <vector> diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h index 66c3e40b7..1b53581b6 100644 --- a/src/gui/windows/registerdialog.h +++ b/src/gui/windows/registerdialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" class Button; class LoginData; diff --git a/src/gui/windows/selldialog.h b/src/gui/windows/selldialog.h index 15db28f10..ca973ea03 100644 --- a/src/gui/windows/selldialog.h +++ b/src/gui/windows/selldialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" class Button; class Item; diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 3006922c3..dec80b50a 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -44,7 +44,7 @@ #include "utils/gettext.h" #include "utils/langs.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include <string> diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index ad6f554c6..d17ebcf42 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -31,10 +31,10 @@ #include "utils/mutex.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> -#include <guichan/listmodel.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/listmodel.hpp" +#include "gui/base/selectionlistener.hpp" #include <string> #include <vector> diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h index f5406e8ac..bd67fa860 100644 --- a/src/gui/windows/setupwindow.h +++ b/src/gui/windows/setupwindow.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <list> diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index 95eee1e05..2430073da 100644 --- a/src/gui/windows/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" class Button; class CheckBox; diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 04baad26a..c4505b37c 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -53,7 +53,7 @@ #include "resources/beingcommon.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 4a6182d38..0fb6c1100 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" const int SKILL_MIN_ID = 200000; const unsigned int SKILL_VAR_MIN_ID = 1000000; diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index e8dc44043..283cfde69 100644 --- a/src/gui/windows/socialwindow.h +++ b/src/gui/windows/socialwindow.h @@ -26,7 +26,7 @@ #include "being/playerrelationslistener.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <string> #include <map> diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index 94f1aaa65..5e100b64e 100644 --- a/src/gui/windows/statuswindow.h +++ b/src/gui/windows/statuswindow.h @@ -27,7 +27,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <map> diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index a31cdbaf2..4b63aaf29 100644 --- a/src/gui/windows/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class DropDown; diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp index 936f08c76..c31c099fb 100644 --- a/src/gui/windows/textdialog.cpp +++ b/src/gui/windows/textdialog.cpp @@ -30,7 +30,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h index 9bfb4ae5f..58819de76 100644 --- a/src/gui/windows/textdialog.h +++ b/src/gui/windows/textdialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class PasswordField; diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index a379f0f28..c3a096161 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -51,7 +51,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index ac49c1f52..da5c84df2 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" #include <memory> diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h index fd40810ac..806822171 100644 --- a/src/gui/windows/unregisterdialog.h +++ b/src/gui/windows/unregisterdialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class LoginData; diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index bddd3ef9e..5509168d4 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -30,8 +30,8 @@ #include "utils/mutex.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" #include <string> #include <vector> diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 10a8be4b5..da5ab010d 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -30,7 +30,7 @@ #include <set> -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class BrowserBox; class Button; diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index f7491689b..0f3d857b2 100644 --- a/src/gui/windows/worldselectdialog.h +++ b/src/gui/windows/worldselectdialog.h @@ -27,8 +27,8 @@ #include "net/worldinfo.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" class Button; class ListBox; diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index cc37001cc..7243bbf97 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -51,8 +51,8 @@ #include "utils/timer.h" -#include <guichan/exception.hpp> -#include <guichan/focushandler.hpp> +#include "gui/base/exception.hpp" +#include "gui/base/focushandler.hpp" #include <algorithm> diff --git a/src/input/keyevent.h b/src/input/keyevent.h index e0b2e8e17..3637d720c 100644 --- a/src/input/keyevent.h +++ b/src/input/keyevent.h @@ -21,8 +21,8 @@ #ifndef INPUT_KEYEVENT_H #define INPUT_KEYEVENT_H -#include <guichan/key.hpp> -#include <guichan/keyevent.hpp> +#include "gui/base/key.hpp" +#include "gui/base/keyevent.hpp" #include <string> diff --git a/src/input/keyinput.h b/src/input/keyinput.h index 25deeae19..d68c071f2 100644 --- a/src/input/keyinput.h +++ b/src/input/keyinput.h @@ -21,7 +21,7 @@ #ifndef INPUT_KEYINPUT_H #define INPUT_KEYINPUT_H -#include <guichan/keyinput.hpp> +#include "gui/base/keyinput.hpp" #include <string> diff --git a/src/mouseinput.h b/src/mouseinput.h index 1ed155aa8..47e04eceb 100644 --- a/src/mouseinput.h +++ b/src/mouseinput.h @@ -21,7 +21,7 @@ #ifndef MOUSEINPUT_H #define MOUSEINPUT_H -#include <guichan/mouseinput.hpp> +#include "gui/base/mouseinput.hpp" #include "localconsts.h" diff --git a/src/particle/textparticle.cpp b/src/particle/textparticle.cpp index 54de26887..bf72baf25 100644 --- a/src/particle/textparticle.cpp +++ b/src/particle/textparticle.cpp @@ -26,8 +26,8 @@ #include "gui/theme.h" -#include <guichan/color.hpp> -#include <guichan/font.hpp> +#include "gui/base/color.hpp" +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/render/graphics.h b/src/render/graphics.h index 0cb510195..93d46b475 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -29,8 +29,8 @@ #include "render/renderers.h" -#include <guichan/color.hpp> -#include <guichan/graphics.hpp> +#include "gui/base/color.hpp" +#include "gui/base/graphics.hpp" #ifdef USE_SDL2 #include <SDL_render.h> diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index 97f231d08..285b2dac2 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -36,7 +36,7 @@ #include "utils/sdlcheckutils.h" -#include <guichan/sdl/sdlpixel.hpp> +#include "gui/base/sdl/sdlpixel.hpp" #include "debug.h" diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index 22a66a911..c158844ae 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -36,7 +36,7 @@ #include "utils/sdlcheckutils.h" -#include <guichan/sdl/sdlpixel.hpp> +#include "gui/base/sdl/sdlpixel.hpp" #include "debug.h" diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index e0e22cac9..9e950c12f 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -31,7 +31,7 @@ #include "utils/sdlcheckutils.h" -#include <guichan/sdl/sdlpixel.hpp> +#include "gui/base/sdl/sdlpixel.hpp" #include "debug.h" diff --git a/src/text.cpp b/src/text.cpp index d0027b8ae..fdd538d72 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -32,7 +32,7 @@ #include "resources/image.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/text.h b/src/text.h index 2c6b9b2b4..ed980e588 100644 --- a/src/text.h +++ b/src/text.h @@ -26,7 +26,7 @@ #include "render/graphics.h" -#include <guichan/color.hpp> +#include "gui/base/color.hpp" #include "localconsts.h" diff --git a/src/touchmanager.h b/src/touchmanager.h index 6f7b96a6d..e203da69f 100644 --- a/src/touchmanager.h +++ b/src/touchmanager.h @@ -27,7 +27,7 @@ #include "input/keydata.h" -#include <guichan/rectangle.hpp> +#include "gui/base/rectangle.hpp" #include <string> #include <vector> |