From 70d700b26c13e04b601c4ac3db09514db473d01c Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 19 Jan 2017 21:15:08 +0000 Subject: rationalise use of utils/utils.h header --- frontends/atari/redrawslots.h | 4 +--- frontends/gtk/corewindow.c | 1 - frontends/gtk/plotters.c | 1 - frontends/gtk/toolbar.c | 1 - frontends/gtk/window.c | 1 - frontends/riscos/corewindow.c | 2 +- frontends/riscos/gui/url_bar.c | 1 - frontends/riscos/plotters.c | 1 - frontends/riscos/print.c | 1 - frontends/riscos/save_draw.c | 1 - frontends/windows/about.c | 1 - frontends/windows/corewindow.c | 2 +- frontends/windows/drawable.c | 1 - frontends/windows/filetype.c | 1 - frontends/windows/gui.c | 1 - frontends/windows/localhistory.c | 1 - frontends/windows/plot.c | 1 - frontends/windows/pointers.c | 1 - frontends/windows/prefs.c | 1 - frontends/windows/schedule.c | 1 - 20 files changed, 3 insertions(+), 22 deletions(-) (limited to 'frontends') diff --git a/frontends/atari/redrawslots.h b/frontends/atari/redrawslots.h index ca72a0172..8ea46c4f8 100644 --- a/frontends/atari/redrawslots.h +++ b/frontends/atari/redrawslots.h @@ -22,7 +22,7 @@ #include -#include "utils/utils.h" +#include "netsurf/types.h" /** * This is the number of redraw requests that the slotlist can store. @@ -31,8 +31,6 @@ */ #define MAX_REDRW_SLOTS 32 -struct rect; - /** * This struct holds scheduled redraw requests. */ diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c index 8af19588f..70c3ad135 100644 --- a/frontends/gtk/corewindow.c +++ b/frontends/gtk/corewindow.c @@ -39,7 +39,6 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "utils/messages.h" #include "utils/utf8.h" #include "netsurf/types.h" diff --git a/frontends/gtk/plotters.c b/frontends/gtk/plotters.c index 1cebf58f0..817b72808 100644 --- a/frontends/gtk/plotters.c +++ b/frontends/gtk/plotters.c @@ -31,7 +31,6 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "netsurf/plotters.h" #include "utils/nsoption.h" diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c index e1aeb4755..ac24a78ca 100644 --- a/frontends/gtk/toolbar.c +++ b/frontends/gtk/toolbar.c @@ -25,7 +25,6 @@ #include "desktop/searchweb.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "utils/nsoption.h" #include "gtk/gui.h" diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c index ce2644e8e..abfda9305 100644 --- a/frontends/gtk/window.c +++ b/frontends/gtk/window.c @@ -34,7 +34,6 @@ #include "utils/log.h" #include "utils/utf8.h" -#include "utils/utils.h" #include "utils/nsoption.h" #include "netsurf/content.h" #include "netsurf/browser_window.h" diff --git a/frontends/riscos/corewindow.c b/frontends/riscos/corewindow.c index 9896069f8..3219be985 100644 --- a/frontends/riscos/corewindow.c +++ b/frontends/riscos/corewindow.c @@ -34,8 +34,8 @@ #include #include -#include "utils/utils.h" #include "utils/log.h" +#include "netsurf/types.h" #include "netsurf/mouse.h" #include "netsurf/keypress.h" diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c index 40c5c6f79..a5ec3f8c6 100644 --- a/frontends/riscos/gui/url_bar.c +++ b/frontends/riscos/gui/url_bar.c @@ -38,7 +38,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utf8.h" -#include "utils/utils.h" #include "utils/nsurl.h" #include "netsurf/browser_window.h" #include "netsurf/plotters.h" diff --git a/frontends/riscos/plotters.c b/frontends/riscos/plotters.c index 9c9813862..06e732d99 100644 --- a/frontends/riscos/plotters.c +++ b/frontends/riscos/plotters.c @@ -27,7 +27,6 @@ #include "oslib/os.h" #include "utils/log.h" -#include "utils/utils.h" #include "netsurf/plotters.h" #include "riscos/bitmap.h" diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c index dfdd24ce9..465627eea 100644 --- a/frontends/riscos/print.c +++ b/frontends/riscos/print.c @@ -34,7 +34,6 @@ #include "utils/config.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "utils/nsoption.h" #include "netsurf/browser_window.h" #include "netsurf/plotters.h" diff --git a/frontends/riscos/save_draw.c b/frontends/riscos/save_draw.c index 705551f7b..7e6c9462e 100644 --- a/frontends/riscos/save_draw.c +++ b/frontends/riscos/save_draw.c @@ -31,7 +31,6 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "netsurf/plotters.h" #include "netsurf/content.h" diff --git a/frontends/windows/about.c b/frontends/windows/about.c index 4716a5c91..65c81cd7d 100644 --- a/frontends/windows/about.c +++ b/frontends/windows/about.c @@ -28,7 +28,6 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "utils/messages.h" #include "desktop/version.h" diff --git a/frontends/windows/corewindow.c b/frontends/windows/corewindow.c index ff89d9271..754e0e561 100644 --- a/frontends/windows/corewindow.c +++ b/frontends/windows/corewindow.c @@ -38,9 +38,9 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "utils/messages.h" #include "utils/utf8.h" +#include "netsurf/types.h" #include "netsurf/keypress.h" #include "netsurf/mouse.h" diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c index ee1c695f1..cb9429139 100644 --- a/frontends/windows/drawable.c +++ b/frontends/windows/drawable.c @@ -26,7 +26,6 @@ #include "utils/errors.h" #include "utils/log.h" -#include "utils/utils.h" #include "netsurf/browser_window.h" #include "netsurf/plotters.h" #include "netsurf/keypress.h" diff --git a/frontends/windows/filetype.c b/frontends/windows/filetype.c index aab27ea76..ed07dd5fc 100644 --- a/frontends/windows/filetype.c +++ b/frontends/windows/filetype.c @@ -20,7 +20,6 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "content/fetch.h" #include "netsurf/fetch.h" diff --git a/frontends/windows/gui.c b/frontends/windows/gui.c index 043a93dd9..f5808de86 100644 --- a/frontends/windows/gui.c +++ b/frontends/windows/gui.c @@ -26,7 +26,6 @@ #include "utils/errors.h" #include "utils/nsurl.h" #include "utils/log.h" -#include "utils/utils.h" #include "utils/corestrings.h" #include "utils/url.h" #include "utils/file.h" diff --git a/frontends/windows/localhistory.c b/frontends/windows/localhistory.c index 15705d1ad..ae3b7f521 100644 --- a/frontends/windows/localhistory.c +++ b/frontends/windows/localhistory.c @@ -24,7 +24,6 @@ #include "desktop/browser_history.h" #include "netsurf/plotters.h" -#include "utils/utils.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c index 941ec419c..fd2961957 100644 --- a/frontends/windows/plot.c +++ b/frontends/windows/plot.c @@ -27,7 +27,6 @@ #include "utils/log.h" #include "utils/utf8.h" -#include "utils/utils.h" #include "netsurf/mouse.h" #include "netsurf/window.h" #include "netsurf/plotters.h" diff --git a/frontends/windows/pointers.c b/frontends/windows/pointers.c index b796a30ec..a730e4bd2 100644 --- a/frontends/windows/pointers.c +++ b/frontends/windows/pointers.c @@ -25,7 +25,6 @@ #include "utils/errors.h" #include "utils/nsurl.h" #include "utils/log.h" -#include "utils/utils.h" #include "utils/corestrings.h" #include "utils/url.h" #include "utils/file.h" diff --git a/frontends/windows/prefs.c b/frontends/windows/prefs.c index 286bfb0a1..03414ee9f 100644 --- a/frontends/windows/prefs.c +++ b/frontends/windows/prefs.c @@ -24,7 +24,6 @@ #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "utils/file.h" #include "windows/gui.h" diff --git a/frontends/windows/schedule.c b/frontends/windows/schedule.c index 5366add9c..eae6c1d63 100644 --- a/frontends/windows/schedule.c +++ b/frontends/windows/schedule.c @@ -21,7 +21,6 @@ #include "utils/sys_time.h" #include "utils/log.h" -#include "utils/utils.h" #include "utils/errors.h" #include "windows/schedule.h" -- cgit v1.2.3