move netsurf header into public API

desktop/gui_factory.c

@@ -38,7 +38,7 @@
 #include "netsurf/clipboard.h"
 #include "netsurf/utf8.h"
 #include "netsurf/layout.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 
 /**
  * The global interface table.
@@ -743,7 +743,7 @@ static nserror verify_misc_register(struct gui_misc_table *gmt)
 }
 
 
-/* exported interface documented in desktop/netsurf.h */
+/* exported interface documented in netsurf/netsurf.h */
 nserror netsurf_register(struct netsurf_table *gt)
 {
 	nserror err;

desktop/netsurf.c

@@ -49,7 +49,7 @@
 #include "desktop/searchweb.h"
 #include "netsurf/misc.h"
 #include "desktop/gui_internal.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 
 /** speculative pre-conversion small image size
  *
@@ -121,7 +121,7 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query,
 	return NSERROR_OK;
 }
 
-/* exported interface documented in desktop/netsurf.h */
+/* exported interface documented in netsurf/netsurf.h */
 nserror netsurf_init(const char *store_path)
 {
 	nserror ret;

frontends/amiga/gui.c

@@ -105,7 +105,7 @@
 #include "desktop/browser.h"
 #include "desktop/hotlist.h"
 #include "desktop/mouse.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 #include "desktop/version.h"
 #include "desktop/save_complete.h"
 #include "desktop/scrollbar.h"

frontends/atari/gui.c

@@ -40,7 +40,7 @@
 #include "netsurf/clipboard.h"
 #include "netsurf/fetch.h"
 #include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 
 #include "atari/gemtk/gemtk.h"
 #include "atari/gui.h"

frontends/beos/gui.cpp

@@ -67,7 +67,7 @@ extern "C" {
 #include "netsurf/clipboard.h"
 #include "netsurf/search.h"
 #include "netsurf/fetch.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 
 }
 

frontends/beos/scaffolding.cpp

@@ -55,7 +55,7 @@ extern "C" {
 #include "content/content.h"
 #include "desktop/browser_history.h"
 #include "desktop/browser.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 #include "desktop/version.h"
 #include "desktop/searchweb.h"
 #include "desktop/search.h"

frontends/cocoa/NetsurfApp.m

@@ -39,7 +39,7 @@
 #import "desktop/tree.h"
 #import "render/html.h"
 #import "desktop/mouse.h"
-#import "desktop/netsurf.h"
+#import "netsurf/netsurf.h"
 
 #ifndef NETSURF_HOMEPAGE
 #define NETSURF_HOMEPAGE "http://www.netsurf-browser.org/welcome/"

frontends/framebuffer/gui.c

@@ -40,7 +40,7 @@
 #include "desktop/plotters.h"
 #include "netsurf/window.h"
 #include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 #include "content/urldb.h"
 #include "content/fetch.h"
 

frontends/gtk/gui.c

@@ -49,7 +49,7 @@
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
 #include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 
 #include "gtk/compat.h"
 #include "gtk/warn.h"

frontends/monkey/main.c

@@ -34,7 +34,7 @@
 #include "content/fetchers/resource.h"
 #include "content/hlcache.h"
 #include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 
 #include "monkey/dispatch.h"
 #include "monkey/browser.h"

frontends/riscos/gui.c

@@ -51,7 +51,7 @@
 #include "netsurf/misc.h"
 #include "desktop/save_complete.h"
 #include "desktop/treeview.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 #include "desktop/browser.h"
 #include "content/urldb.h"
 #include "content/hlcache.h"

frontends/windows/main.c

@@ -33,7 +33,7 @@
 #include "desktop/browser.h"
 #include "netsurf/fetch.h"
 #include "netsurf/misc.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
 
 #include "windows/findfile.h"
 #include "windows/file.h"

include/netsurf/clipboard.h

@@ -22,8 +22,8 @@
  * Interface to platform-specific clipboard operations.
  */
 
-#ifndef _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
-#define _NETSURF_DESKTOP_GUI_CLIPBOARD_H_
+#ifndef _NETSURF_CLIPBOARD_H_
+#define _NETSURF_CLIPBOARD_H_
 
 #include <stddef.h>
 

include/netsurf/css.h

@@ -21,8 +21,8 @@
  * Netsurf core css API
  */
 
-#ifndef NETSURF_CSS_H_
-#define NETSURF_CSS_H_
+#ifndef _NETSURF_CSS_H_
+#define _NETSURF_CSS_H_
 
 /**
  * Convert a CSS color to a NetSurf colour primitive

include/netsurf/download.h

@@ -22,8 +22,8 @@
  * Interface to platform-specific download operations.
  */
 
-#ifndef _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
-#define _NETSURF_DESKTOP_GUI_DOWNLOAD_H_
+#ifndef _NETSURF_DOWNLOAD_H_
+#define _NETSURF_DOWNLOAD_H_
 
 struct gui_window;
 struct download_context;

include/netsurf/fetch.h

@@ -22,8 +22,8 @@
  * Interface to platform-specific fetcher operations.
  */
 
-#ifndef _NETSURF_DESKTOP_GUI_FETCH_H_
-#define _NETSURF_DESKTOP_GUI_FETCH_H_
+#ifndef _NETSURF_FETCH_H_
+#define _NETSURF_FETCH_H_
 
 struct nsurl;
 

include/netsurf/layout.h

@@ -29,8 +29,8 @@
  * is the correct approach.
  */
 
-#ifndef _NETSURF_DESKTOP_GUI_LAYOUT_H_
-#define _NETSURF_DESKTOP_GUI_LAYOUT_H_
+#ifndef _NETSURF_LAYOUT_H_
+#define _NETSURF_LAYOUT_H_
 
 struct plot_font_style;
 

include/netsurf/misc.h

@@ -22,8 +22,8 @@
  * Interface to platform-specific miscellaneous browser operation table.
  */
 
-#ifndef _NETSURF_DESKTOP_GUI_MISC_H_
-#define _NETSURF_DESKTOP_GUI_MISC_H_
+#ifndef _NETSURF_MISC_H_
+#define _NETSURF_MISC_H_
 
 struct form_control;
 struct gui_window;

include/netsurf/netsurf.h

@@ -22,8 +22,8 @@
  * NetSurf core interface registration, construction and destruction.
  */
 
-#ifndef _NETSURF_DESKTOP_NETSURF_H_
-#define _NETSURF_DESKTOP_NETSURF_H_
+#ifndef _NETSURF_NETSURF_H_
+#define _NETSURF_NETSURF_H_
 
 #include "utils/errors.h"
 #include "desktop/gui_table.h"

include/netsurf/search.h

@@ -22,8 +22,8 @@
  * Interface to platform-specific search operations.
  */
 
-#ifndef _NETSURF_DESKTOP_GUI_SEARCH_H_
-#define _NETSURF_DESKTOP_GUI_SEARCH_H_
+#ifndef _NETSURF_SEARCH_H_
+#define _NETSURF_SEARCH_H_
 
 /**
  * function table for page text search.

include/netsurf/utf8.h

@@ -22,8 +22,8 @@
  * Interface to platform-specific utf8 operations.
  */
 
-#ifndef _NETSURF_DESKTOP_GUI_UTF8_H_
-#define _NETSURF_DESKTOP_GUI_UTF8_H_
+#ifndef _NETSURF_UTF8_H_
+#define _NETSURF_UTF8_H_
 
 /**
  * User interface utf8 characterset conversion routines.

include/netsurf/window.h

@@ -23,8 +23,8 @@
  * operations.
  */
 
-#ifndef _NETSURF_DESKTOP_GUI_WINDOW_H_
-#define _NETSURF_DESKTOP_GUI_WINDOW_H_
+#ifndef _NETSURF_WINDOW_H_
+#define _NETSURF_WINDOW_H_
 
 typedef enum gui_save_type {
 	GUI_SAVE_SOURCE,