Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/6da3b3102c013b18b6f490d9030e5c2be531fe42
...commit
http://git.netsurf-browser.org/netsurf.git/commit/6da3b3102c013b18b6f490d9030e5c2be531fe42
...tree
http://git.netsurf-browser.org/netsurf.git/tree/6da3b3102c013b18b6f490d9030e5c2be531fe42
The branch, master has been updated
via 6da3b3102c013b18b6f490d9030e5c2be531fe42 (commit)
via 4f9dc971414cc9a26cce886370787899e1c86d18 (commit)
via 4bf89b5948ca15a123086409db894a81365cf3c8 (commit)
via d8d0ad3b49147bfc76b754507dd846c5904bbbc2 (commit)
from 99299845e71df9e534e3ae7d4f78e80a46102b3e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6da3b3102c013b18b6f490d9030e5c2be531fe42
commit 6da3b3102c013b18b6f490d9030e5c2be531fe42
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove unused warn_user API
diff --git a/utils/utils.c b/utils/utils.c
index 22af9d6..1509a6b 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -32,12 +32,6 @@
#include <errno.h>
#include <curl/curl.h>
-/* required for depricated warn_user interface */
-#include <stdbool.h>
-#include "utils/errors.h"
-#include "desktop/gui_misc.h"
-#include "desktop/gui_internal.h"
-
#include "utils/config.h"
#include "utils/log.h"
#include "utils/messages.h"
@@ -581,9 +575,3 @@ nserror nsc_strntimet(const char *str, size_t size, time_t
*timep)
return NSERROR_OK;
}
-
-/* exported interface documented in utils/utils.h */
-void warn_user(const char *message, const char *detail)
-{
- guit->misc->warning(message, detail);
-}
diff --git a/utils/utils.h b/utils/utils.h
index ec4bb5c..855ef7f 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -116,16 +116,4 @@ struct dirent;
*/
bool is_dir(const char *path);
-
-/**
- * Warn the user of an event.
- *
- * \warning depricated interface, this calls the warning entry in the
- * miscellaneous gui table and discards the return code.
- *
- * \param[in] message A warning looked up in the message translation table
- * \param[in] detail Additional text to be displayed or NULL.
- */
-void warn_user(const char *message, const char *detail);
-
#endif
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=4f9dc971414cc9a26cce886370787899e1c86d18
commit 4f9dc971414cc9a26cce886370787899e1c86d18
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove unecessary utils includes from RISC OS frontend
diff --git a/riscos/401login.c b/riscos/401login.c
index 1494b85..e95a748 100644
--- a/riscos/401login.c
+++ b/riscos/401login.c
@@ -25,7 +25,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
diff --git a/riscos/bitmap.c b/riscos/bitmap.c
index 8fa7265..cc4be59 100644
--- a/riscos/bitmap.c
+++ b/riscos/bitmap.c
@@ -42,7 +42,6 @@
#include "utils/nsoption.h"
#include "utils/filename.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/plotters.h"
#include "content/content.h"
diff --git a/riscos/configure.c b/riscos/configure.c
index 9953fb9..9d28616 100644
--- a/riscos/configure.c
+++ b/riscos/configure.c
@@ -16,7 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
+/**
+ * \file
* RISC OS option setting (implementation).
*/
@@ -31,7 +32,6 @@
#include <oslib/wimp.h>
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "riscos/gui.h"
diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c
index adaaa82..730d6f8 100644
--- a/riscos/configure/con_cache.c
+++ b/riscos/configure/con_cache.c
@@ -22,7 +22,6 @@
#include "utils/nsoption.h"
#include "utils/filename.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/wimp.h"
diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c
index d9919d0..9515c5d 100644
--- a/riscos/configure/con_connect.c
+++ b/riscos/configure/con_connect.c
@@ -20,15 +20,16 @@
#include "swis.h"
#include "oslib/osspriteop.h"
#include "oslib/wimp.h"
+
#include "utils/nsoption.h"
+#include "utils/log.h"
+
#include "riscos/configure/configure.h"
#include "riscos/dialog.h"
#include "riscos/menus.h"
#include "riscos/tinct.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
-#include "utils/log.h"
-#include "utils/utils.h"
#define CONNECTION_PROXY_FIELD 3
diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c
index a1d2737..50bbd15 100644
--- a/riscos/configure/con_content.c
+++ b/riscos/configure/con_content.c
@@ -20,7 +20,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/wimp.h"
diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index fdae976..2803128 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -21,7 +21,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "desktop/plot_style.h"
#include "riscos/gui.h"
diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c
index f8a13ce..ea8e243 100644
--- a/riscos/configure/con_home.c
+++ b/riscos/configure/con_home.c
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "riscos/gui.h"
diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c
index cab7ef0..49dd4f7 100644
--- a/riscos/configure/con_image.c
+++ b/riscos/configure/con_image.c
@@ -23,7 +23,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/configure/configure.h"
diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c
index b12a795..2030c65 100644
--- a/riscos/configure/con_language.c
+++ b/riscos/configure/con_language.c
@@ -22,7 +22,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/menus.h"
diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c
index 2e3c314..9c8a846 100644
--- a/riscos/configure/con_secure.c
+++ b/riscos/configure/con_secure.c
@@ -20,7 +20,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/wimp.h"
diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c
index e805384..fb0d3df 100644
--- a/riscos/configure/con_theme.c
+++ b/riscos/configure/con_theme.c
@@ -27,7 +27,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/configure/configure.h"
diff --git a/riscos/content-handlers/artworks.c
b/riscos/content-handlers/artworks.c
index 4b5d27a..b6f7a0d 100644
--- a/riscos/content-handlers/artworks.c
+++ b/riscos/content-handlers/artworks.c
@@ -31,15 +31,17 @@
#include "swis.h"
#include "oslib/os.h"
#include "oslib/wimp.h"
+
#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
+
#include "riscos/content-handlers/artworks.h"
#include "riscos/gui.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
#define AWRender_FileInitAddress 0x46080
#define AWRender_RenderAddress 0x46081
diff --git a/riscos/content-handlers/draw.c b/riscos/content-handlers/draw.c
index 37f6911..f2bee16 100644
--- a/riscos/content-handlers/draw.c
+++ b/riscos/content-handlers/draw.c
@@ -28,14 +28,16 @@
#include <string.h>
#include <stdlib.h>
#include "oslib/drawfile.h"
+
#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
+
#include "riscos/content-handlers/draw.h"
#include "riscos/gui.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
typedef struct draw_content {
struct content base;
diff --git a/riscos/content-handlers/sprite.c b/riscos/content-handlers/sprite.c
index a1a6eb1..12fed49 100644
--- a/riscos/content-handlers/sprite.c
+++ b/riscos/content-handlers/sprite.c
@@ -26,16 +26,18 @@
#include <string.h>
#include <stdlib.h>
#include "oslib/osspriteop.h"
+
+#include "utils/config.h"
#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
+
#include "riscos/gui.h"
#include "riscos/image.h"
#include "riscos/content-handlers/sprite.h"
-#include "utils/config.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
#ifdef WITH_SPRITE
diff --git a/riscos/cookies.c b/riscos/cookies.c
index 83462cb..93c9f39 100644
--- a/riscos/cookies.c
+++ b/riscos/cookies.c
@@ -29,21 +29,22 @@
#include <time.h>
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
+
+#include "utils/nsoption.h"
+#include "utils/messages.h"
+#include "utils/log.h"
#include "content/urldb.h"
#include "desktop/cookie_manager.h"
#include "desktop/tree.h"
#include "desktop/textinput.h"
+
#include "riscos/cookies.h"
#include "riscos/dialog.h"
#include "riscos/menus.h"
-#include "utils/nsoption.h"
#include "riscos/toolbar.h"
#include "riscos/treeview.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
-#include "utils/messages.h"
-#include "utils/log.h"
-#include "utils/utils.h"
static void ro_gui_cookies_toolbar_update_buttons(void);
static void ro_gui_cookies_toolbar_save_buttons(char *config);
diff --git a/riscos/dialog.c b/riscos/dialog.c
index d3f6caf..d435608 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -38,7 +38,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "utils/utils.h"
#include "desktop/version.h"
#include "desktop/browser.h"
diff --git a/riscos/filetype.c b/riscos/filetype.c
index 1a16df0..99a44ae 100644
--- a/riscos/filetype.c
+++ b/riscos/filetype.c
@@ -22,13 +22,13 @@
#include "oslib/mimemap.h"
#include "oslib/osfile.h"
+#include "utils/config.h"
+#include "utils/log.h"
#include "content/content.h"
#include "content/fetch.h"
#include "content/hlcache.h"
+
#include "riscos/filetype.h"
-#include "utils/config.h"
-#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
/* type_map must be in sorted order by file_type */
diff --git a/riscos/global_history.c b/riscos/global_history.c
index 7bbc53c..c469847 100644
--- a/riscos/global_history.c
+++ b/riscos/global_history.c
@@ -34,7 +34,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "desktop/global_history.h"
#include "desktop/tree.h"
#include "desktop/gui_window.h"
diff --git a/riscos/gui/button_bar.c b/riscos/gui/button_bar.c
index 6f8920c..6ecd7cf 100644
--- a/riscos/gui/button_bar.c
+++ b/riscos/gui/button_bar.c
@@ -33,7 +33,6 @@
#include <oslib/wimpspriteop.h>
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/gui/button_bar.h"
#include "riscos/gui.h"
diff --git a/riscos/gui/throbber.c b/riscos/gui/throbber.c
index 437c4fa..a326f80 100644
--- a/riscos/gui/throbber.c
+++ b/riscos/gui/throbber.c
@@ -30,12 +30,13 @@
#include "oslib/os.h"
#include "oslib/osspriteop.h"
#include "oslib/wimp.h"
+
+#include "utils/log.h"
+#include "riscos/gui.h"
+
#include "riscos/gui/throbber.h"
#include "riscos/theme.h"
#include "riscos/wimp.h"
-#include "utils/log.h"
-#include "utils/utils.h"
-#include "riscos/gui.h"
#define THROBBER_SPRITE_NAME_LENGTH 12
#define THROBBER_ANIMATE_INTERVAL 10
diff --git a/riscos/help.c b/riscos/help.c
index 3c9f548..73cb695 100644
--- a/riscos/help.c
+++ b/riscos/help.c
@@ -25,7 +25,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/utf8.h"
#include "desktop/mouse.h"
diff --git a/riscos/history.c b/riscos/history.c
index 4b3bed2..9d78f6d 100644
--- a/riscos/history.c
+++ b/riscos/history.c
@@ -27,18 +27,18 @@
#include <stdlib.h>
#include <string.h>
#include "oslib/wimp.h"
+
+#include "utils/nsoption.h"
+#include "utils/log.h"
#include "desktop/browser_history.h"
#include "desktop/plotters.h"
+
#include "riscos/dialog.h"
-#include "utils/nsoption.h"
#include "riscos/gui.h"
#include "riscos/mouse.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/utils.h"
-
static struct browser_window *history_bw;
/* Last position of mouse in window. */
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index c728404..381978f 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -33,7 +33,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "content/content.h"
#include "content/hlcache.h"
diff --git a/riscos/iconbar.c b/riscos/iconbar.c
index 6024ea9..9cff116 100644
--- a/riscos/iconbar.c
+++ b/riscos/iconbar.c
@@ -35,7 +35,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsurl.h"
#include "desktop/browser.h"
diff --git a/riscos/image.c b/riscos/image.c
index 71d6334..acbe62d 100644
--- a/riscos/image.c
+++ b/riscos/image.c
@@ -24,7 +24,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/image.h"
#include "riscos/gui.h"
diff --git a/riscos/menus.c b/riscos/menus.c
index dcb0bf9..37285c9 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -35,7 +35,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/utf8.h"
#include "content/content.h"
#include "content/hlcache.h"
diff --git a/riscos/message.c b/riscos/message.c
index 70efcc1..1c54ea0 100644
--- a/riscos/message.c
+++ b/riscos/message.c
@@ -26,9 +26,9 @@
#include "oslib/os.h"
#include "oslib/wimp.h"
-#include "riscos/message.h"
#include "utils/log.h"
-#include "utils/utils.h"
+
+#include "riscos/message.h"
#include "riscos/gui.h"
struct active_message {
diff --git a/riscos/mouse.c b/riscos/mouse.c
index 25db2ff..a0cc0e7 100644
--- a/riscos/mouse.c
+++ b/riscos/mouse.c
@@ -39,7 +39,6 @@
#include <oslib/wimp.h>
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/mouse.h"
#include "riscos/gui.h"
diff --git a/riscos/query.h b/riscos/query.h
index 857cce0..c60a8bb 100644
--- a/riscos/query.h
+++ b/riscos/query.h
@@ -21,7 +21,6 @@
#include <stdbool.h>
#include "oslib/wimp.h"
-#include "utils/utils.h"
enum query_response {
QUERY_CONTINUE,
diff --git a/riscos/save.c b/riscos/save.c
index d547e0e..2733070 100644
--- a/riscos/save.c
+++ b/riscos/save.c
@@ -40,7 +40,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utf8.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
diff --git a/riscos/search.c b/riscos/search.c
index 1a178f2..989c9aa 100644
--- a/riscos/search.c
+++ b/riscos/search.c
@@ -31,7 +31,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
diff --git a/riscos/sslcert.c b/riscos/sslcert.c
index 31e81eb..9e43f2d 100644
--- a/riscos/sslcert.c
+++ b/riscos/sslcert.c
@@ -30,7 +30,6 @@
#include "oslib/wimp.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/fetch.h"
diff --git a/riscos/theme.c b/riscos/theme.c
index 7f2beea..714b9e5 100644
--- a/riscos/theme.c
+++ b/riscos/theme.c
@@ -39,7 +39,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "riscos/cookies.h"
diff --git a/riscos/theme_install.c b/riscos/theme_install.c
index 05efce4..5c11ffb 100644
--- a/riscos/theme_install.c
+++ b/riscos/theme_install.c
@@ -28,7 +28,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
diff --git a/riscos/toolbar.c b/riscos/toolbar.c
index 173d437..83751a7 100644
--- a/riscos/toolbar.c
+++ b/riscos/toolbar.c
@@ -39,7 +39,6 @@
#include "oslib/wimpspriteop.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "content/content.h"
#include "desktop/plotters.h"
diff --git a/riscos/treeview.c b/riscos/treeview.c
index 83c9f7e..3428ad3 100644
--- a/riscos/treeview.c
+++ b/riscos/treeview.c
@@ -35,11 +35,16 @@
#include "oslib/osbyte.h"
#include "oslib/osspriteop.h"
#include "oslib/wimp.h"
+
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "content/urldb.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
+
#include "riscos/bitmap.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
@@ -53,9 +58,6 @@
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
#ifndef wimp_KEY_END
#define wimp_KEY_END wimp_KEY_COPY
diff --git a/riscos/uri.c b/riscos/uri.c
index 0e4c0b8..9c384c9 100644
--- a/riscos/uri.c
+++ b/riscos/uri.c
@@ -28,7 +28,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "utils/utils.h"
#include "content/fetch.h"
#include "desktop/browser.h"
diff --git a/riscos/url_complete.c b/riscos/url_complete.c
index 2ed82e2..3cf7f92 100644
--- a/riscos/url_complete.c
+++ b/riscos/url_complete.c
@@ -29,7 +29,6 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "utils/utils.h"
#include "content/urldb.h"
#include "desktop/browser.h"
diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c
index 97c9e16..2b9ef35 100644
--- a/riscos/url_protocol.c
+++ b/riscos/url_protocol.c
@@ -36,7 +36,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "utils/utils.h"
#include "utils/config.h"
#include "content/fetch.h"
#include "desktop/browser.h"
diff --git a/riscos/wimp.c b/riscos/wimp.c
index 19e5aa7..2579c67 100644
--- a/riscos/wimp.c
+++ b/riscos/wimp.c
@@ -36,7 +36,6 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/oslib_pre7.h"
diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c
index b266004..015e87b 100644
--- a/riscos/wimp_event.c
+++ b/riscos/wimp_event.c
@@ -33,7 +33,6 @@
#include "oslib/wimp.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=4bf89b5948ca15a123086409db894a81365cf3c8
commit 4bf89b5948ca15a123086409db894a81365cf3c8
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove unecessary utils includes from gtk frontend
diff --git a/gtk/about.c b/gtk/about.c
index 52672d5..d57afea 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -25,7 +25,6 @@
#include <stdlib.h>
#include <stdint.h>
-#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
diff --git a/gtk/completion.c b/gtk/completion.c
index 76880da..6dde728 100644
--- a/gtk/completion.c
+++ b/gtk/completion.c
@@ -23,11 +23,10 @@
#include <gtk/gtk.h>
-#include "content/urldb.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
+#include "content/urldb.h"
#include "desktop/searchweb.h"
#include "desktop/browser.h"
diff --git a/gtk/history.c b/gtk/history.c
index 2f11042..743474d 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -21,7 +21,6 @@
#include <gtk/gtk.h>
#include "utils/log.h"
-#include "utils/utils.h"
#include "desktop/global_history.h"
#include "desktop/plotters.h"
#include "desktop/tree.h"
diff --git a/gtk/layout_pango.c b/gtk/layout_pango.c
index f3f0e07..49b6293 100644
--- a/gtk/layout_pango.c
+++ b/gtk/layout_pango.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include <gtk/gtk.h>
-#include "utils/utils.h"
#include "utils/log.h"
#include "utils/nsoption.h"
#include "desktop/gui_layout.h"
diff --git a/gtk/menu.c b/gtk/menu.c
index 041a5ec..a93ef93 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -17,12 +17,12 @@
*/
#include <stdlib.h>
+#include <stdbool.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include "utils/messages.h"
-#include "utils/utils.h"
#include "gtk/compat.h"
#include "gtk/menu.h"
diff --git a/gtk/preferences.c b/gtk/preferences.c
index 0f38506..3efb9ed 100644
--- a/gtk/preferences.c
+++ b/gtk/preferences.c
@@ -21,7 +21,6 @@
#include <math.h>
#include <string.h>
-#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "utils/file.h"
diff --git a/gtk/search.c b/gtk/search.c
index 9281312..d2adcf1 100644
--- a/gtk/search.c
+++ b/gtk/search.c
@@ -28,7 +28,6 @@
#include "utils/config.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
diff --git a/gtk/tabs.c b/gtk/tabs.c
index c28fe5e..67a410d 100644
--- a/gtk/tabs.c
+++ b/gtk/tabs.c
@@ -20,7 +20,6 @@
#include <string.h>
#include "utils/nsoption.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/browser.h"
#include "content/content.h"
diff --git a/gtk/treeview.c b/gtk/treeview.c
index 43c9f28..9baf57b 100644
--- a/gtk/treeview.c
+++ b/gtk/treeview.c
@@ -32,7 +32,6 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "utils/utils.h"
#include "desktop/tree.h"
#include "desktop/plotters.h"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d8d0ad3b49147bfc76b754507dd846c5904bbbc2
commit d8d0ad3b49147bfc76b754507dd846c5904bbbc2
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
cleanup some warnings in cocoa frontend
diff --git a/cocoa/ArrowWindow.m b/cocoa/ArrowWindow.m
index b322a11..8edc32e 100644
--- a/cocoa/ArrowWindow.m
+++ b/cocoa/ArrowWindow.m
@@ -156,12 +156,6 @@ static NSRect ScreenRectForView( NSView *view )
NSPoint arrowPoint;
switch ([box arrowEdge]) {
- case ArrowNone:
- case ArrowTopEdge:
- arrowPoint = NSMakePoint( NSMidX( viewRect ),
- NSMinY( viewRect ) );
- break;
-
case ArrowLeftEdge:
arrowPoint = NSMakePoint( NSMaxX( viewRect ),
NSMidY( viewRect ) );
@@ -176,6 +170,14 @@ static NSRect ScreenRectForView( NSView *view )
arrowPoint = NSMakePoint( NSMinX( viewRect ),
NSMidY( viewRect ) );
break;
+
+ case ArrowNone:
+ case ArrowTopEdge:
+ default:
+ arrowPoint = NSMakePoint( NSMidX( viewRect ),
+ NSMinY( viewRect ) );
+ break;
+
}
attachedWindow = [view window];
[self moveToPoint: arrowPoint];
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index 4e34efa..fc50dbc 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -16,6 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "utils/nsoption.h"
+#import "utils/messages.h"
+#import "desktop/browser.h"
+#import "desktop/plotters.h"
+#import "desktop/textinput.h"
+#import "content/hlcache.h"
+
+#import "cocoa/gui.h"
#import "cocoa/BrowserView.h"
#import "cocoa/HistoryView.h"
#import "cocoa/font.h"
@@ -23,12 +31,6 @@
#import "cocoa/LocalHistoryController.h"
#import "cocoa/BrowserWindowController.h"
-#import "desktop/browser.h"
-#import "desktop/plotters.h"
-#import "desktop/textinput.h"
-#import "utils/nsoption.h"
-#import "utils/messages.h"
-#import "content/hlcache.h"
@interface BrowserView ()
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m
index a951ce9..5fa8b64 100644
--- a/cocoa/BrowserViewController.m
+++ b/cocoa/BrowserViewController.m
@@ -16,23 +16,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#import "cocoa/BrowserViewController.h"
-#import "cocoa/BrowserView.h"
-#import "cocoa/BrowserWindowController.h"
-#import "cocoa/fetch.h"
-
-#import "desktop/browser_history.h"
-#import "desktop/browser.h"
-#import "desktop/textinput.h"
#import "utils/nsoption.h"
-
#import "utils/corestrings.h"
#import "utils/filename.h"
#import "utils/file.h"
#import "utils/messages.h"
#import "utils/url.h"
+#import "desktop/browser_history.h"
+#import "desktop/browser.h"
+#import "desktop/textinput.h"
#import "content/hlcache.h"
+#import "cocoa/gui.h"
+#import "cocoa/BrowserViewController.h"
+#import "cocoa/BrowserView.h"
+#import "cocoa/BrowserWindowController.h"
+#import "cocoa/fetch.h"
+
+
@implementation BrowserViewController
diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m
index afa2559..f428563 100644
--- a/cocoa/NetSurfAppDelegate.m
+++ b/cocoa/NetSurfAppDelegate.m
@@ -16,16 +16,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "utils/nsoption.h"
+#import "utils/messages.h"
+#import "utils/utils.h"
+#import "utils/nsurl.h"
+#import "desktop/browser.h"
+
+#import "cocoa/gui.h"
#import "cocoa/NetSurfAppDelegate.h"
#import "cocoa/SearchWindowController.h"
#import "cocoa/PreferencesWindowController.h"
#import "cocoa/HistoryWindowController.h"
-#import "desktop/browser.h"
-#import "utils/nsoption.h"
-#import "utils/messages.h"
-#import "utils/utils.h"
-#import "utils/nsurl.h"
@interface NetSurfAppDelegate ()
-----------------------------------------------------------------------
Summary of changes:
cocoa/ArrowWindow.m | 14 ++++++++------
cocoa/BrowserView.m | 14 ++++++++------
cocoa/BrowserViewController.m | 19 ++++++++++---------
cocoa/NetSurfAppDelegate.m | 12 +++++++-----
gtk/about.c | 1 -
gtk/completion.c | 3 +--
gtk/history.c | 1 -
gtk/layout_pango.c | 1 -
gtk/menu.c | 2 +-
gtk/preferences.c | 1 -
gtk/search.c | 1 -
gtk/tabs.c | 1 -
gtk/treeview.c | 1 -
riscos/401login.c | 1 -
riscos/bitmap.c | 1 -
riscos/configure.c | 4 ++--
riscos/configure/con_cache.c | 1 -
riscos/configure/con_connect.c | 5 +++--
riscos/configure/con_content.c | 1 -
riscos/configure/con_fonts.c | 1 -
riscos/configure/con_home.c | 1 -
riscos/configure/con_image.c | 1 -
riscos/configure/con_language.c | 1 -
riscos/configure/con_secure.c | 1 -
riscos/configure/con_theme.c | 1 -
riscos/content-handlers/artworks.c | 8 +++++---
riscos/content-handlers/draw.c | 8 +++++---
riscos/content-handlers/sprite.c | 10 ++++++----
riscos/cookies.c | 9 +++++----
riscos/dialog.c | 1 -
riscos/filetype.c | 6 +++---
riscos/global_history.c | 1 -
riscos/gui/button_bar.c | 1 -
riscos/gui/throbber.c | 7 ++++---
riscos/help.c | 1 -
riscos/history.c | 8 ++++----
riscos/hotlist.c | 1 -
riscos/iconbar.c | 1 -
riscos/image.c | 1 -
riscos/menus.c | 1 -
riscos/message.c | 4 ++--
riscos/mouse.c | 1 -
riscos/query.h | 1 -
riscos/save.c | 1 -
riscos/search.c | 1 -
riscos/sslcert.c | 1 -
riscos/theme.c | 1 -
riscos/theme_install.c | 1 -
riscos/toolbar.c | 1 -
riscos/treeview.c | 8 +++++---
riscos/uri.c | 1 -
riscos/url_complete.c | 1 -
riscos/url_protocol.c | 1 -
riscos/wimp.c | 1 -
riscos/wimp_event.c | 1 -
utils/utils.c | 12 ------------
utils/utils.h | 12 ------------
57 files changed, 79 insertions(+), 124 deletions(-)
diff --git a/cocoa/ArrowWindow.m b/cocoa/ArrowWindow.m
index b322a11..8edc32e 100644
--- a/cocoa/ArrowWindow.m
+++ b/cocoa/ArrowWindow.m
@@ -156,12 +156,6 @@ static NSRect ScreenRectForView( NSView *view )
NSPoint arrowPoint;
switch ([box arrowEdge]) {
- case ArrowNone:
- case ArrowTopEdge:
- arrowPoint = NSMakePoint( NSMidX( viewRect ),
- NSMinY( viewRect ) );
- break;
-
case ArrowLeftEdge:
arrowPoint = NSMakePoint( NSMaxX( viewRect ),
NSMidY( viewRect ) );
@@ -176,6 +170,14 @@ static NSRect ScreenRectForView( NSView *view )
arrowPoint = NSMakePoint( NSMinX( viewRect ),
NSMidY( viewRect ) );
break;
+
+ case ArrowNone:
+ case ArrowTopEdge:
+ default:
+ arrowPoint = NSMakePoint( NSMidX( viewRect ),
+ NSMinY( viewRect ) );
+ break;
+
}
attachedWindow = [view window];
[self moveToPoint: arrowPoint];
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index 4e34efa..fc50dbc 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -16,6 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "utils/nsoption.h"
+#import "utils/messages.h"
+#import "desktop/browser.h"
+#import "desktop/plotters.h"
+#import "desktop/textinput.h"
+#import "content/hlcache.h"
+
+#import "cocoa/gui.h"
#import "cocoa/BrowserView.h"
#import "cocoa/HistoryView.h"
#import "cocoa/font.h"
@@ -23,12 +31,6 @@
#import "cocoa/LocalHistoryController.h"
#import "cocoa/BrowserWindowController.h"
-#import "desktop/browser.h"
-#import "desktop/plotters.h"
-#import "desktop/textinput.h"
-#import "utils/nsoption.h"
-#import "utils/messages.h"
-#import "content/hlcache.h"
@interface BrowserView ()
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m
index a951ce9..5fa8b64 100644
--- a/cocoa/BrowserViewController.m
+++ b/cocoa/BrowserViewController.m
@@ -16,23 +16,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#import "cocoa/BrowserViewController.h"
-#import "cocoa/BrowserView.h"
-#import "cocoa/BrowserWindowController.h"
-#import "cocoa/fetch.h"
-
-#import "desktop/browser_history.h"
-#import "desktop/browser.h"
-#import "desktop/textinput.h"
#import "utils/nsoption.h"
-
#import "utils/corestrings.h"
#import "utils/filename.h"
#import "utils/file.h"
#import "utils/messages.h"
#import "utils/url.h"
+#import "desktop/browser_history.h"
+#import "desktop/browser.h"
+#import "desktop/textinput.h"
#import "content/hlcache.h"
+#import "cocoa/gui.h"
+#import "cocoa/BrowserViewController.h"
+#import "cocoa/BrowserView.h"
+#import "cocoa/BrowserWindowController.h"
+#import "cocoa/fetch.h"
+
+
@implementation BrowserViewController
diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m
index afa2559..f428563 100644
--- a/cocoa/NetSurfAppDelegate.m
+++ b/cocoa/NetSurfAppDelegate.m
@@ -16,16 +16,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "utils/nsoption.h"
+#import "utils/messages.h"
+#import "utils/utils.h"
+#import "utils/nsurl.h"
+#import "desktop/browser.h"
+
+#import "cocoa/gui.h"
#import "cocoa/NetSurfAppDelegate.h"
#import "cocoa/SearchWindowController.h"
#import "cocoa/PreferencesWindowController.h"
#import "cocoa/HistoryWindowController.h"
-#import "desktop/browser.h"
-#import "utils/nsoption.h"
-#import "utils/messages.h"
-#import "utils/utils.h"
-#import "utils/nsurl.h"
@interface NetSurfAppDelegate ()
diff --git a/gtk/about.c b/gtk/about.c
index 52672d5..d57afea 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -25,7 +25,6 @@
#include <stdlib.h>
#include <stdint.h>
-#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
diff --git a/gtk/completion.c b/gtk/completion.c
index 76880da..6dde728 100644
--- a/gtk/completion.c
+++ b/gtk/completion.c
@@ -23,11 +23,10 @@
#include <gtk/gtk.h>
-#include "content/urldb.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
+#include "content/urldb.h"
#include "desktop/searchweb.h"
#include "desktop/browser.h"
diff --git a/gtk/history.c b/gtk/history.c
index 2f11042..743474d 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -21,7 +21,6 @@
#include <gtk/gtk.h>
#include "utils/log.h"
-#include "utils/utils.h"
#include "desktop/global_history.h"
#include "desktop/plotters.h"
#include "desktop/tree.h"
diff --git a/gtk/layout_pango.c b/gtk/layout_pango.c
index f3f0e07..49b6293 100644
--- a/gtk/layout_pango.c
+++ b/gtk/layout_pango.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include <gtk/gtk.h>
-#include "utils/utils.h"
#include "utils/log.h"
#include "utils/nsoption.h"
#include "desktop/gui_layout.h"
diff --git a/gtk/menu.c b/gtk/menu.c
index 041a5ec..a93ef93 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -17,12 +17,12 @@
*/
#include <stdlib.h>
+#include <stdbool.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include "utils/messages.h"
-#include "utils/utils.h"
#include "gtk/compat.h"
#include "gtk/menu.h"
diff --git a/gtk/preferences.c b/gtk/preferences.c
index 0f38506..3efb9ed 100644
--- a/gtk/preferences.c
+++ b/gtk/preferences.c
@@ -21,7 +21,6 @@
#include <math.h>
#include <string.h>
-#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "utils/file.h"
diff --git a/gtk/search.c b/gtk/search.c
index 9281312..d2adcf1 100644
--- a/gtk/search.c
+++ b/gtk/search.c
@@ -28,7 +28,6 @@
#include "utils/config.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
diff --git a/gtk/tabs.c b/gtk/tabs.c
index c28fe5e..67a410d 100644
--- a/gtk/tabs.c
+++ b/gtk/tabs.c
@@ -20,7 +20,6 @@
#include <string.h>
#include "utils/nsoption.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/browser.h"
#include "content/content.h"
diff --git a/gtk/treeview.c b/gtk/treeview.c
index 43c9f28..9baf57b 100644
--- a/gtk/treeview.c
+++ b/gtk/treeview.c
@@ -32,7 +32,6 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "utils/utils.h"
#include "desktop/tree.h"
#include "desktop/plotters.h"
diff --git a/riscos/401login.c b/riscos/401login.c
index 1494b85..e95a748 100644
--- a/riscos/401login.c
+++ b/riscos/401login.c
@@ -25,7 +25,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
diff --git a/riscos/bitmap.c b/riscos/bitmap.c
index 8fa7265..cc4be59 100644
--- a/riscos/bitmap.c
+++ b/riscos/bitmap.c
@@ -42,7 +42,6 @@
#include "utils/nsoption.h"
#include "utils/filename.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/plotters.h"
#include "content/content.h"
diff --git a/riscos/configure.c b/riscos/configure.c
index 9953fb9..9d28616 100644
--- a/riscos/configure.c
+++ b/riscos/configure.c
@@ -16,7 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
+/**
+ * \file
* RISC OS option setting (implementation).
*/
@@ -31,7 +32,6 @@
#include <oslib/wimp.h>
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "riscos/gui.h"
diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c
index adaaa82..730d6f8 100644
--- a/riscos/configure/con_cache.c
+++ b/riscos/configure/con_cache.c
@@ -22,7 +22,6 @@
#include "utils/nsoption.h"
#include "utils/filename.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/wimp.h"
diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c
index d9919d0..9515c5d 100644
--- a/riscos/configure/con_connect.c
+++ b/riscos/configure/con_connect.c
@@ -20,15 +20,16 @@
#include "swis.h"
#include "oslib/osspriteop.h"
#include "oslib/wimp.h"
+
#include "utils/nsoption.h"
+#include "utils/log.h"
+
#include "riscos/configure/configure.h"
#include "riscos/dialog.h"
#include "riscos/menus.h"
#include "riscos/tinct.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
-#include "utils/log.h"
-#include "utils/utils.h"
#define CONNECTION_PROXY_FIELD 3
diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c
index a1d2737..50bbd15 100644
--- a/riscos/configure/con_content.c
+++ b/riscos/configure/con_content.c
@@ -20,7 +20,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/wimp.h"
diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index fdae976..2803128 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -21,7 +21,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "desktop/plot_style.h"
#include "riscos/gui.h"
diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c
index f8a13ce..ea8e243 100644
--- a/riscos/configure/con_home.c
+++ b/riscos/configure/con_home.c
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "riscos/gui.h"
diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c
index cab7ef0..49dd4f7 100644
--- a/riscos/configure/con_image.c
+++ b/riscos/configure/con_image.c
@@ -23,7 +23,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/configure/configure.h"
diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c
index b12a795..2030c65 100644
--- a/riscos/configure/con_language.c
+++ b/riscos/configure/con_language.c
@@ -22,7 +22,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/menus.h"
diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c
index 2e3c314..9c8a846 100644
--- a/riscos/configure/con_secure.c
+++ b/riscos/configure/con_secure.c
@@ -20,7 +20,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/wimp.h"
diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c
index e805384..fb0d3df 100644
--- a/riscos/configure/con_theme.c
+++ b/riscos/configure/con_theme.c
@@ -27,7 +27,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/configure/configure.h"
diff --git a/riscos/content-handlers/artworks.c
b/riscos/content-handlers/artworks.c
index 4b5d27a..b6f7a0d 100644
--- a/riscos/content-handlers/artworks.c
+++ b/riscos/content-handlers/artworks.c
@@ -31,15 +31,17 @@
#include "swis.h"
#include "oslib/os.h"
#include "oslib/wimp.h"
+
#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
+
#include "riscos/content-handlers/artworks.h"
#include "riscos/gui.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
#define AWRender_FileInitAddress 0x46080
#define AWRender_RenderAddress 0x46081
diff --git a/riscos/content-handlers/draw.c b/riscos/content-handlers/draw.c
index 37f6911..f2bee16 100644
--- a/riscos/content-handlers/draw.c
+++ b/riscos/content-handlers/draw.c
@@ -28,14 +28,16 @@
#include <string.h>
#include <stdlib.h>
#include "oslib/drawfile.h"
+
#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
+
#include "riscos/content-handlers/draw.h"
#include "riscos/gui.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
typedef struct draw_content {
struct content base;
diff --git a/riscos/content-handlers/sprite.c b/riscos/content-handlers/sprite.c
index a1a6eb1..12fed49 100644
--- a/riscos/content-handlers/sprite.c
+++ b/riscos/content-handlers/sprite.c
@@ -26,16 +26,18 @@
#include <string.h>
#include <stdlib.h>
#include "oslib/osspriteop.h"
+
+#include "utils/config.h"
#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
+
#include "riscos/gui.h"
#include "riscos/image.h"
#include "riscos/content-handlers/sprite.h"
-#include "utils/config.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
#ifdef WITH_SPRITE
diff --git a/riscos/cookies.c b/riscos/cookies.c
index 83462cb..93c9f39 100644
--- a/riscos/cookies.c
+++ b/riscos/cookies.c
@@ -29,21 +29,22 @@
#include <time.h>
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
+
+#include "utils/nsoption.h"
+#include "utils/messages.h"
+#include "utils/log.h"
#include "content/urldb.h"
#include "desktop/cookie_manager.h"
#include "desktop/tree.h"
#include "desktop/textinput.h"
+
#include "riscos/cookies.h"
#include "riscos/dialog.h"
#include "riscos/menus.h"
-#include "utils/nsoption.h"
#include "riscos/toolbar.h"
#include "riscos/treeview.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
-#include "utils/messages.h"
-#include "utils/log.h"
-#include "utils/utils.h"
static void ro_gui_cookies_toolbar_update_buttons(void);
static void ro_gui_cookies_toolbar_save_buttons(char *config);
diff --git a/riscos/dialog.c b/riscos/dialog.c
index d3f6caf..d435608 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -38,7 +38,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "utils/utils.h"
#include "desktop/version.h"
#include "desktop/browser.h"
diff --git a/riscos/filetype.c b/riscos/filetype.c
index 1a16df0..99a44ae 100644
--- a/riscos/filetype.c
+++ b/riscos/filetype.c
@@ -22,13 +22,13 @@
#include "oslib/mimemap.h"
#include "oslib/osfile.h"
+#include "utils/config.h"
+#include "utils/log.h"
#include "content/content.h"
#include "content/fetch.h"
#include "content/hlcache.h"
+
#include "riscos/filetype.h"
-#include "utils/config.h"
-#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
/* type_map must be in sorted order by file_type */
diff --git a/riscos/global_history.c b/riscos/global_history.c
index 7bbc53c..c469847 100644
--- a/riscos/global_history.c
+++ b/riscos/global_history.c
@@ -34,7 +34,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "desktop/global_history.h"
#include "desktop/tree.h"
#include "desktop/gui_window.h"
diff --git a/riscos/gui/button_bar.c b/riscos/gui/button_bar.c
index 6f8920c..6ecd7cf 100644
--- a/riscos/gui/button_bar.c
+++ b/riscos/gui/button_bar.c
@@ -33,7 +33,6 @@
#include <oslib/wimpspriteop.h>
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/gui/button_bar.h"
#include "riscos/gui.h"
diff --git a/riscos/gui/throbber.c b/riscos/gui/throbber.c
index 437c4fa..a326f80 100644
--- a/riscos/gui/throbber.c
+++ b/riscos/gui/throbber.c
@@ -30,12 +30,13 @@
#include "oslib/os.h"
#include "oslib/osspriteop.h"
#include "oslib/wimp.h"
+
+#include "utils/log.h"
+#include "riscos/gui.h"
+
#include "riscos/gui/throbber.h"
#include "riscos/theme.h"
#include "riscos/wimp.h"
-#include "utils/log.h"
-#include "utils/utils.h"
-#include "riscos/gui.h"
#define THROBBER_SPRITE_NAME_LENGTH 12
#define THROBBER_ANIMATE_INTERVAL 10
diff --git a/riscos/help.c b/riscos/help.c
index 3c9f548..73cb695 100644
--- a/riscos/help.c
+++ b/riscos/help.c
@@ -25,7 +25,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/utf8.h"
#include "desktop/mouse.h"
diff --git a/riscos/history.c b/riscos/history.c
index 4b3bed2..9d78f6d 100644
--- a/riscos/history.c
+++ b/riscos/history.c
@@ -27,18 +27,18 @@
#include <stdlib.h>
#include <string.h>
#include "oslib/wimp.h"
+
+#include "utils/nsoption.h"
+#include "utils/log.h"
#include "desktop/browser_history.h"
#include "desktop/plotters.h"
+
#include "riscos/dialog.h"
-#include "utils/nsoption.h"
#include "riscos/gui.h"
#include "riscos/mouse.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/utils.h"
-
static struct browser_window *history_bw;
/* Last position of mouse in window. */
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index c728404..381978f 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -33,7 +33,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "content/content.h"
#include "content/hlcache.h"
diff --git a/riscos/iconbar.c b/riscos/iconbar.c
index 6024ea9..9cff116 100644
--- a/riscos/iconbar.c
+++ b/riscos/iconbar.c
@@ -35,7 +35,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsurl.h"
#include "desktop/browser.h"
diff --git a/riscos/image.c b/riscos/image.c
index 71d6334..acbe62d 100644
--- a/riscos/image.c
+++ b/riscos/image.c
@@ -24,7 +24,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/image.h"
#include "riscos/gui.h"
diff --git a/riscos/menus.c b/riscos/menus.c
index dcb0bf9..37285c9 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -35,7 +35,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/utf8.h"
#include "content/content.h"
#include "content/hlcache.h"
diff --git a/riscos/message.c b/riscos/message.c
index 70efcc1..1c54ea0 100644
--- a/riscos/message.c
+++ b/riscos/message.c
@@ -26,9 +26,9 @@
#include "oslib/os.h"
#include "oslib/wimp.h"
-#include "riscos/message.h"
#include "utils/log.h"
-#include "utils/utils.h"
+
+#include "riscos/message.h"
#include "riscos/gui.h"
struct active_message {
diff --git a/riscos/mouse.c b/riscos/mouse.c
index 25db2ff..a0cc0e7 100644
--- a/riscos/mouse.c
+++ b/riscos/mouse.c
@@ -39,7 +39,6 @@
#include <oslib/wimp.h>
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/mouse.h"
#include "riscos/gui.h"
diff --git a/riscos/query.h b/riscos/query.h
index 857cce0..c60a8bb 100644
--- a/riscos/query.h
+++ b/riscos/query.h
@@ -21,7 +21,6 @@
#include <stdbool.h>
#include "oslib/wimp.h"
-#include "utils/utils.h"
enum query_response {
QUERY_CONTINUE,
diff --git a/riscos/save.c b/riscos/save.c
index d547e0e..2733070 100644
--- a/riscos/save.c
+++ b/riscos/save.c
@@ -40,7 +40,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utf8.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
diff --git a/riscos/search.c b/riscos/search.c
index 1a178f2..989c9aa 100644
--- a/riscos/search.c
+++ b/riscos/search.c
@@ -31,7 +31,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
diff --git a/riscos/sslcert.c b/riscos/sslcert.c
index 31e81eb..9e43f2d 100644
--- a/riscos/sslcert.c
+++ b/riscos/sslcert.c
@@ -30,7 +30,6 @@
#include "oslib/wimp.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/fetch.h"
diff --git a/riscos/theme.c b/riscos/theme.c
index 7f2beea..714b9e5 100644
--- a/riscos/theme.c
+++ b/riscos/theme.c
@@ -39,7 +39,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "riscos/cookies.h"
diff --git a/riscos/theme_install.c b/riscos/theme_install.c
index 05efce4..5c11ffb 100644
--- a/riscos/theme_install.c
+++ b/riscos/theme_install.c
@@ -28,7 +28,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
diff --git a/riscos/toolbar.c b/riscos/toolbar.c
index 173d437..83751a7 100644
--- a/riscos/toolbar.c
+++ b/riscos/toolbar.c
@@ -39,7 +39,6 @@
#include "oslib/wimpspriteop.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "content/content.h"
#include "desktop/plotters.h"
diff --git a/riscos/treeview.c b/riscos/treeview.c
index 83c9f7e..3428ad3 100644
--- a/riscos/treeview.c
+++ b/riscos/treeview.c
@@ -35,11 +35,16 @@
#include "oslib/osbyte.h"
#include "oslib/osspriteop.h"
#include "oslib/wimp.h"
+
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "content/urldb.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
+
#include "riscos/bitmap.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
@@ -53,9 +58,6 @@
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
#ifndef wimp_KEY_END
#define wimp_KEY_END wimp_KEY_COPY
diff --git a/riscos/uri.c b/riscos/uri.c
index 0e4c0b8..9c384c9 100644
--- a/riscos/uri.c
+++ b/riscos/uri.c
@@ -28,7 +28,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "utils/utils.h"
#include "content/fetch.h"
#include "desktop/browser.h"
diff --git a/riscos/url_complete.c b/riscos/url_complete.c
index 2ed82e2..3cf7f92 100644
--- a/riscos/url_complete.c
+++ b/riscos/url_complete.c
@@ -29,7 +29,6 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "utils/utils.h"
#include "content/urldb.h"
#include "desktop/browser.h"
diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c
index 97c9e16..2b9ef35 100644
--- a/riscos/url_protocol.c
+++ b/riscos/url_protocol.c
@@ -36,7 +36,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "utils/utils.h"
#include "utils/config.h"
#include "content/fetch.h"
#include "desktop/browser.h"
diff --git a/riscos/wimp.c b/riscos/wimp.c
index 19e5aa7..2579c67 100644
--- a/riscos/wimp.c
+++ b/riscos/wimp.c
@@ -36,7 +36,6 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/oslib_pre7.h"
diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c
index b266004..015e87b 100644
--- a/riscos/wimp_event.c
+++ b/riscos/wimp_event.c
@@ -33,7 +33,6 @@
#include "oslib/wimp.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/utils/utils.c b/utils/utils.c
index 22af9d6..1509a6b 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -32,12 +32,6 @@
#include <errno.h>
#include <curl/curl.h>
-/* required for depricated warn_user interface */
-#include <stdbool.h>
-#include "utils/errors.h"
-#include "desktop/gui_misc.h"
-#include "desktop/gui_internal.h"
-
#include "utils/config.h"
#include "utils/log.h"
#include "utils/messages.h"
@@ -581,9 +575,3 @@ nserror nsc_strntimet(const char *str, size_t size, time_t
*timep)
return NSERROR_OK;
}
-
-/* exported interface documented in utils/utils.h */
-void warn_user(const char *message, const char *detail)
-{
- guit->misc->warning(message, detail);
-}
diff --git a/utils/utils.h b/utils/utils.h
index ec4bb5c..855ef7f 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -116,16 +116,4 @@ struct dirent;
*/
bool is_dir(const char *path);
-
-/**
- * Warn the user of an event.
- *
- * \warning depricated interface, this calls the warning entry in the
- * miscellaneous gui table and discards the return code.
- *
- * \param[in] message A warning looked up in the message translation table
- * \param[in] detail Additional text to be displayed or NULL.
- */
-void warn_user(const char *message, const char *detail);
-
#endif
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
