From ebe1b0511444e82830e8de239c34c6817817fba8 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 24 Jun 2020 23:49:59 +0100 Subject: improve desktop text search header usage remove unecessary inclusion of desktop search header in content header which has knock on effect of not having ctype or string system headers dragged in unecessarily. Futher this highlighted use of ctype API where internal ascii processing ought to be used. --- desktop/browser_window.c | 1 + desktop/gui_factory.c | 1 + desktop/search.c | 2 +- desktop/search.h | 10 ++++++---- desktop/searchweb.c | 1 + desktop/selection.c | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) (limited to 'desktop') diff --git a/desktop/browser_window.c b/desktop/browser_window.c index 546198f88..32247062e 100644 --- a/desktop/browser_window.c +++ b/desktop/browser_window.c @@ -27,6 +27,7 @@ #include "utils/config.h" #include +#include #include #include diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c index a4532fefa..a141d7d23 100644 --- a/desktop/gui_factory.c +++ b/desktop/gui_factory.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "utils/config.h" #include "utils/errors.h" diff --git a/desktop/search.c b/desktop/search.c index d4abfed92..e21f520a6 100644 --- a/desktop/search.c +++ b/desktop/search.c @@ -26,7 +26,7 @@ #include #include "utils/errors.h" -#include "content/content.h" +#include "content/textsearch.h" #include "netsurf/types.h" #include "netsurf/browser_window.h" diff --git a/desktop/search.h b/desktop/search.h index baf382e77..c39d1d8a3 100644 --- a/desktop/search.h +++ b/desktop/search.h @@ -16,11 +16,13 @@ * along with this program. If not, see . */ -#ifndef _NETSURF_DESKTOP_SEARCH_H_ -#define _NETSURF_DESKTOP_SEARCH_H_ +/** + * \file + * Browseing window text search interface + */ -#include -#include +#ifndef NETSURF_DESKTOP_SEARCH_H_ +#define NETSURF_DESKTOP_SEARCH_H_ struct browser_window; diff --git a/desktop/searchweb.c b/desktop/searchweb.c index 2c0873de5..597b8fffe 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -22,6 +22,7 @@ */ #include +#include #include "utils/utils.h" #include "utils/log.h" diff --git a/desktop/selection.c b/desktop/selection.c index 417a504b3..332e9dafa 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -23,6 +23,7 @@ */ #include +#include #include "netsurf/clipboard.h" #include "netsurf/browser_window.h" -- cgit v1.2.3