summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-10-16 09:48:09 +0100
committerVincent Sanders <vince@kyllikki.org>2014-10-16 22:33:43 +0100
commitd06df231bc7c49e0f46ffc8fc8674d0717dff202 (patch)
treeeb51dc949f5e062c6a9b4adef33adbe591e99518 /render
parentab7f3e31800ade0cec9c071e61cc001ee9470f69 (diff)
downloadnetsurf-d06df231bc7c49e0f46ffc8fc8674d0717dff202.tar.gz
netsurf-d06df231bc7c49e0f46ffc8fc8674d0717dff202.tar.bz2
Update the core to use the split operations table headers
Second in the series to decouple the core API usage from the frontends.
Diffstat (limited to 'render')
-rw-r--r--render/box_construct.c3
-rw-r--r--render/html.c3
-rw-r--r--render/html_css.c3
-rw-r--r--render/html_interaction.c3
-rw-r--r--render/html_object.c11
-rw-r--r--render/search.c3
6 files changed, 16 insertions, 10 deletions
diff --git a/render/box_construct.c b/render/box_construct.c
index a341ca39a..025220802 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -37,7 +37,6 @@
#include "css/css.h"
#include "css/utils.h"
#include "css/select.h"
-#include "desktop/gui_factory.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/locale.h"
@@ -45,6 +44,8 @@
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/utils.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
#include "render/box.h"
#include "render/box_textarea.h"
diff --git a/render/html.c b/render/html.c
index 7ab8fb5bd..ece083dad 100644
--- a/render/html.c
+++ b/render/html.c
@@ -46,8 +46,9 @@
#include "desktop/textarea.h"
#include "image/bitmap.h"
#include "javascript/js.h"
-#include "desktop/gui_factory.h"
#include "desktop/font.h"
+#include "desktop/gui_utf8.h"
+#include "desktop/gui_internal.h"
#include "render/box.h"
#include "render/form.h"
diff --git a/render/html_css.c b/render/html_css.c
index b4c25bae2..3d9012ff3 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -28,11 +28,12 @@
#include <stdlib.h>
#include "content/hlcache.h"
-#include "desktop/gui_factory.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/config.h"
#include "utils/log.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
#include "render/html_internal.h"
diff --git a/render/html_interaction.c b/render/html_interaction.c
index dbae06377..7e78fc034 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -35,7 +35,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
-#include "desktop/gui_factory.h"
#include "desktop/frames.h"
#include "desktop/mouse.h"
#include "utils/nsoption.h"
@@ -45,6 +44,8 @@
#include "desktop/textinput.h"
#include "desktop/font.h"
#include "javascript/js.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
#include "render/box.h"
#include "render/box_textarea.h"
diff --git a/render/html_object.c b/render/html_object.c
index 6499f249a..d048253a7 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -27,14 +27,15 @@
#include <strings.h>
#include <stdlib.h>
-#include "content/hlcache.h"
-#include "css/utils.h"
-#include "utils/nsoption.h"
-#include "desktop/scrollbar.h"
-#include "desktop/gui_factory.h"
#include "utils/corestrings.h"
#include "utils/config.h"
#include "utils/log.h"
+#include "utils/nsoption.h"
+#include "content/hlcache.h"
+#include "css/utils.h"
+#include "desktop/scrollbar.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
#include "render/box.h"
#include "render/html_internal.h"
diff --git a/render/search.c b/render/search.c
index 00261a36a..f509f5890 100644
--- a/render/search.c
+++ b/render/search.c
@@ -33,7 +33,8 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/selection.h"
-#include "desktop/gui_factory.h"
+#include "desktop/gui_search.h"
+#include "desktop/gui_internal.h"
#include "render/box.h"
#include "render/html.h"