summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-05-30 11:51:10 +0100
committerVincent Sanders <vince@kyllikki.org>2016-05-30 11:51:10 +0100
commitc041393e66b4a75cfc1165e184be77cc974a63cb (patch)
tree6e57207a4e8d8b4eee3d28be9fc40b3a0f78622a
parent9ce71876ce500e242e2384c21abb38a8f431138b (diff)
downloadnetsurf-c041393e66b4a75cfc1165e184be77cc974a63cb.tar.gz
netsurf-c041393e66b4a75cfc1165e184be77cc974a63cb.tar.bz2
move netsurf header into public API
-rw-r--r--desktop/gui_factory.c4
-rw-r--r--desktop/netsurf.c4
-rw-r--r--frontends/amiga/gui.c2
-rw-r--r--frontends/atari/gui.c2
-rw-r--r--frontends/beos/gui.cpp2
-rw-r--r--frontends/beos/scaffolding.cpp2
-rw-r--r--frontends/cocoa/NetsurfApp.m2
-rw-r--r--frontends/framebuffer/gui.c2
-rw-r--r--frontends/gtk/gui.c2
-rw-r--r--frontends/monkey/main.c2
-rw-r--r--frontends/riscos/gui.c2
-rw-r--r--frontends/windows/main.c2
-rw-r--r--include/netsurf/clipboard.h4
-rw-r--r--include/netsurf/css.h4
-rw-r--r--include/netsurf/download.h4
-rw-r--r--include/netsurf/fetch.h4
-rw-r--r--include/netsurf/layout.h4
-rw-r--r--include/netsurf/misc.h4
-rw-r--r--include/netsurf/netsurf.h (renamed from desktop/netsurf.h)4
-rw-r--r--include/netsurf/search.h4
-rw-r--r--include/netsurf/utf8.h4
-rw-r--r--include/netsurf/window.h4
22 files changed, 34 insertions, 34 deletions
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index a085c0ca8..cecbe6e79 100644
--- a/desktop/gui_factory.c
+++ b/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;
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 8e763ca05..fd4cacf9e 100644
--- a/desktop/netsurf.c
+++ b/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;
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index c79e06b30..ae70086d0 100644
--- a/frontends/amiga/gui.c
+++ b/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"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 964983ed7..0e349ab7e 100644
--- a/frontends/atari/gui.c
+++ b/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"
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index b30c8966d..58b9f9b36 100644
--- a/frontends/beos/gui.cpp
+++ b/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"
}
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 9780884ba..82ae2afde 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/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"
diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m
index 6fb856098..f048ca631 100644
--- a/frontends/cocoa/NetsurfApp.m
+++ b/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/"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index fc04ac8fb..6313481c3 100644
--- a/frontends/framebuffer/gui.c
+++ b/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"
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 7e23b6f31..120142420 100644
--- a/frontends/gtk/gui.c
+++ b/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"
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index 6443dbd20..756eadba9 100644
--- a/frontends/monkey/main.c
+++ b/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"
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index 0a7120e7c..531b81694 100644
--- a/frontends/riscos/gui.c
+++ b/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"
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index 3688851ed..c410de90b 100644
--- a/frontends/windows/main.c
+++ b/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"
diff --git a/include/netsurf/clipboard.h b/include/netsurf/clipboard.h
index 6feea2404..d90ebc4cb 100644
--- a/include/netsurf/clipboard.h
+++ b/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>
diff --git a/include/netsurf/css.h b/include/netsurf/css.h
index bd95eaeeb..3c7ae283c 100644
--- a/include/netsurf/css.h
+++ b/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
diff --git a/include/netsurf/download.h b/include/netsurf/download.h
index 55e115d52..ae554db24 100644
--- a/include/netsurf/download.h
+++ b/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;
diff --git a/include/netsurf/fetch.h b/include/netsurf/fetch.h
index 22c5e6a2e..6e6d653ee 100644
--- a/include/netsurf/fetch.h
+++ b/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;
diff --git a/include/netsurf/layout.h b/include/netsurf/layout.h
index 1696aee91..266de4091 100644
--- a/include/netsurf/layout.h
+++ b/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;
diff --git a/include/netsurf/misc.h b/include/netsurf/misc.h
index 399d93895..7b354953c 100644
--- a/include/netsurf/misc.h
+++ b/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;
diff --git a/desktop/netsurf.h b/include/netsurf/netsurf.h
index ee6e53a7f..9c9d2b402 100644
--- a/desktop/netsurf.h
+++ b/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"
diff --git a/include/netsurf/search.h b/include/netsurf/search.h
index 0b02ac8bb..1246ea984 100644
--- a/include/netsurf/search.h
+++ b/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.
diff --git a/include/netsurf/utf8.h b/include/netsurf/utf8.h
index c40c4c1b3..04499e504 100644
--- a/include/netsurf/utf8.h
+++ b/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.
diff --git a/include/netsurf/window.h b/include/netsurf/window.h
index 7ecd3c21d..8b3e9c4f4 100644
--- a/include/netsurf/window.h
+++ b/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,