diff options
Diffstat (limited to 'content')
-rw-r--r-- | content/content.c | 46 | ||||
-rw-r--r-- | content/content.h | 28 | ||||
-rw-r--r-- | content/content_type.h | 2 | ||||
-rw-r--r-- | content/fetch.c | 20 | ||||
-rw-r--r-- | content/fetch.h | 2 | ||||
-rw-r--r-- | content/fetchcache.c | 18 | ||||
-rw-r--r-- | content/fetchcache.h | 2 | ||||
-rw-r--r-- | content/urldb.c | 20 | ||||
-rw-r--r-- | content/urldb.h | 4 |
9 files changed, 71 insertions, 71 deletions
diff --git a/content/content.c b/content/content.c index dd2f3b103..53c72d81c 100644 --- a/content/content.c +++ b/content/content.c @@ -20,45 +20,45 @@ #include <string.h> #include <strings.h> #include <time.h> -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/content/fetch.h" -#include "netsurf/content/fetchcache.h" -#include "netsurf/css/css.h" -#include "netsurf/image/bitmap.h" -#include "netsurf/desktop/options.h" -#include "netsurf/render/directory.h" -#include "netsurf/render/html.h" -#include "netsurf/render/textplain.h" +#include "utils/config.h" +#include "content/content.h" +#include "content/fetch.h" +#include "content/fetchcache.h" +#include "css/css.h" +#include "image/bitmap.h" +#include "desktop/options.h" +#include "render/directory.h" +#include "render/html.h" +#include "render/textplain.h" #ifdef WITH_JPEG -#include "netsurf/image/jpeg.h" +#include "image/jpeg.h" #endif #ifdef WITH_MNG -#include "netsurf/image/mng.h" +#include "image/mng.h" #endif #ifdef WITH_GIF -#include "netsurf/image/gif.h" +#include "image/gif.h" #endif #ifdef WITH_BMP -#include "netsurf/image/bmp.h" -#include "netsurf/image/ico.h" +#include "image/bmp.h" +#include "image/ico.h" #endif #ifdef WITH_SPRITE -#include "netsurf/riscos/sprite.h" +#include "riscos/sprite.h" #endif #ifdef WITH_DRAW -#include "netsurf/riscos/draw.h" +#include "riscos/draw.h" #endif #ifdef WITH_PLUGIN -#include "netsurf/riscos/plugin.h" +#include "riscos/plugin.h" #endif #ifdef WITH_ARTWORKS -#include "netsurf/riscos/artworks.h" +#include "riscos/artworks.h" #endif -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/talloc.h" -#include "netsurf/utils/utils.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/talloc.h" +#include "utils/utils.h" /** Linked list of all content structures. May include more than one content diff --git a/content/content.h b/content/content.h index 0eb7c3e4c..8c6235342 100644 --- a/content/content.h +++ b/content/content.h @@ -16,35 +16,35 @@ #define _NETSURF_DESKTOP_CONTENT_H_ #include <stdint.h> -#include "netsurf/utils/config.h" -#include "netsurf/content/content_type.h" -#include "netsurf/css/css.h" -#include "netsurf/render/html.h" -#include "netsurf/render/textplain.h" +#include "utils/config.h" +#include "content/content_type.h" +#include "css/css.h" +#include "render/html.h" +#include "render/textplain.h" #ifdef WITH_JPEG -#include "netsurf/image/jpeg.h" +#include "image/jpeg.h" #endif #ifdef WITH_GIF -#include "netsurf/image/gif.h" +#include "image/gif.h" #endif #ifdef WITH_BMP -#include "netsurf/image/bmp.h" -#include "netsurf/image/ico.h" +#include "image/bmp.h" +#include "image/ico.h" #endif #ifdef WITH_PLUGIN -#include "netsurf/riscos/plugin.h" +#include "riscos/plugin.h" #endif #ifdef WITH_MNG -#include "netsurf/image/mng.h" +#include "image/mng.h" #endif #ifdef WITH_SPRITE -#include "netsurf/riscos/sprite.h" +#include "riscos/sprite.h" #endif #ifdef WITH_DRAW -#include "netsurf/riscos/draw.h" +#include "riscos/draw.h" #endif #ifdef WITH_ARTWORKS -#include "netsurf/riscos/artworks.h" +#include "riscos/artworks.h" #endif diff --git a/content/content_type.h b/content/content_type.h index dc6483f3f..b86254a52 100644 --- a/content/content_type.h +++ b/content/content_type.h @@ -14,7 +14,7 @@ #ifndef _NETSURF_DESKTOP_CONTENT_TYPE_H_ #define _NETSURF_DESKTOP_CONTENT_TYPE_H_ -#include "netsurf/utils/config.h" +#include "utils/config.h" /** The type of a content. */ diff --git a/content/fetch.c b/content/fetch.c index ed2c63670..0462e5900 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -32,20 +32,20 @@ #include <unixlib/local.h> #endif #include <curl/curl.h> -#include "netsurf/utils/config.h" +#include "utils/config.h" #ifdef WITH_SSL #include <openssl/ssl.h> #endif -#include "netsurf/content/fetch.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/desktop/options.h" -#include "netsurf/render/form.h" +#include "content/fetch.h" +#include "content/urldb.h" +#include "desktop/netsurf.h" +#include "desktop/options.h" +#include "render/form.h" #undef NDEBUG -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" bool fetch_active; /**< Fetches in progress, please call fetch_poll(). */ diff --git a/content/fetch.h b/content/fetch.h index 4bf55503c..bf4446830 100644 --- a/content/fetch.h +++ b/content/fetch.h @@ -15,7 +15,7 @@ #include <stdbool.h> #include <sys/select.h> #include <curl/curl.h> -#include "netsurf/utils/config.h" +#include "utils/config.h" typedef enum { FETCH_TYPE, diff --git a/content/fetchcache.c b/content/fetchcache.c index 62d81fe15..080329f6b 100644 --- a/content/fetchcache.c +++ b/content/fetchcache.c @@ -20,15 +20,15 @@ #include <sys/types.h> #include <regex.h> #include <time.h> -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/content/fetchcache.h" -#include "netsurf/content/fetch.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 "utils/config.h" +#include "content/content.h" +#include "content/fetchcache.h" +#include "content/fetch.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/talloc.h" +#include "utils/url.h" +#include "utils/utils.h" static char error_page[1000]; diff --git a/content/fetchcache.h b/content/fetchcache.h index bb57fba01..48d617918 100644 --- a/content/fetchcache.h +++ b/content/fetchcache.h @@ -17,7 +17,7 @@ #include <stdbool.h> #include <stdint.h> -#include "netsurf/content/content.h" +#include "content/content.h" struct form_successful_control; diff --git a/content/urldb.c b/content/urldb.c index e84a7f48c..b5d252b7b 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -82,19 +82,19 @@ #include <sys/select.h> #include <curl/curl.h> -#include "netsurf/image/bitmap.h" -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/cookies.h" -#include "netsurf/desktop/options.h" +#include "image/bitmap.h" +#include "content/content.h" +#include "content/urldb.h" +#include "desktop/cookies.h" +#include "desktop/options.h" #ifdef riscos /** \todo lose this */ -#include "netsurf/riscos/bitmap.h" +#include "riscos/bitmap.h" #endif -#include "netsurf/utils/log.h" -#include "netsurf/utils/filename.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "utils/log.h" +#include "utils/filename.h" +#include "utils/url.h" +#include "utils/utils.h" struct cookie_internal_data { char *name; /**< Cookie name */ diff --git a/content/urldb.h b/content/urldb.h index adf13c11b..a22e43e3a 100644 --- a/content/urldb.h +++ b/content/urldb.h @@ -14,8 +14,8 @@ #include <stdbool.h> #include <time.h> -#include "netsurf/content/content.h" -#include "netsurf/content/content_type.h" +#include "content/content.h" +#include "content/content_type.h" typedef enum { COOKIE_NETSCAPE = 0, |