Remove a bunch of unused includes.

1 files changed, 22 insertions, 24 deletions

diff --git a/atari/gui.c b/atari/gui.c
index 2df8ca0c9..81423942b 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -46,10 +46,8 @@
 #include "desktop/selection.h"

 #include "desktop/textinput.h"

 #include "desktop/browser.h"

-#include "desktop/mouse.h"
-#include "render/html.h"

+#include "desktop/mouse.h"

 #include "render/font.h"

-#include "render/box.h"

 #include "utils/schedule.h"

 #include "utils/url.h"

 #include "utils/log.h"

@@ -65,7 +63,7 @@
 #include "atari/statusbar.h"

 #include "atari/toolbar.h"

 #include "atari/verify_ssl.h"

-#include "atari/hotlist.h"
+#include "atari/hotlist.h"

 #include "atari/history.h"

 #include "atari/login.h"

 #include "atari/global_evnt.h"

@@ -92,8 +90,8 @@ bool rendering = false;
 

 /* Comandline / Options: */

 int option_window_width;

-int option_window_height;
-int option_window_x;
+int option_window_height;

+int option_window_x;

 int option_window_y;

 

 /* Defaults to option_homepage_url, commandline options overwrites that value */

@@ -151,7 +149,7 @@ void gui_poll(bool active)
 	if( evnt.timer != 0 && !active ){

 		/* this suits for stuff with lower priority */

 		/* TBD: really be spare on redraws??? */

-		hotlist_redraw();
+		hotlist_redraw();

 		global_history_redraw();

 	}

 }

@@ -792,10 +790,10 @@ void gui_quit(void)
 		browser_window_destroy(gw->browser->bw);

 		gw = tmp;

 	}

-
+

 	global_history_destroy();

 	hotlist_destroy();

-	toolbar_exit();
+	toolbar_exit();

 

 	urldb_save_cookies(nsoption_charp(cookie_file));

 	urldb_save(nsoption_charp(url_file));

@@ -821,34 +819,34 @@ void gui_quit(void)
 static bool

 process_cmdline(int argc, char** argv)

 {

-	int opt;
+	int opt;

 	bool set_default_dimensions = true;

 

 	LOG(("argc %d, argv %p", argc, argv));

 

 	if ((nsoption_int(window_width) != 0) && (nsoption_int(window_height) != 0)) {

-
+

 		option_window_width = nsoption_int(window_width);

-		option_window_height = nsoption_int(window_height);
+		option_window_height = nsoption_int(window_height);

 		option_window_x = nsoption_int(window_x);

-		option_window_y = nsoption_int(window_y);
-
-		if (option_window_width <= app.w && option_window_height < app.h) {
-			set_default_dimensions = false;
+		option_window_y = nsoption_int(window_y);

+

+		if (option_window_width <= app.w && option_window_height < app.h) {

+			set_default_dimensions = false;

 		}

-	}
-
+	}

+

 	if (set_default_dimensions) {

 		if( sys_type() == SYS_TOS ){

 			/* on single tasking OS, start as fulled window: */

 			option_window_width = app.w;

-			option_window_height = app.h-20;
-			option_window_x = app.w/2-(option_window_width/2);
+			option_window_height = app.h-20;

+			option_window_x = app.w/2-(option_window_width/2);

 			option_window_y = (app.h/2)-(option_window_height/2);

 		} else {

 			option_window_width = 600;

-			option_window_height = 360;
-			option_window_x = 10;
+			option_window_height = 360;

+			option_window_x = 10;

 			option_window_y = 30;

 		}

 	}

@@ -977,9 +975,9 @@ static void gui_init2(int argc, char** argv)
 	if (sys_type() & (SYS_MAGIC|SYS_NAES|SYS_XAAES)) {

 		menu_register( _AESapid, (char*)"  NetSurf ");

 	}

-	tree_set_icon_dir( nsoption_charp(tree_icons_path) );
+	tree_set_icon_dir( nsoption_charp(tree_icons_path) );

 	global_history_init();

-	hotlist_init();
+	hotlist_init();

 	toolbar_init();

 }