diff options
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/401login.h | 6 | ||||
-rw-r--r-- | desktop/browser.c | 52 | ||||
-rw-r--r-- | desktop/browser.h | 2 | ||||
-rw-r--r-- | desktop/frames.c | 18 | ||||
-rw-r--r-- | desktop/frames.h | 4 | ||||
-rw-r--r-- | desktop/gesture_core.c | 4 | ||||
-rw-r--r-- | desktop/gui.h | 6 | ||||
-rw-r--r-- | desktop/history_core.c | 22 | ||||
-rw-r--r-- | desktop/knockout.c | 8 | ||||
-rw-r--r-- | desktop/knockout.h | 2 | ||||
-rw-r--r-- | desktop/netsurf.c | 24 | ||||
-rw-r--r-- | desktop/options.c | 22 | ||||
-rw-r--r-- | desktop/plotters.h | 2 | ||||
-rw-r--r-- | desktop/save_text.c | 12 | ||||
-rw-r--r-- | desktop/selection.c | 18 | ||||
-rw-r--r-- | desktop/selection.h | 4 | ||||
-rw-r--r-- | desktop/textinput.c | 24 | ||||
-rw-r--r-- | desktop/tree.c | 12 |
18 files changed, 121 insertions, 121 deletions
diff --git a/desktop/401login.h b/desktop/401login.h index e88c7638f..aaa32498e 100644 --- a/desktop/401login.h +++ b/desktop/401login.h @@ -8,9 +8,9 @@ #ifndef NETSURF_DESKTOP_401LOGIN_H #define NETSURF_DESKTOP_401LOGIN_H -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/desktop/browser.h" +#include "utils/config.h" +#include "content/content.h" +#include "desktop/browser.h" #ifdef WITH_AUTH diff --git a/desktop/browser.c b/desktop/browser.c index dbbe30251..ca1885cbb 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -22,34 +22,34 @@ #include <string.h> #include <sys/select.h> #include "curl/curl.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/fetch.h" -#include "netsurf/content/fetchcache.h" -#include "netsurf/content/urldb.h" -#include "netsurf/css/css.h" +#include "utils/config.h" +#include "content/fetch.h" +#include "content/fetchcache.h" +#include "content/urldb.h" +#include "css/css.h" #ifdef WITH_AUTH -#include "netsurf/desktop/401login.h" +#include "desktop/401login.h" #endif -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/frames.h" -#include "netsurf/desktop/history_core.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/options.h" -#include "netsurf/desktop/selection.h" -#include "netsurf/desktop/textinput.h" -#include "netsurf/desktop/gesture_core.h" -#include "netsurf/render/box.h" -#include "netsurf/render/form.h" -#include "netsurf/render/font.h" -#include "netsurf/render/imagemap.h" -#include "netsurf/render/layout.h" -#include "netsurf/render/textplain.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/talloc.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/utf8.h" +#include "desktop/browser.h" +#include "desktop/frames.h" +#include "desktop/history_core.h" +#include "desktop/gui.h" +#include "desktop/options.h" +#include "desktop/selection.h" +#include "desktop/textinput.h" +#include "desktop/gesture_core.h" +#include "render/box.h" +#include "render/form.h" +#include "render/font.h" +#include "render/imagemap.h" +#include "render/layout.h" +#include "render/textplain.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/talloc.h" +#include "utils/url.h" +#include "utils/utils.h" +#include "utils/utf8.h" /** browser window which is being redrawn. Valid only during redraw. */ struct browser_window *current_redraw_browser; diff --git a/desktop/browser.h b/desktop/browser.h index 090055999..676921dc3 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -16,7 +16,7 @@ #include <stdbool.h> #include <stddef.h> #include <time.h> -#include "netsurf/render/html.h" +#include "render/html.h" struct box; struct content; diff --git a/desktop/frames.c b/desktop/frames.c index bfc644ffe..b08bdde97 100644 --- a/desktop/frames.c +++ b/desktop/frames.c @@ -17,15 +17,15 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include "netsurf/utils/config.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/frames.h" -#include "netsurf/desktop/history_core.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/selection.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "desktop/browser.h" +#include "desktop/frames.h" +#include "desktop/history_core.h" +#include "desktop/gui.h" +#include "desktop/selection.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" /** maximum frame resize margin */ #define FRAME_RESIZE 6 diff --git a/desktop/frames.h b/desktop/frames.h index d3acccd2a..ef7aeb4a2 100644 --- a/desktop/frames.h +++ b/desktop/frames.h @@ -12,8 +12,8 @@ #ifndef _NETSURF_DESKTOP_FRAMES_H_ #define _NETSURF_DESKTOP_FRAMES_H_ -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/gui.h" +#include "desktop/browser.h" +#include "desktop/gui.h" void browser_window_create_iframes(struct browser_window *bw, diff --git a/desktop/gesture_core.c b/desktop/gesture_core.c index 40d4295af..6ee3a05db 100644 --- a/desktop/gesture_core.c +++ b/desktop/gesture_core.c @@ -9,8 +9,8 @@ * Mouse gesture core (implementation) */ -#include "netsurf/utils/log.h" -#include "netsurf/desktop/gesture_core.h" +#include "utils/log.h" +#include "desktop/gesture_core.h" #include <string.h> #include <math.h> #include <stdlib.h> diff --git a/desktop/gui.h b/desktop/gui.h index 25cac55ca..a38a6f6a5 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -41,9 +41,9 @@ typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, GUI_POINTER_PROGRESS } gui_pointer_shape; #include <stdbool.h> -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/desktop/browser.h" +#include "utils/config.h" +#include "content/content.h" +#include "desktop/browser.h" extern struct gui_window *search_current_window; diff --git a/desktop/history_core.c b/desktop/history_core.c index 8ebd0bf90..62fc8096c 100644 --- a/desktop/history_core.c +++ b/desktop/history_core.c @@ -15,17 +15,17 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/css/css.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/history_core.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/image/bitmap.h" -#include "netsurf/render/font.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "content/content.h" +#include "content/urldb.h" +#include "css/css.h" +#include "desktop/gui.h" +#include "desktop/history_core.h" +#include "desktop/plotters.h" +#include "image/bitmap.h" +#include "render/font.h" +#include "utils/log.h" +#include "utils/url.h" +#include "utils/utils.h" #define WIDTH 100 diff --git a/desktop/knockout.c b/desktop/knockout.c index e2333d1ad..2013ef65b 100644 --- a/desktop/knockout.c +++ b/desktop/knockout.c @@ -13,10 +13,10 @@ #include <assert.h> #include <string.h> -#include "netsurf/desktop/knockout.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/image/bitmap.h" -#include "netsurf/utils/log.h" +#include "desktop/knockout.h" +#include "desktop/plotters.h" +#include "image/bitmap.h" +#include "utils/log.h" #define KNOCKOUT_ENTRIES 3072 /* 40 bytes each */ #define KNOCKOUT_BOXES 768 /* 28 bytes each */ diff --git a/desktop/knockout.h b/desktop/knockout.h index 29718f9b5..8305f416b 100644 --- a/desktop/knockout.h +++ b/desktop/knockout.h @@ -9,7 +9,7 @@ * Knockout rendering (interface). */ -#include "netsurf/desktop/plotters.h" +#include "desktop/plotters.h" bool knockout_plot_start(struct plotter_table *plotter); diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 89d57341b..948e29e06 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -15,20 +15,20 @@ #include <libxml/encoding.h> #include <libxml/globals.h> #include <libxml/xmlversion.h> -#include "netsurf/utils/config.h" -#include "netsurf/content/fetch.h" -#include "netsurf/content/fetchcache.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/gui.h" +#include "utils/config.h" +#include "content/fetch.h" +#include "content/fetchcache.h" +#include "content/urldb.h" +#include "desktop/netsurf.h" +#include "desktop/browser.h" +#include "desktop/gui.h" #ifdef riscos -#include "netsurf/riscos/buffer.h" +#include "riscos/buffer.h" #endif -#include "netsurf/utils/log.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "utils/log.h" +#include "utils/url.h" +#include "utils/utf8.h" +#include "utils/utils.h" bool netsurf_quit = false; bool verbose_log = false; diff --git a/desktop/options.c b/desktop/options.c index 3875a1d73..659c5b78a 100644 --- a/desktop/options.c +++ b/desktop/options.c @@ -19,20 +19,20 @@ #include <stdbool.h> #include <stdio.h> #include <string.h> -#include "libxml/HTMLparser.h" -#include "libxml/HTMLtree.h" -#include "netsurf/content/urldb.h" -#include "netsurf/css/css.h" -#include "netsurf/desktop/options.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include <libxml/HTMLparser.h> +#include <libxml/HTMLtree.h> +#include "content/urldb.h" +#include "css/css.h" +#include "desktop/options.h" +#include "desktop/tree.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #if defined(riscos) -#include "netsurf/riscos/options.h" +#include "riscos/options.h" #elif defined(nsgtk) -#include "netsurf/gtk/options.h" +#include "gtk/options.h" #else #define EXTRA_OPTION_DEFINE #define EXTRA_OPTION_TABLE diff --git a/desktop/plotters.h b/desktop/plotters.h index 57b9dc9c7..e543aa4ca 100644 --- a/desktop/plotters.h +++ b/desktop/plotters.h @@ -13,7 +13,7 @@ #define _NETSURF_DESKTOP_PLOTTERS_H_ #include <stdbool.h> -#include "netsurf/css/css.h" +#include "css/css.h" struct bitmap; diff --git a/desktop/save_text.c b/desktop/save_text.c index 78d04a2a0..c3dc799f4 100644 --- a/desktop/save_text.c +++ b/desktop/save_text.c @@ -8,13 +8,13 @@ #include <stdbool.h> #include <string.h> -#include "libxml/HTMLtree.h" +#include <libxml/HTMLtree.h> -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/desktop/save_text.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "content/content.h" +#include "desktop/save_text.h" +#include "utils/log.h" +#include "utils/utils.h" #ifdef WITH_TEXT_EXPORT diff --git a/desktop/selection.c b/desktop/selection.c index c6578ec9f..8e7d282ae 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -14,15 +14,15 @@ #include <stdlib.h> #include <stdbool.h> -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/desktop/selection.h" -#include "netsurf/render/box.h" -#include "netsurf/render/form.h" -#include "netsurf/render/textplain.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "desktop/gui.h" +#include "desktop/plotters.h" +#include "desktop/selection.h" +#include "render/box.h" +#include "render/form.h" +#include "render/textplain.h" +#include "utils/log.h" +#include "utils/utf8.h" +#include "utils/utils.h" /** diff --git a/desktop/selection.h b/desktop/selection.h index 779740439..1753775dc 100644 --- a/desktop/selection.h +++ b/desktop/selection.h @@ -12,8 +12,8 @@ #ifndef _NETSURF_DESKTOP_SELECTION_H_ #define _NETSURF_DESKTOP_SELECTION_H_ -#include "netsurf/desktop/browser.h" -#include "netsurf/render/box.h" +#include "desktop/browser.h" +#include "render/box.h" typedef enum { diff --git a/desktop/textinput.c b/desktop/textinput.c index 9df89c66c..bd67836e3 100644 --- a/desktop/textinput.c +++ b/desktop/textinput.c @@ -17,19 +17,19 @@ #include <ctype.h> #include <string.h> -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/selection.h" -#include "netsurf/desktop/textinput.h" -#include "netsurf/render/box.h" -#include "netsurf/render/font.h" -#include "netsurf/render/form.h" -#include "netsurf/render/layout.h" +#include "desktop/browser.h" +#include "desktop/gui.h" +#include "desktop/selection.h" +#include "desktop/textinput.h" +#include "render/box.h" +#include "render/font.h" +#include "render/form.h" +#include "render/layout.h" #define NDEBUG -#include "netsurf/utils/log.h" -#include "netsurf/utils/talloc.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "utils/log.h" +#include "utils/talloc.h" +#include "utils/utf8.h" +#include "utils/utils.h" /** ghost caret used to indicate the insertion point when dragging text diff --git a/desktop/tree.c b/desktop/tree.c index 5af782878..1ffbcfd6e 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -14,12 +14,12 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/desktop/options.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "content/urldb.h" +#include "desktop/tree.h" +#include "desktop/options.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" static void tree_draw_node(struct tree *tree, struct node *node, int clip_x, int clip_y, int clip_width, int clip_height); |