From eea8d5e39b746b240a4720c4f48de91ec81c8563 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 14 May 2014 01:24:44 +0300 Subject: Move skin into separate file. --- src/gui/widgets/avatarlistbox.cpp | 1 + src/gui/widgets/browserbox.cpp | 1 + src/gui/widgets/button.cpp | 1 + src/gui/widgets/checkbox.cpp | 1 + src/gui/widgets/colorpage.cpp | 1 + src/gui/widgets/desktop.cpp | 2 ++ src/gui/widgets/dropdown.cpp | 7 ++++--- src/gui/widgets/extendedlistbox.cpp | 1 + src/gui/widgets/itemcontainer.cpp | 1 + src/gui/widgets/label.cpp | 1 + src/gui/widgets/listbox.cpp | 1 + src/gui/widgets/passwordfield.cpp | 2 ++ src/gui/widgets/playerbox.cpp | 1 + src/gui/widgets/popup.cpp | 1 + src/gui/widgets/progressbar.cpp | 1 + src/gui/widgets/radiobutton.cpp | 1 + src/gui/widgets/scrollarea.cpp | 1 + src/gui/widgets/tabs/tab.cpp | 1 + src/gui/widgets/textfield.cpp | 1 + src/gui/widgets/textpreview.cpp | 1 + src/gui/widgets/window.cpp | 1 + 21 files changed, 26 insertions(+), 3 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 130245801..19eb86f44 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -29,6 +29,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "gui/viewport.h" #include "gui/models/avatarlistmodel.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 25b5444fc..30b06e266 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -27,6 +27,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "gui/widgets/linkhandler.h" diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index b1f41e23e..4c806b2b0 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -77,6 +77,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "gui/rect.h" #include "utils/delete2.h" diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 765ff13ec..253092539 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -73,6 +73,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "debug.h" diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp index 501b3dea7..42d8f3016 100644 --- a/src/gui/widgets/colorpage.cpp +++ b/src/gui/widgets/colorpage.cpp @@ -23,6 +23,7 @@ #include "gui/models/colormodel.h" #include "gui/font.h" +#include "gui/skin.h" #include "debug.h" diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 3e77a65a5..a1158a59b 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -24,6 +24,8 @@ #include "configuration.h" #include "main.h" +#include "gui/skin.h" + #include "gui/widgets/browserbox.h" #include "input/inputmanager.h" diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 8b636c04d..8de0cdc77 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -28,15 +28,16 @@ #include "input/keydata.h" +#include "gui/font.h" +#include "gui/gui.h" +#include "gui/skin.h" + #include "gui/models/extendedlistmodel.h" #include "gui/widgets/popuplist.h" #include "resources/image.h" -#include "gui/font.h" -#include "gui/gui.h" - #include #include "debug.h" diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index 89bcc7485..ca58bf95b 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -23,6 +23,7 @@ #include "gui/models/extendedlistmodel.h" #include "gui/font.h" +#include "gui/skin.h" #include "gui/models/listmodel.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 4a944c276..e9d9e09bf 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -31,6 +31,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "gui/viewport.h" #include "gui/popups/itempopup.h" diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index c37308a1e..bfdcc3ffd 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -66,6 +66,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "debug.h" diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 341204505..69d5d665f 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -74,6 +74,7 @@ #include "gui/focushandler.h" #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "gui/models/listmodel.h" diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp index 1b562b7f0..27f0bc188 100644 --- a/src/gui/widgets/passwordfield.cpp +++ b/src/gui/widgets/passwordfield.cpp @@ -22,6 +22,8 @@ #include "gui/widgets/passwordfield.h" +#include "gui/skin.h" + #include "debug.h" PasswordField::PasswordField(const Widget2 *const widget, diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index 6a0fbd607..252f39727 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -27,6 +27,7 @@ #include "being/being.h" #include "gui/gui.h" +#include "gui/skin.h" #include "resources/image.h" diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 3c10a721f..ff6296d75 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -25,6 +25,7 @@ #include "graphicsvertexes.h" +#include "gui/skin.h" #include "gui/viewport.h" #include "utils/delete2.h" diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 4c82fe20c..f737f0153 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -27,6 +27,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "utils/delete2.h" diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index 27be9434b..8e122ece6 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -73,6 +73,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "debug.h" diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index e006302c7..29d185bac 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -69,6 +69,7 @@ #include "graphicsvertexes.h" #include "gui/gui.h" +#include "gui/skin.h" #include "resources/image.h" diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp index e31bc9ef1..dc063bb45 100644 --- a/src/gui/widgets/tabs/tab.cpp +++ b/src/gui/widgets/tabs/tab.cpp @@ -69,6 +69,7 @@ #include "graphicsvertexes.h" #include "gui/gui.h" +#include "gui/skin.h" #include "gui/widgets/label.h" #include "gui/widgets/tabbedarea.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index db194419e..0080a8d22 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -71,6 +71,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "gui/viewport.h" #include "gui/popups/popupmenu.h" diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index 6f358e956..c567c5f06 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -26,6 +26,7 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "debug.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index c7212314d..7e34476d0 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -75,6 +75,7 @@ #include "gui/focushandler.h" #include "gui/font.h" #include "gui/gui.h" +#include "gui/skin.h" #include "gui/viewport.h" #include "gui/widgets/layout.h" -- cgit v1.2.3-70-g09d2