additional risc os header cleanups

This commit is contained in:
Vincent Sanders 2014-06-05 23:01:37 +01:00
parent 766c90d369
commit 72f8e711d7
19 changed files with 77 additions and 51 deletions

View File

@ -22,18 +22,20 @@
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <oslib/wimp.h> #include <oslib/wimp.h>
#include "utils/config.h"
#include "content/content.h" #include "content/content.h"
#include "content/hlcache.h" #include "content/hlcache.h"
#include "content/urldb.h" #include "content/urldb.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "riscos/dialog.h"
#include "riscos/wimp_event.h"
#include "utils/log.h" #include "utils/log.h"
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
#include "riscos/wimp_event.h"
#define ICON_401LOGIN_LOGIN 0 #define ICON_401LOGIN_LOGIN 0
#define ICON_401LOGIN_CANCEL 1 #define ICON_401LOGIN_CANCEL 1
#define ICON_401LOGIN_HOST 2 #define ICON_401LOGIN_HOST 2

View File

@ -34,6 +34,7 @@
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/messages.h" #include "utils/messages.h"
#include "riscos/gui.h"
#include "riscos/dialog.h" #include "riscos/dialog.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"

View File

@ -17,17 +17,19 @@
*/ */
#include <stdbool.h> #include <stdbool.h>
#include "oslib/hourglass.h" #include <oslib/hourglass.h>
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "riscos/dialog.h" #include "utils/filename.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "riscos/gui.h" #include "riscos/gui.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/configure/configure.h" #include "riscos/configure/configure.h"
#include "utils/filename.h" #include "riscos/dialog.h"
#include "utils/messages.h"
#include "utils/utils.h"
#define CACHE_MEMORY_SIZE 3 #define CACHE_MEMORY_SIZE 3

View File

@ -17,16 +17,17 @@
*/ */
#include <stdbool.h> #include <stdbool.h>
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "riscos/dialog.h" #include "utils/messages.h"
#include "utils/utils.h"
#include "riscos/gui.h" #include "riscos/gui.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/configure/configure.h" #include "riscos/configure/configure.h"
#include "utils/messages.h" #include "riscos/dialog.h"
#include "utils/utils.h"
#define CONTENT_BLOCK_ADVERTISEMENTS 2 #define CONTENT_BLOCK_ADVERTISEMENTS 2
#define CONTENT_BLOCK_POPUPS 3 #define CONTENT_BLOCK_POPUPS 3

View File

@ -24,13 +24,14 @@
#include "desktop/plot_style.h" #include "desktop/plot_style.h"
#include "css/css.h" #include "css/css.h"
#include "riscos/dialog.h" #include "riscos/gui.h"
#include "riscos/font.h" #include "riscos/font.h"
#include "riscos/menus.h" #include "riscos/menus.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/configure/configure.h" #include "riscos/configure/configure.h"
#include "riscos/dialog.h"
#define FONT_SANS_FIELD 3 #define FONT_SANS_FIELD 3

View File

@ -17,8 +17,11 @@
*/ */
#include <stdbool.h> #include <stdbool.h>
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "riscos/dialog.h"
#include "riscos/gui.h" #include "riscos/gui.h"
#include "riscos/menus.h" #include "riscos/menus.h"
#include "riscos/url_suggest.h" #include "riscos/url_suggest.h"
@ -26,8 +29,7 @@
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/configure/configure.h" #include "riscos/configure/configure.h"
#include "utils/messages.h" #include "riscos/dialog.h"
#include "utils/utils.h"
#define HOME_URL_FIELD 3 #define HOME_URL_FIELD 3
#define HOME_URL_GRIGHT 4 #define HOME_URL_GRIGHT 4

View File

@ -17,18 +17,21 @@
*/ */
#include <stdbool.h> #include <stdbool.h>
#include "swis.h" #include <swis.h>
#include "oslib/osspriteop.h" #include <oslib/osspriteop.h>
#include "oslib/wimp.h" #include <oslib/wimp.h>
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/configure/configure.h" #include "riscos/configure/configure.h"
#include "riscos/dialog.h" #include "riscos/dialog.h"
#include "riscos/menus.h" #include "riscos/menus.h"
#include "riscos/tinct.h" #include "riscos/tinct.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/utils.h"
#define IMAGE_FOREGROUND_FIELD 3 #define IMAGE_FOREGROUND_FIELD 3

View File

@ -20,12 +20,12 @@
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "riscos/dialog.h"
#include "riscos/gui.h" #include "riscos/gui.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/configure/configure.h" #include "riscos/configure/configure.h"
#include "riscos/dialog.h"
#define INTERFACE_STRIP_EXTNS_OPTION 2 #define INTERFACE_STRIP_EXTNS_OPTION 2
#define INTERFACE_CONFIRM_OVWR_OPTION 3 #define INTERFACE_CONFIRM_OVWR_OPTION 3

View File

@ -18,17 +18,19 @@
*/ */
#include <stdbool.h> #include <stdbool.h>
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "riscos/dialog.h" #include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "riscos/gui.h" #include "riscos/gui.h"
#include "riscos/menus.h" #include "riscos/menus.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/configure/configure.h" #include "riscos/configure/configure.h"
#include "utils/log.h" #include "riscos/dialog.h"
#include "utils/messages.h"
#include "utils/utils.h"
#define LANGUAGE_INTERFACE_FIELD 3 #define LANGUAGE_INTERFACE_FIELD 3

View File

