From 46e569c481f1c5196fd90b05bd801809355f2d84 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Mon, 2 Sep 2013 14:42:53 +0100
Subject: Use TREE_HOTLIST directly.

---
 amiga/hotlist.c             |  2 +-
 atari/hotlist.c             |  2 +-
 cocoa/BookmarksController.m |  2 +-
 desktop/hotlist_old.c       | 11 -----------
 desktop/hotlist_old.h       |  1 -
 gtk/hotlist.c               |  2 +-
 riscos/hotlist.c            |  2 +-
 7 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/amiga/hotlist.c b/amiga/hotlist.c
index 9b9fd8076..daea82093 100755
--- a/amiga/hotlist.c
+++ b/amiga/hotlist.c
@@ -57,7 +57,7 @@ void ami_hotlist_add_default_dirs(struct tree *tree)
 void ami_hotlist_initialise(const char *hotlist_file)
 {
 	tree_hotlist_path = hotlist_file;
-	hotlist_window = ami_tree_create(hotlist_old_get_tree_flags(), NULL);
+	hotlist_window = ami_tree_create(TREE_HOTLIST, NULL);
 
 	if(!hotlist_window) return;
 
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 9a818a384..75732a6e9 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -129,7 +129,7 @@ void atari_hotlist_init(void)
 			gemtk_wm_unlink(hl.window);
 			tree_hotlist_path = (const char*)&hl.path;
 			hl.tv = atari_treeview_create(
-				hotlist_old_get_tree_flags(),
+				TREE_HOTLIST,
 				hl.window,
 				handle_event
 			);
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m
index 7c1d80406..28f53b800 100644
--- a/cocoa/BookmarksController.m
+++ b/cocoa/BookmarksController.m
@@ -48,7 +48,7 @@ static const char *cocoa_hotlist_path( void )
 {
 	if ((self = [super initWithWindowNibName: @"BookmarksWindow"]) == nil) return nil;
 	tree_hotlist_path = cocoa_hotlist_path();
-	tree = [[Tree alloc] initWithFlags: hotlist_old_get_tree_flags()];
+	tree = [[Tree alloc] initWithFlags: TREE_HOTLIST];
 	hotlist_old_initialise( [tree tree], cocoa_hotlist_path(), "directory.png" );
 	nodeForMenu = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 0 );
 	
diff --git a/desktop/hotlist_old.c b/desktop/hotlist_old.c
index ad2404584..b09ace3c9 100644
--- a/desktop/hotlist_old.c
+++ b/desktop/hotlist_old.c
@@ -48,17 +48,6 @@ bool hotlist_old_initialise(struct tree *tree, const char *hotlist_path,
 }
 
 
-/**
- * Get flags with which the hotlist tree should be created;
- *
- * \return the flags
- */
-unsigned int hotlist_old_get_tree_flags(void)
-{
-	return TREE_HOTLIST;
-}
-
-
 /**
  * Deletes the global history tree and saves the hotlist.
  * \param hotlist_path the path where the hotlist should be saved
diff --git a/desktop/hotlist_old.h b/desktop/hotlist_old.h
index 487b336f0..b063677ca 100644
--- a/desktop/hotlist_old.h
+++ b/desktop/hotlist_old.h
@@ -39,7 +39,6 @@
  */
 bool hotlist_old_initialise(struct tree *tree, const char *hotlist_path, const char* folder_icon_name);
 
-unsigned int hotlist_old_get_tree_flags(void);
 void hotlist_old_cleanup(const char *hotlist_path);
 
 
diff --git a/gtk/hotlist.c b/gtk/hotlist.c
index 8a1c81570..2975998c4 100644
--- a/gtk/hotlist.c
+++ b/gtk/hotlist.c
@@ -122,7 +122,7 @@ bool nsgtk_hotlist_init(const char *glade_file_location)
 
 	
 	tree_hotlist_path = nsoption_charp(hotlist_path);
-	hotlist_window = nsgtk_treeview_create(hotlist_old_get_tree_flags(), window,
+	hotlist_window = nsgtk_treeview_create(TREE_HOTLIST, window,
 			scrolled, drawing_area);
 	
 	if (hotlist_window == NULL)
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index 09f8c7165..9b1e9f140 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -131,7 +131,7 @@ void ro_gui_hotlist_postinitialise(void)
 	tree_hotlist_path = nsoption_charp(hotlist_path);
 	hotlist_window.tv = ro_treeview_create(hotlist_window.window,
 			hotlist_window.toolbar, &ro_hotlist_treeview_callbacks,
-			hotlist_old_get_tree_flags());
+			TREE_HOTLIST);
 	if (hotlist_window.tv == NULL) {
 		LOG(("Failed to allocate treeview"));
 		return;
-- 
cgit v1.2.3