From f236e7d6b7a80a3d95e278fdfa127be6fc1f7ea0 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 11 Jun 2016 18:44:20 +0100 Subject: remove unecessary content header inclusion from beos frontend --- frontends/beos/bitmap.cpp | 1 - frontends/beos/cookies.cpp | 6 +++--- frontends/beos/fetch_rsrc.cpp | 21 +++++++++++---------- frontends/beos/filetype.cpp | 3 +-- frontends/beos/gui.cpp | 5 ----- frontends/beos/gui.h | 17 ++++++++--------- frontends/beos/login.cpp | 40 +++++++++++++++++++++------------------- frontends/beos/scaffolding.cpp | 21 +++++++++++---------- frontends/beos/schedule.cpp | 2 +- frontends/beos/window.cpp | 32 ++++++++++++++++---------------- 10 files changed, 72 insertions(+), 76 deletions(-) (limited to 'frontends/beos') diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp index 9d16d44a3..68d8442ab 100644 --- a/frontends/beos/bitmap.cpp +++ b/frontends/beos/bitmap.cpp @@ -43,7 +43,6 @@ extern "C" { #include "netsurf/browser_window.h" #include "netsurf/bitmap.h" #include "netsurf/content.h" -#include "content/urldb.h" } #include "beos/bitmap.h" diff --git a/frontends/beos/cookies.cpp b/frontends/beos/cookies.cpp index d4c8e5b26..0a417a259 100644 --- a/frontends/beos/cookies.cpp +++ b/frontends/beos/cookies.cpp @@ -21,13 +21,13 @@ #include #include extern "C" { -#include "netsurf/mouse.h" #include "utils/log.h" -#include "desktop/cookie_manager.h" +#include "netsurf/mouse.h" #include "netsurf/plotters.h" +#include "content/urldb.h" +#include "desktop/cookie_manager.h" #include "desktop/tree.h" #include "desktop/textinput.h" -#include "content/urldb.h" } #include "beos/cookies.h" diff --git a/frontends/beos/fetch_rsrc.cpp b/frontends/beos/fetch_rsrc.cpp index b771f7b2d..02180556f 100644 --- a/frontends/beos/fetch_rsrc.cpp +++ b/frontends/beos/fetch_rsrc.cpp @@ -30,26 +30,27 @@ #include #include #include -#include /* for URL unescaping functions */ +#include +#include +#include +#include + extern "C" { #include "utils/config.h" -#include "content/fetch.h" -#include "content/fetchers.h" -#include "content/urldb.h" #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" #include "utils/ring.h" #include "utils/base64.h" +#include "content/fetch.h" +#include "content/fetchers.h" } + #include "beos/fetch_rsrc.h" #include "beos/filetype.h" #include "beos/gui.h" -#include -#include -#include struct fetch_rsrc_context { struct fetch *parent_fetch; @@ -151,10 +152,10 @@ static bool fetch_rsrc_process(struct fetch_rsrc_context *c) { fetch_msg msg; char *params; - char *at = NULL; + //char *at = NULL; char *slash; - char *comma = NULL; - char *unescaped; + //char *comma = NULL; + //char *unescaped; uint32 type = 'data'; // default for embeded files int32 id = 0; diff --git a/frontends/beos/filetype.cpp b/frontends/beos/filetype.cpp index 75a33240a..7a2ca97e5 100644 --- a/frontends/beos/filetype.cpp +++ b/frontends/beos/filetype.cpp @@ -31,7 +31,6 @@ #include extern "C" { -#include "content/fetch.h" #include "utils/log.h" #include "utils/hashtable.h" #include "utils/utils.h" @@ -91,7 +90,7 @@ void beos_fetch_filetype_fin(void) const char *fetch_filetype(const char *unix_path) { - struct stat statbuf; + // struct stat statbuf; status_t err; int i; // NOT THREADSAFE diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp index 100607aad..63378257f 100644 --- a/frontends/beos/gui.cpp +++ b/frontends/beos/gui.cpp @@ -61,12 +61,7 @@ extern "C" { #include "netsurf/netsurf.h" #include "netsurf/content.h" #include "netsurf/browser_window.h" -#include "content/content.h" -#include "content/content_protected.h" -#include "content/fetch.h" #include "content/fetchers.h" -#include "content/fetchers/resource.h" -#include "content/hlcache.h" #include "content/urldb.h" } diff --git a/frontends/beos/gui.h b/frontends/beos/gui.h index 774820baa..debb5f339 100644 --- a/frontends/beos/gui.h +++ b/frontends/beos/gui.h @@ -35,8 +35,7 @@ extern bool nsbeos_done; extern bool replicated; int gui_init_replicant(int argc, char** argv); -extern "C" void gui_401login_open(nsurl *url, const char *realm, - nserror (*cb)(bool proceed, void *pw), void *cbpw); +extern "C" void gui_401login_open(struct nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw); extern "C" void nsbeos_gui_poll(void); @@ -44,15 +43,15 @@ extern char *options_file_location; class NSBrowserApplication : public BApplication { public: - NSBrowserApplication(); -virtual ~NSBrowserApplication(); + NSBrowserApplication(); + virtual ~NSBrowserApplication(); -virtual void MessageReceived(BMessage *message); -virtual void RefsReceived(BMessage *message); -virtual void ArgvReceived(int32 argc, char **argv); + virtual void MessageReceived(BMessage *message); + virtual void RefsReceived(BMessage *message); + virtual void ArgvReceived(int32 argc, char **argv); -virtual void AboutRequested(); -virtual bool QuitRequested(); + virtual void AboutRequested(); + virtual bool QuitRequested(); }; extern BWindow *wndAbout; diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp index ad09d86af..85062987c 100644 --- a/frontends/beos/login.cpp +++ b/frontends/beos/login.cpp @@ -26,40 +26,42 @@ #include #include #include + extern "C" { #include "utils/log.h" -#include "content/content.h" -#include "content/urldb.h" -#include "netsurf/browser_window.h" #include "utils/messages.h" #include "utils/url.h" #include "utils/utils.h" +#include "utils/nsurl.h" +#include "netsurf/content_type.h" +#include "netsurf/browser_window.h" #include "netsurf/clipboard.h" } + #include "beos/gui.h" #include "beos/scaffolding.h" #include "beos/window.h" class LoginAlert : public BAlert { public: - LoginAlert(nserror (*callback)(bool proceed, void *pw), - void *callbaclpw, - nsurl *url, - const char *host, - const char *realm, - const char *text); - virtual ~LoginAlert(); - void MessageReceived(BMessage *message); + LoginAlert(nserror (*callback)(bool proceed, void *pw), + void *callbaclpw, + nsurl *url, + const char *host, + const char *realm, + const char *text); + virtual ~LoginAlert(); + void MessageReceived(BMessage *message); private: - nsurl* fUrl; /**< URL being fetched */ - BString fHost; /**< Host for user display */ - BString fRealm; /**< Authentication realm */ - nserror (*fCallback)(bool proceed, void *pw); - void *fCallbackPw; - - BTextControl *fUserControl; - BTextControl *fPassControl; + nsurl* fUrl; /**< URL being fetched */ + BString fHost; /**< Host for user display */ + BString fRealm; /**< Authentication realm */ + nserror (*fCallback)(bool proceed, void *pw); + void *fCallbackPw; + + BTextControl *fUserControl; + BTextControl *fPassControl; }; static void create_login_window(nsurl *host, diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp index 7d348a966..b3e4293df 100644 --- a/frontends/beos/scaffolding.cpp +++ b/frontends/beos/scaffolding.cpp @@ -51,26 +51,27 @@ #endif #include + extern "C" { -#include "content/content.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/log.h" +#include "utils/nsurl.h" +#include "netsurf/netsurf.h" +#include "netsurf/plotters.h" +#include "netsurf/clipboard.h" +#include "netsurf/content.h" +#include "netsurf/content_type.h" #include "desktop/browser_history.h" #include "netsurf/browser_window.h" -#include "netsurf/netsurf.h" #include "desktop/version.h" #include "desktop/searchweb.h" #include "desktop/search.h" -#include "netsurf/plotters.h" #include "utils/nsoption.h" #include "desktop/textinput.h" #include "render/form.h" -#include "utils/messages.h" -#include "utils/utils.h" -#include "utils/log.h" -#include "utils/nsurl.h" -#include "netsurf/clipboard.h" -#include "netsurf/content.h" -#include "netsurf/content_type.h" } + #include "beos/about.h" #include "beos/bitmap.h" #include "beos/gui.h" diff --git a/frontends/beos/schedule.cpp b/frontends/beos/schedule.cpp index 171d74545..e96e56d81 100644 --- a/frontends/beos/schedule.cpp +++ b/frontends/beos/schedule.cpp @@ -25,7 +25,7 @@ extern "C" { #include "utils/errors.h" #include "beos/schedule.h" -#include "content/content.h" +#include "netsurf/content_type.h" #include "netsurf/browser_window.h" #ifdef DEBUG_BEOS_SCHEDULE diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp index 237d92ab1..dd1e729ce 100644 --- a/frontends/beos/window.cpp +++ b/frontends/beos/window.cpp @@ -21,20 +21,32 @@ #define __STDBOOL_H__ 1 #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include extern "C" { #include "utils/nsoption.h" #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" -#include "content/content.h" -#include "content/urldb.h" +#include "netsurf/content_type.h" #include "netsurf/browser_window.h" #include "netsurf/mouse.h" -#include "desktop/textinput.h" #include "netsurf/plotters.h" #include "netsurf/window.h" #include "netsurf/clipboard.h" +#include "content/urldb.h" +#include "desktop/textinput.h" } #include "beos/about.h" @@ -44,18 +56,6 @@ extern "C" { #include "beos/scaffolding.h" #include "beos/plotters.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include class NSBrowserFrameView; @@ -680,7 +680,7 @@ void nsbeos_dispatch_event(BMessage *message) void nsbeos_window_expose_event(BView *view, gui_window *g, BMessage *message) { BRect updateRect; - float scale = g->scale; + //float scale = g->scale; struct rect clip; struct redraw_context ctx = { true, true, &nsbeos_plotters }; -- cgit v1.2.3