From 29f929794c7519b049de0be3af635f05d7e83be6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 15 Feb 2014 20:31:52 +0300 Subject: move some methods from base/graphics into render/graphics. Remove base/graphcs. --- src/gui/base/widgets/button.cpp | 3 ++- src/gui/base/widgets/button.hpp | 3 ++- src/gui/base/widgets/checkbox.cpp | 3 ++- src/gui/base/widgets/container.cpp | 3 ++- src/gui/base/widgets/container.hpp | 3 ++- src/gui/base/widgets/label.cpp | 3 ++- src/gui/base/widgets/label.hpp | 3 ++- src/gui/base/widgets/listbox.cpp | 3 ++- src/gui/base/widgets/radiobutton.cpp | 3 ++- src/gui/base/widgets/scrollarea.cpp | 3 ++- src/gui/base/widgets/slider.cpp | 3 ++- src/gui/base/widgets/textbox.cpp | 3 ++- src/gui/base/widgets/textfield.cpp | 3 ++- src/gui/base/widgets/window.cpp | 3 ++- 14 files changed, 28 insertions(+), 14 deletions(-) (limited to 'src/gui/base/widgets') diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp index a52bf2d78..3e699670a 100644 --- a/src/gui/base/widgets/button.cpp +++ b/src/gui/base/widgets/button.cpp @@ -69,11 +69,12 @@ #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 "render/graphics.h" + #include "debug.h" namespace gcn diff --git a/src/gui/base/widgets/button.hpp b/src/gui/base/widgets/button.hpp index 4ae08eb16..cd41a1b02 100644 --- a/src/gui/base/widgets/button.hpp +++ b/src/gui/base/widgets/button.hpp @@ -67,12 +67,13 @@ #include #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" +#include "render/graphics.h" + namespace gcn { /** diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp index 908b4f509..615808a85 100644 --- a/src/gui/base/widgets/checkbox.cpp +++ b/src/gui/base/widgets/checkbox.cpp @@ -68,10 +68,11 @@ #include "gui/base/widgets/checkbox.hpp" #include "gui/base/font.hpp" -#include "gui/base/graphics.hpp" #include "gui/base/key.hpp" #include "gui/base/mouseinput.hpp" +#include "render/graphics.h" + #include "debug.h" namespace gcn diff --git a/src/gui/base/widgets/container.cpp b/src/gui/base/widgets/container.cpp index 1e6de018b..d72f2a682 100644 --- a/src/gui/base/widgets/container.cpp +++ b/src/gui/base/widgets/container.cpp @@ -68,7 +68,8 @@ #include "gui/base/widgets/container.hpp" #include "gui/base/exception.hpp" -#include "gui/base/graphics.hpp" + +#include "render/graphics.h" #include "debug.h" diff --git a/src/gui/base/widgets/container.hpp b/src/gui/base/widgets/container.hpp index a5cbdb31b..bffe6e884 100644 --- a/src/gui/base/widgets/container.hpp +++ b/src/gui/base/widgets/container.hpp @@ -67,7 +67,8 @@ #include #include "gui/base/basiccontainer.hpp" -#include "gui/base/graphics.hpp" + +#include "render/graphics.h" namespace gcn { diff --git a/src/gui/base/widgets/label.cpp b/src/gui/base/widgets/label.cpp index 42fcd78f4..f4576d908 100644 --- a/src/gui/base/widgets/label.cpp +++ b/src/gui/base/widgets/label.cpp @@ -69,7 +69,8 @@ #include "gui/base/exception.hpp" #include "gui/base/font.hpp" -#include "gui/base/graphics.hpp" + +#include "render/graphics.h" #include "debug.h" diff --git a/src/gui/base/widgets/label.hpp b/src/gui/base/widgets/label.hpp index f1ef30b89..90a395f7b 100644 --- a/src/gui/base/widgets/label.hpp +++ b/src/gui/base/widgets/label.hpp @@ -66,9 +66,10 @@ #include -#include "gui/base/graphics.hpp" #include "gui/base/widget.hpp" +#include "render/graphics.h" + namespace gcn { /** diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp index b97bf47d4..dcf443c77 100644 --- a/src/gui/base/widgets/listbox.cpp +++ b/src/gui/base/widgets/listbox.cpp @@ -69,12 +69,13 @@ #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 "render/graphics.h" + #include "debug.h" namespace gcn diff --git a/src/gui/base/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp index bfd5b1ff8..1e1da2622 100644 --- a/src/gui/base/widgets/radiobutton.cpp +++ b/src/gui/base/widgets/radiobutton.cpp @@ -68,10 +68,11 @@ #include "gui/base/widgets/radiobutton.hpp" #include "gui/base/font.hpp" -#include "gui/base/graphics.hpp" #include "gui/base/key.hpp" #include "gui/base/mouseinput.hpp" +#include "render/graphics.h" + #include "debug.h" namespace gcn diff --git a/src/gui/base/widgets/scrollarea.cpp b/src/gui/base/widgets/scrollarea.cpp index e3dcfc61c..308cee473 100644 --- a/src/gui/base/widgets/scrollarea.cpp +++ b/src/gui/base/widgets/scrollarea.cpp @@ -68,7 +68,8 @@ #include "gui/base/widgets/scrollarea.hpp" #include "gui/base/exception.hpp" -#include "gui/base/graphics.hpp" + +#include "render/graphics.h" #include "debug.h" diff --git a/src/gui/base/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp index a1a106303..e9ab36e86 100644 --- a/src/gui/base/widgets/slider.cpp +++ b/src/gui/base/widgets/slider.cpp @@ -67,10 +67,11 @@ #include "gui/base/widgets/slider.hpp" -#include "gui/base/graphics.hpp" #include "gui/base/key.hpp" #include "gui/base/mouseinput.hpp" +#include "render/graphics.h" + #include "debug.h" namespace gcn diff --git a/src/gui/base/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp index 2e9ca0563..411fc7dd5 100644 --- a/src/gui/base/widgets/textbox.cpp +++ b/src/gui/base/widgets/textbox.cpp @@ -69,10 +69,11 @@ #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 "render/graphics.h" + #include "debug.h" namespace gcn diff --git a/src/gui/base/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp index 586e49663..3349ebccb 100644 --- a/src/gui/base/widgets/textfield.cpp +++ b/src/gui/base/widgets/textfield.cpp @@ -68,10 +68,11 @@ #include "gui/base/widgets/textfield.hpp" #include "gui/base/font.hpp" -#include "gui/base/graphics.hpp" #include "gui/base/key.hpp" #include "gui/base/mouseinput.hpp" +#include "render/graphics.h" + #include "debug.h" namespace gcn diff --git a/src/gui/base/widgets/window.cpp b/src/gui/base/widgets/window.cpp index c7a108ab8..6373bcb63 100644 --- a/src/gui/base/widgets/window.cpp +++ b/src/gui/base/widgets/window.cpp @@ -69,9 +69,10 @@ #include "gui/base/exception.hpp" #include "gui/base/font.hpp" -#include "gui/base/graphics.hpp" #include "gui/base/mouseinput.hpp" +#include "render/graphics.h" + #include "debug.h" namespace gcn -- cgit v1.2.3-70-g09d2