summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-09-02 16:39:46 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2013-09-02 16:39:46 +0100
commit4473f4b8a8b929c4c5e9dac3013da75f7c66865f (patch)
tree5fae4e4345613546698ba512e0c43d047f6e0ec8
parent49c7994d0580a655ddcc78e07205eea45d74132c (diff)
downloadnetsurf-4473f4b8a8b929c4c5e9dac3013da75f7c66865f.tar.gz
netsurf-4473f4b8a8b929c4c5e9dac3013da75f7c66865f.tar.bz2
Remove tree icon_name globals from all the front ends.
-rwxr-xr-xamiga/cookies.c3
-rw-r--r--amiga/gui.c2
-rwxr-xr-xamiga/history.c2
-rwxr-xr-xamiga/hotlist.c3
-rwxr-xr-xamiga/tree.h4
-rwxr-xr-xatari/history.c1
-rw-r--r--beos/Makefile.target2
-rw-r--r--beos/treeview.cpp35
-rw-r--r--framebuffer/Makefile.target2
-rw-r--r--framebuffer/tree.c23
-rw-r--r--gtk/cookies.c3
-rw-r--r--gtk/history.c3
-rw-r--r--gtk/hotlist.c3
-rw-r--r--gtk/treeview.c3
-rw-r--r--gtk/treeview.h4
-rw-r--r--riscos/cookies.c3
-rw-r--r--riscos/global_history.c3
-rw-r--r--riscos/hotlist.c3
-rw-r--r--riscos/treeview.c4
-rw-r--r--riscos/treeview.h4
-rw-r--r--windows/Makefile.target3
-rw-r--r--windows/tree.c23
22 files changed, 12 insertions, 124 deletions
diff --git a/amiga/cookies.c b/amiga/cookies.c
index a095a6e11..c1f886804 100755
--- a/amiga/cookies.c
+++ b/amiga/cookies.c
@@ -28,8 +28,7 @@ void ami_cookies_initialise(void)
if(!cookies_window) return;
cookies_initialise(ami_tree_get_tree(cookies_window),
- tree_directory_icon_name,
- tree_content_icon_name);
+ NULL, NULL);
}
void ami_cookies_free()
diff --git a/amiga/gui.c b/amiga/gui.c
index 9f870435f..6a9e6d24d 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -162,8 +162,6 @@ struct Hook newprefs_hook;
static char *current_user;
static char *current_user_dir;
-const char tree_directory_icon_name[] = "def_drawer.info";
-const char tree_content_icon_name[] = "def_project.info";
static const __attribute__((used)) char *stack_cookie = "\0$STACK:131072\0";
const char * const versvn;
diff --git a/amiga/history.c b/amiga/history.c
index 23a6a709f..6206efdbd 100755
--- a/amiga/history.c
+++ b/amiga/history.c
@@ -29,7 +29,7 @@ void ami_global_history_initialise(void)
if(!global_history_window) return;
history_global_initialise(ami_tree_get_tree(global_history_window),
- tree_directory_icon_name);
+ NULL);
}
void ami_global_history_free()
diff --git a/amiga/hotlist.c b/amiga/hotlist.c
index daea82093..fa93b46aa 100755
--- a/amiga/hotlist.c
+++ b/amiga/hotlist.c
@@ -62,8 +62,7 @@ void ami_hotlist_initialise(const char *hotlist_file)
if(!hotlist_window) return;
hotlist_old_initialise(ami_tree_get_tree(hotlist_window),
- hotlist_file,
- tree_directory_icon_name);
+ hotlist_file, NULL);
ami_hotlist_add_default_dirs(ami_tree_get_tree(hotlist_window));
}
diff --git a/amiga/tree.h b/amiga/tree.h
index 179b61afd..d8d50fe1a 100755
--- a/amiga/tree.h
+++ b/amiga/tree.h
@@ -25,10 +25,6 @@
#include "amiga/gui.h"
#include "desktop/tree.h"
-/* defined in front end code */
-extern const char tree_directory_icon_name[];
-extern const char tree_content_icon_name[];
-
struct treeview_window;
enum
diff --git a/atari/history.c b/atari/history.c
index b17f2c239..da923a494 100755
--- a/atari/history.c
+++ b/atari/history.c
@@ -41,7 +41,6 @@
//TODO: remove/add guiwin handle on close / open - so that the list
// is kept tiny.
-extern char * tree_directory_icon_name;
extern GRECT desk_area;
struct s_atari_global_history gl_history;
diff --git a/beos/Makefile.target b/beos/Makefile.target
index 8df9ec38b..499ec16e9 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -89,7 +89,7 @@ endif
# S_BEOS are sources purely for the BeOS build
S_BEOS := about.cpp bitmap.cpp download.cpp fetch_rsrc.cpp filetype.cpp \
font.cpp gui.cpp login.cpp gui_options.cpp plotters.cpp \
- scaffolding.cpp search.cpp schedule.cpp thumbnail.cpp treeview.cpp \
+ scaffolding.cpp search.cpp schedule.cpp thumbnail.cpp \
throbber.cpp window.cpp
S_BEOS := $(addprefix beos/,$(S_BEOS))
diff --git a/beos/treeview.cpp b/beos/treeview.cpp
deleted file mode 100644
index f3d3d356b..000000000
--- a/beos/treeview.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 Fran├žois Revol <mmu_man@users.sourceforge.net>
- * Copyright 2004 Richard Wilson <not_ginger_matt@users.sourceforge.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/>.
- */
-
-/** \file
- * Generic tree handling (implementation).
- */
-
-
-#define __STDBOOL_H__ 1
-extern "C" {
-#include "utils/config.h"
-#include "desktop/tree.h"
-}
-
-const char tree_directory_icon_name[] = "directory.png";
-const char tree_content_icon_name[] = "content.png";
-
-
-
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index bad31ed9d..d423e298f 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -136,7 +136,7 @@ $(eval $(foreach V,$(filter FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V
# ----------------------------------------------------------------------------
# S_FRAMEBUFFER are sources purely for the framebuffer build
-S_FRAMEBUFFER := gui.c framebuffer.c tree.c schedule.c \
+S_FRAMEBUFFER := gui.c framebuffer.c schedule.c \
thumbnail.c misc.c bitmap.c filetype.c login.c findfile.c \
localhistory.c clipboard.c
diff --git a/framebuffer/tree.c b/framebuffer/tree.c
deleted file mode 100644
index 942a4aada..000000000
--- a/framebuffer/tree.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2008 Vincent Sanders <vince@simtec.co.uk>
- *
- * 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/tree.h"
-
-const char tree_directory_icon_name[] = "directory.png";
-const char tree_content_icon_name[] = "content.png";
-
diff --git a/gtk/cookies.c b/gtk/cookies.c
index f8b2b7d35..7a199e7e3 100644
--- a/gtk/cookies.c
+++ b/gtk/cookies.c
@@ -125,8 +125,7 @@ bool nsgtk_cookies_init(const char *glade_file_location)
CONNECT(window, "hide", nsgtk_tree_window_hide, cookies_window);
cookies_initialise(nsgtk_treeview_get_tree(cookies_window),
- tree_directory_icon_name,
- tree_content_icon_name);
+ NULL, NULL);
nsgtk_cookies_init_menu();
diff --git a/gtk/history.c b/gtk/history.c
index ae0282312..7410a156d 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -127,8 +127,7 @@ bool nsgtk_history_init(const char *glade_file_location)
CONNECT(window, "hide", nsgtk_tree_window_hide, global_history_window);
history_global_initialise(
- nsgtk_treeview_get_tree(global_history_window),
- tree_directory_icon_name);
+ nsgtk_treeview_get_tree(global_history_window), NULL);
nsgtk_history_init_menu();
diff --git a/gtk/hotlist.c b/gtk/hotlist.c
index 2975998c4..3a0bae9cf 100644
--- a/gtk/hotlist.c
+++ b/gtk/hotlist.c
@@ -135,8 +135,7 @@ bool nsgtk_hotlist_init(const char *glade_file_location)
CONNECT(window, "hide", nsgtk_tree_window_hide, hotlist_window);
hotlist_old_initialise(nsgtk_treeview_get_tree(hotlist_window),
- nsoption_charp(hotlist_path),
- tree_directory_icon_name);
+ nsoption_charp(hotlist_path), NULL);
nsgtk_hotlist_init_menu();
diff --git a/gtk/treeview.c b/gtk/treeview.c
index 8fc53c335..2a4732a87 100644
--- a/gtk/treeview.c
+++ b/gtk/treeview.c
@@ -49,9 +49,6 @@ struct nsgtk_treeview {
struct tree *tree;
};
-const char tree_directory_icon_name[] = "directory.png";
-const char tree_content_icon_name[] = "content.png";
-
void nsgtk_treeview_destroy(struct nsgtk_treeview *tv)
{
tree_delete(tv->tree);
diff --git a/gtk/treeview.h b/gtk/treeview.h
index 4c94da498..12eb18096 100644
--- a/gtk/treeview.h
+++ b/gtk/treeview.h
@@ -26,10 +26,6 @@
#include "desktop/browser.h"
-/* defined in front end code */
-extern const char tree_directory_icon_name[];
-extern const char tree_content_icon_name[];
-
struct nsgtk_treeview;
struct nsgtk_treeview *nsgtk_treeview_create(unsigned int flags,
diff --git a/riscos/cookies.c b/riscos/cookies.c
index ea961e2dc..1eb084f98 100644
--- a/riscos/cookies.c
+++ b/riscos/cookies.c
@@ -120,8 +120,7 @@ void ro_gui_cookies_postinitialise(void)
/* Initialise the cookies into the tree. */
cookies_initialise(ro_treeview_get_tree(cookies_window.tv),
- tree_directory_icon_name,
- tree_content_icon_name);
+ NULL, NULL);
/* Build the cookies window menu. */
diff --git a/riscos/global_history.c b/riscos/global_history.c
index 704f80426..a3ab0896d 100644
--- a/riscos/global_history.c
+++ b/riscos/global_history.c
@@ -125,8 +125,7 @@ void ro_gui_global_history_postinitialise(void)
/* Initialise the global history into the tree. */
history_global_initialise(
- ro_treeview_get_tree(global_history_window.tv),
- tree_directory_icon_name);
+ ro_treeview_get_tree(global_history_window.tv), NULL);
/* Build the global history window menu. */
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index a0a1cf61d..28bac8371 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -144,8 +144,7 @@ void ro_gui_hotlist_postinitialise(void)
/* Initialise the hotlist into the tree. */
hotlist_old_initialise(ro_treeview_get_tree(hotlist_window.tv),
- nsoption_charp(hotlist_path),
- tree_directory_icon_name);
+ nsoption_charp(hotlist_path), NULL);
/* Build the hotlist window menu. */
diff --git a/riscos/treeview.c b/riscos/treeview.c
index 004091abe..479a857cc 100644
--- a/riscos/treeview.c
+++ b/riscos/treeview.c
@@ -60,10 +60,6 @@
#define wimp_KEY_END wimp_KEY_COPY
#endif
-/** \todo Ugh! */
-const char tree_directory_icon_name[] = "directory.png";
-const char tree_content_icon_name[] = "content.png";
-
struct ro_treeview
{
struct tree *tree; /*< Pointer to treeview tree block. */
diff --git a/riscos/treeview.h b/riscos/treeview.h
index 0745e00c3..77505ac66 100644
--- a/riscos/treeview.h
+++ b/riscos/treeview.h
@@ -31,10 +31,6 @@
#include "desktop/tree.h"
#include "riscos/toolbar.h"
-/* defined in front end code */
-extern const char tree_directory_icon_name[];
-extern const char tree_content_icon_name[];
-
typedef struct ro_treeview ro_treeview;
struct ro_treeview_callbacks {
diff --git a/windows/Makefile.target b/windows/Makefile.target
index f49079588..1cdb4a61a 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -66,8 +66,7 @@ S_RESOURCES := windows_resource.o
# S_WINDOWS are sources purely for the windows build
S_WINDOWS := main.c window.c gui.c drawable.c misc.c plot.c findfile.c \
font.c bitmap.c about.c prefs.c download.c filetype.c \
- localhistory.c login.c schedule.c thumbnail.c tree.c \
- windbg.c
+ localhistory.c login.c schedule.c thumbnail.c windbg.c
S_WINDOWS := $(addprefix windows/,$(S_WINDOWS))
# This is the final source build list
diff --git a/windows/tree.c b/windows/tree.c
deleted file mode 100644
index 942a4aada..000000000
--- a/windows/tree.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2008 Vincent Sanders <vince@simtec.co.uk>
- *
- * 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/tree.h"
-
-const char tree_directory_icon_name[] = "directory.png";
-const char tree_content_icon_name[] = "content.png";
-