@ -17,16 +17,17 @@
*/ */
#include <stdbool.h> #include <stdbool.h>
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "riscos/dialog.h" #include "utils/messages.h"
#include "utils/utils.h"
#include "riscos/gui.h" #include "riscos/gui.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/configure/configure.h" #include "riscos/configure/configure.h"
#include "utils/messages.h" #include "riscos/dialog.h"
#include "utils/utils.h"
#define SECURITY_REFERRER 2 #define SECURITY_REFERRER 2
#define SECURITY_DURATION_FIELD 6 #define SECURITY_DURATION_FIELD 6

View File

@ -19,11 +19,8 @@
#ifndef _NETSURF_RISCOS_DIALOG_H_ #ifndef _NETSURF_RISCOS_DIALOG_H_
#define _NETSURF_RISCOS_DIALOG_H_ #define _NETSURF_RISCOS_DIALOG_H_
#include <stdbool.h> struct toolbar;
#include <stdlib.h> struct gui_window;
#include "oslib/wimp.h"
#include "riscos/toolbar.h"
#include "riscos/gui.h"
void ro_gui_dialog_init(void); void ro_gui_dialog_init(void);
wimp_w ro_gui_dialog_create(const char *template_name); wimp_w ro_gui_dialog_create(const char *template_name);

View File

@ -80,6 +80,7 @@
#include "riscos/ucstables.h" #include "riscos/ucstables.h"
#include "riscos/filetype.h" #include "riscos/filetype.h"
#include "riscos/font.h" #include "riscos/font.h"
#include "riscos/toolbar.h"
#include "riscos/content-handlers/artworks.h" #include "riscos/content-handlers/artworks.h"
#include "riscos/content-handlers/draw.h" #include "riscos/content-handlers/draw.h"
#include "riscos/content-handlers/sprite.h" #include "riscos/content-handlers/sprite.h"

View File

@ -39,6 +39,7 @@
#include "desktop/netsurf.h" #include "desktop/netsurf.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/configure.h" #include "riscos/configure.h"
#include "riscos/cookies.h" #include "riscos/cookies.h"
#include "riscos/dialog.h" #include "riscos/dialog.h"

View File

@ -40,6 +40,7 @@
#include "desktop/browser_private.h" #include "desktop/browser_private.h"
#include "desktop/plotters.h" #include "desktop/plotters.h"
#include "riscos/gui.h"
#include "riscos/dialog.h" #include "riscos/dialog.h"
#include "riscos/menus.h" #include "riscos/menus.h"
#include "riscos/print.h" #include "riscos/print.h"

View File

@ -25,11 +25,12 @@
#include "utils/utf8.h" #include "utils/utf8.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "riscos/dialog.h" #include "riscos/gui.h"
#include "riscos/query.h" #include "riscos/query.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/ucstables.h" #include "riscos/ucstables.h"
#include "riscos/dialog.h"
#define ICON_QUERY_MESSAGE 0 #define ICON_QUERY_MESSAGE 0
#define ICON_QUERY_YES 1 #define ICON_QUERY_YES 1

View File

@ -27,20 +27,22 @@
#include <string.h> #include <string.h>
#include "oslib/hourglass.h" #include "oslib/hourglass.h"
#include "oslib/wimp.h" #include "oslib/wimp.h"
#include "utils/config.h"
#include "content/content.h" #include "content/content.h"
#include "content/hlcache.h" #include "content/hlcache.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/browser_private.h" #include "desktop/browser_private.h"
#include "desktop/search.h" #include "desktop/search.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/dialog.h" #include "riscos/dialog.h"
#include "riscos/menus.h" #include "riscos/menus.h"
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#define RECENT_SEARCHES 8 #define RECENT_SEARCHES 8

View File

@ -27,6 +27,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "oslib/wimp.h" #include "oslib/wimp.h"
#include "content/content.h" #include "content/content.h"
#include "content/hlcache.h" #include "content/hlcache.h"
@ -36,6 +37,9 @@
#include "desktop/sslcert_viewer.h" #include "desktop/sslcert_viewer.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/tree.h" #include "desktop/tree.h"
#include "utils/log.h"
#include "utils/utils.h"
#include "riscos/dialog.h" #include "riscos/dialog.h"
#include "riscos/sslcert.h" #include "riscos/sslcert.h"
#include "riscos/textarea.h" #include "riscos/textarea.h"
@ -43,8 +47,7 @@
#include "riscos/wimp.h" #include "riscos/wimp.h"
#include "riscos/wimp_event.h" #include "riscos/wimp_event.h"
#include "riscos/wimputils.h" #include "riscos/wimputils.h"
#include "utils/log.h" #include "riscos/gui.h"
#include "utils/utils.h"
#define ICON_SSL_PANE 1 #define ICON_SSL_PANE 1
#define ICON_SSL_REJECT 3 #define ICON_SSL_REJECT 3

View File

@ -24,6 +24,8 @@
#ifndef _NETSURF_RISCOS_SSLCERT_H_ #ifndef _NETSURF_RISCOS_SSLCERT_H_
#define _NETSURF_RISCOS_SSLCERT_H_ #define _NETSURF_RISCOS_SSLCERT_H_
struct node;
void ro_gui_cert_preinitialise(void); void ro_gui_cert_preinitialise(void);
void ro_gui_cert_postinitialise(void); void ro_gui_cert_postinitialise(void);
void ro_gui_cert_open(struct tree *tree, struct node *node); void ro_gui_cert_open(struct tree *tree, struct node *node);

View File

@ -22,19 +22,22 @@
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include "oslib/osfile.h" #include <oslib/osfile.h>
#include "content/content.h" #include <oslib/wimp.h>
#include "content/hlcache.h"
#include "desktop/browser.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "riscos/theme.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "utils/log.h" #include "utils/log.h"
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
#include "riscos/theme.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
static hlcache_handle *theme_install_content = NULL; static hlcache_handle *theme_install_content = NULL;