remove unecessary content header inclusion from beos frontend

This commit is contained in:
Vincent Sanders 2016-06-11 18:44:20 +01:00
parent 3153335fde
commit f236e7d6b7
10 changed files with 80 additions and 84 deletions

View File

@ -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"

View File

@ -21,13 +21,13 @@
#include <stdlib.h>
#include <string.h>
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"

View File

@ -30,26 +30,27 @@
#include <sys/select.h>
#include <sys/stat.h>
#include <sys/utsname.h>
#include <curl/curl.h> /* for URL unescaping functions */
#include <image.h>
#include <Resources.h>
#include <String.h>
#include <libwapcaplet/libwapcaplet.h>
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 <image.h>
#include <Resources.h>
#include <String.h>
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;

View File

@ -31,7 +31,6 @@
#include <String.h>
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

View File

@ -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"
}

View File

@ -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;

View File

@ -26,40 +26,42 @@
#include <TextControl.h>
#include <View.h>
#include <Window.h>
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;
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;
BTextControl *fUserControl;
BTextControl *fPassControl;
};
static void create_login_window(nsurl *host,

View File

@ -51,26 +51,27 @@
#endif
#include <fs_attr.h>
extern "C" {
#include "content/content.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/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 "desktop/version.h"
#include "desktop/searchweb.h"
#include "desktop/search.h"
#include "utils/nsoption.h"
#include "desktop/textinput.h"
#include "render/form.h"
}
#include "beos/about.h"
#include "beos/bitmap.h"
#include "beos/gui.h"

View File

@ -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

View File

@ -21,29 +21,6 @@
#define __STDBOOL_H__ 1
#include <stdlib.h>
#include <assert.h>
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/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/textinput.h"
#include "netsurf/plotters.h"
#include "netsurf/window.h"
#include "netsurf/clipboard.h"
}
#include "beos/about.h"
#include "beos/window.h"
#include "beos/font.h"
#include "beos/gui.h"
#include "beos/scaffolding.h"
#include "beos/plotters.h"
#include <AppDefs.h>
#include <BeBuild.h>
#include <Clipboard.h>
@ -57,6 +34,29 @@ extern "C" {
#include <View.h>
#include <Window.h>
extern "C" {
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
#include "netsurf/content_type.h"
#include "netsurf/browser_window.h"
#include "netsurf/mouse.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"
#include "beos/window.h"
#include "beos/font.h"
#include "beos/gui.h"
#include "beos/scaffolding.h"
#include "beos/plotters.h"
class NSBrowserFrameView;
struct gui_window {
@ -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 };