mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-02 07:35:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove all unecessary desktop/browser.h includes

Browse Source
This commit is contained in:
Vincent Sanders 2014-10-17 10:48:50 +01:00
parent 057e435b28
commit 56731e1dbb
22 changed files with 99 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
atari/about.c
View File

@ -23,6 +23,15 @@
#include <stdbool.h>
#include <stdint.h>
#include "testament.h"
#include "utils/useragent.h"
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "desktop/version.h"
#include "desktop/browser.h"
#include "curl/curlver.h"
#include "cflib.h"
#include "atari/misc.h"
#include "atari/plot/plot.h"
@ -30,21 +39,11 @@
#include "atari/res/netsurf.rsh"
#include "atari/about.h"
#include "testament.h"
#include "utils/useragent.h"
#include "desktop/version.h"
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "curl/curlver.h"
static OBJECT * about_form = NULL;
static char * infocontent;
static char version[32];
VdiHdl vdihandle;
static short __CDECL about_userdraw(PARMBLK *parmblock)
{
short pxy[8];

7
atari/bitmap.c
View File

@ -19,14 +19,15 @@
#include <inttypes.h>
#include <sys/types.h>
#include <string.h>
#include "assert.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "image/bitmap.h"
#include "desktop/mouse.h"
#include "atari/bitmap.h"
#include "atari/plot/plot.h"
#include "utils/log.h"
/*

1
atari/certview.c
View File

@ -27,7 +27,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "desktop/browser.h"
#include "content/urldb.h"
#include "content/hlcache.h"
#include "desktop/sslcert_viewer.h"

3
atari/cookies.c
View File

@ -26,11 +26,10 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "desktop/browser.h"
#include "utils/nsoption.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
#include "utils/nsoption.h"
#include "desktop/cookie_manager.h"
#include "desktop/tree.h"
#include "desktop/core_window.h"

1
atari/ctxmenu.c
View File

@ -31,7 +31,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/textinput.h"

6
atari/deskmenu.c
View File

@ -21,10 +21,10 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
#include "utils/nsoption.h"
#include "desktop/browser_private.h"
#include "desktop/save_complete.h"
#include "atari/res/netsurf.rsh"
#include "atari/gemtk/gemtk.h"
#include "atari/deskmenu.h"
@ -33,13 +33,11 @@
#include "atari/cookies.h"
#include "atari/toolbar.h"
#include "atari/settings.h"
#include "atari/search.h"
#include "atari/misc.h"
#include "atari/gui.h"
#include "atari/findfile.h"
#include "atari/about.h"
#include "atari/plot/plot.h"
#include "atari/rootwin.h"
typedef void __CDECL (*menu_evnt_func)(short item, short title, void * data);

1
atari/findfile.c
View File

@ -29,7 +29,6 @@
#include "utils/url.h"
#include "atari/gemtk/gemtk.h"
#include "atari/findfile.h"
#include "atari/gui.h"
#include "atari/misc.h"
#include "atari/osspec.h"

1
atari/gui.h
View File

@ -22,7 +22,6 @@
#include <stdbool.h>
#include <mt_gem.h>
#include "atari/search.h"
#include "atari/redrawslots.h"
#include "atari/gemtk/gemtk.h"

1
atari/history.c
View File

@ -29,7 +29,6 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "desktop/browser.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"

1
atari/hotlist.c
View File

@ -27,7 +27,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "desktop/browser.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"

2
atari/login.c
View File

@ -30,8 +30,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
#include "desktop/browser.h"
#include "content/urldb.h"
#include "content/fetch.h"
#include "atari/misc.h"

53
atari/plot/font_freetype.c
View File

@ -1,30 +1,31 @@
/*
* Copyright 2005 James Bursa <bursa@users.sourceforge.net>
* 2008 Vincent Sanders <vince@simtec.co.uk>
* 2011 Ole Loots <ole@monochrom.net>
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
* NetSurf is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* NetSurf is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef WITH_FREETYPE_FONT_DRIVER
/*
* Copyright 2005 James Bursa <bursa@users.sourceforge.net>
* 2008 Vincent Sanders <vince@simtec.co.uk>
* 2011 Ole Loots <ole@monochrom.net>
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
* NetSurf is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* NetSurf is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ft2build.h>
#include FT_CACHE_H
#include "utils/nsoption.h"
#include "css/css.h"
#include "atari/plot/plot.h"
#ifdef WITH_FREETYPE_FONT_DRIVER
#include <ft2build.h>
#include FT_CACHE_H
#include "utils/nsoption.h"
#include "desktop/mouse.h"
#include "atari/plot/plot.h"
#include "atari/plot/font_freetype.h"
#include "atari/findfile.h"

8
atari/plot/font_internal.c
View File

@ -19,12 +19,16 @@
#ifdef WITH_INTERNAL_FONT_DRIVER
#include <unistd.h>
#include "utils/utf8.h"
#include "utils/log.h"
#include "desktop/mouse.h"
#include "atari/plot/plot.h"
#include "atari/plot/fontplot.h"
#include "atari/plot/font_internal.h"
#include "utils/utf8.h"
#include "utils/log.h"
extern unsigned long atari_plot_flags;
extern int atari_plot_vdi_handle;

2
atari/plot/fontplot.c
View File

@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "desktop/mouse.h"
#include "atari/plot/fontplot.h"
const struct s_font_driver_table_entry font_driver_table[] =

2
atari/plot/plot.c
View File

@ -30,9 +30,9 @@
#include "utils/utf8.h"
#include "utils/utils.h"
#include "desktop/plotters.h"
#include "desktop/mouse.h"
#include "atari/bitmap.h"
#include "atari/gui.h"
#include "utils/nsoption.h"
#include "atari/plot/plot.h"

1
atari/rootwin.c
View File

@ -37,7 +37,6 @@
#include <mt_gem.h>
#include "utils/log.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"

1
atari/search.c
View File

@ -27,7 +27,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
#include "desktop/search.h"
#include "desktop/gui_search.h"

79
atari/search.h
View File

@ -1,52 +1,43 @@
/*
* Copyright 2013 Ole Loots <ole@monochrom.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
* NetSurf is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* NetSurf is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Module Description:
*
*
*
*/
/*
* Copyright 2013 Ole Loots <ole@monochrom.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
* NetSurf is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* NetSurf is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "desktop/browser.h"
#include "desktop/search.h"
#ifndef NS_ATARI_SEARCH_H
#define NS_ATARI_SEARCH_H
#ifndef NS_ATARI_SEARCH_H
#define NS_ATARI_SEARCH_H
#define SEARCH_MAX_SLEN 24
struct gui_window;
struct browser_window;
struct s_search_form_state
{
char text[32];
struct browser_window;
struct s_search_form_state {
char text[32];
uint32_t flags;
bool back_avail;
};
struct s_search_form_session {
struct browser_window * bw;
struct s_search_form_state state;
};
typedef struct s_search_form_session * SEARCH_FORM_SESSION;
bool back_avail;
};
struct s_search_form_session {
struct browser_window *bw;
struct s_search_form_state state;
};
typedef struct s_search_form_session * SEARCH_FORM_SESSION;
struct s_search_form_session * nsatari_search_session_create(OBJECT * obj,
struct browser_window *bw);
@ -56,5 +47,5 @@ void nsatari_search_session_destroy(struct s_search_form_session *s);
void nsatari_search_perform(struct s_search_form_session *s, OBJECT *obj,
search_flags_t f);
void nsatari_search_restore_form( struct s_search_form_session *s, OBJECT *obj);
#endif

2
atari/statusbar.c
View File

@ -28,7 +28,6 @@
#include <math.h>
#include "utils/log.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"
@ -36,7 +35,6 @@
#include "atari/statusbar.h"
#include "atari/rootwin.h"
#include "atari/misc.h"
#include "atari/res/netsurf.rsh"
#include "atari/plot/plot.h"
#include "atari/osspec.h"

16
atari/toolbar.c
View File

@ -28,7 +28,9 @@
#include <math.h>
#include "utils/log.h"
#include "desktop/browser.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
#include "utils/utf8.h"
#include "desktop/browser_history.h"
#include "desktop/browser_private.h"
#include "desktop/mouse.h"
@ -36,24 +38,20 @@
#include "desktop/plotters.h"
#include "desktop/tree.h"
#include "desktop/hotlist.h"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
#include "content/hlcache.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
#include "utils/utf8.h"
#include "atari/clipboard.h"
#include "atari/gui.h"
#include "atari/search.h"
#include "atari/toolbar.h"
#include "atari/rootwin.h"
#include "atari/clipboard.h"
#include "atari/misc.h"
#include "atari/plot/plot.h"
#include "cflib.h"
#include "atari/res/netsurf.rsh"
#include "desktop/textarea.h"
#include "desktop/textinput.h"
#include "content/hlcache.h"
#include "atari/encoding.h"

3
atari/toolbar.h
View File

@ -22,9 +22,6 @@
#include <stdbool.h>
#include <stdint.h>
#include "desktop/textarea.h"
#include "desktop/browser.h"
struct s_toolbar;
struct nsurl;

11
atari/treeview.c
View File

@ -20,19 +20,18 @@
#include <sys/types.h>
#include <string.h>
#include "assert.h"
#include "cflib.h"
#include "utils/nsoption.h"
#include "content/urldb.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "desktop/mouse.h"
#include "desktop/treeview.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/urldb.h"
#include "desktop/plotters.h"
#include "desktop/mouse.h"
#include "desktop/treeview.h"
#include "atari/gui.h"
#include "atari/plot/plot.h"
#include "atari/misc.h"