summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-07-10 11:55:42 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2013-07-10 11:55:42 +0100
commit3f45e535397b45a60c696aa68565aca4d76b1f2e (patch)
treeba41217c446caa3f24a099e06bbadc05a36fedd1
parented557f090a60a1c96dae9bc3319990d589bc60ec (diff)
downloadnetsurf-3f45e535397b45a60c696aa68565aca4d76b1f2e.tar.gz
netsurf-3f45e535397b45a60c696aa68565aca4d76b1f2e.tar.bz2
s/history_core/local_history/
-rw-r--r--amiga/context_menu.c2
-rw-r--r--amiga/gui.c2
-rwxr-xr-xamiga/history_local.c2
-rwxr-xr-xatari/download.c2
-rw-r--r--atari/gui.c2
-rwxr-xr-xatari/rootwin.c2
-rwxr-xr-xatari/statusbar.c2
-rw-r--r--atari/toolbar.c2
-rw-r--r--beos/scaffolding.cpp2
-rw-r--r--cocoa/BrowserView.m2
-rw-r--r--cocoa/BrowserViewController.m2
-rw-r--r--cocoa/HistoryView.m2
-rw-r--r--cocoa/NetSurf.xcodeproj/project.pbxproj8
-rw-r--r--cocoa/NetsurfApp.m2
-rw-r--r--desktop/Makefile2
-rw-r--r--desktop/browser.c2
-rw-r--r--desktop/frames.c2
-rw-r--r--desktop/local_history.c (renamed from desktop/history_core.c)16
-rw-r--r--desktop/local_history.h (renamed from desktop/history_core.h)0
-rw-r--r--framebuffer/gui.c2
-rw-r--r--framebuffer/localhistory.c2
-rw-r--r--gtk/scaffolding.c2
-rw-r--r--riscos/history.c2
-rw-r--r--riscos/menus.c2
-rw-r--r--riscos/window.c2
-rw-r--r--windows/gui.c2
-rw-r--r--windows/localhistory.c2
27 files changed, 36 insertions, 36 deletions
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 839b60334..be52865fd 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -40,7 +40,7 @@
#include "amiga/tree.h"
#include "amiga/utf8.h"
#include "desktop/browser_private.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/hotlist.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
diff --git a/amiga/gui.c b/amiga/gui.c
index a5cac9dfc..bbc42683e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -20,7 +20,7 @@
#include "content/urldb.h"
#include "css/utils.h"
#include "desktop/browser_private.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/mouse.h"
#include "desktop/netsurf.h"
#include "utils/nsoption.h"
diff --git a/amiga/history_local.c b/amiga/history_local.c
index 3c8b6e11a..520327686 100755
--- a/amiga/history_local.c
+++ b/amiga/history_local.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include "desktop/browser_private.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/plotters.h"
#include "amiga/os3support.h"
#include "amiga/object.h"
diff --git a/atari/download.c b/atari/download.c
index 407be063d..e4a45e82e 100755
--- a/atari/download.c
+++ b/atari/download.c
@@ -28,7 +28,7 @@
#include "content/urldb.h"
#include "content/fetch.h"
#include "desktop/gui.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/netsurf.h"
#include "utils/nsoption.h"
#include "desktop/save_complete.h"
diff --git a/atari/gui.c b/atari/gui.c
index 5b0df84a0..df205aa6e 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -35,7 +35,7 @@
#include "content/fetchers/resource.h"
#include "css/utils.h"
#include "desktop/gui.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/plotters.h"
#include "desktop/netsurf.h"
#include "desktop/401login.h"
diff --git a/atari/rootwin.c b/atari/rootwin.c
index 28e327176..234421911 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -38,7 +38,7 @@
#include "utils/log.h"
#include "desktop/gui.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
diff --git a/atari/statusbar.c b/atari/statusbar.c
index 9f26d7bca..3bf186c02 100755
--- a/atari/statusbar.c
+++ b/atari/statusbar.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "desktop/gui.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
diff --git a/atari/toolbar.c b/atari/toolbar.c
index 79be31b73..e190c9676 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "desktop/gui.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index fe40b0c70..7834db419 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -52,7 +52,7 @@
extern "C" {
#include "content/content.h"
#include "desktop/browser_private.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/plotters.h"
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index c472fd7d7..ca5808c90 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -24,7 +24,7 @@
#import "cocoa/BrowserWindowController.h"
#import "desktop/browser_private.h"
-#import "desktop/history_core.h"
+#import "desktop/local_history.h"
#import "desktop/plotters.h"
#import "desktop/textinput.h"
#import "utils/nsoption.h"
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m
index 4952f52e3..77ee57bd1 100644
--- a/cocoa/BrowserViewController.m
+++ b/cocoa/BrowserViewController.m
@@ -21,7 +21,7 @@
#import "cocoa/BrowserWindowController.h"
#import "desktop/browser_private.h"
-#import "desktop/history_core.h"
+#import "desktop/local_history.h"
#import "desktop/textinput.h"
#import "utils/nsoption.h"
diff --git a/cocoa/HistoryView.m b/cocoa/HistoryView.m
index 31a8e2496..45f7facbf 100644
--- a/cocoa/HistoryView.m
+++ b/cocoa/HistoryView.m
@@ -24,7 +24,7 @@
#import "cocoa/BrowserView.h"
#import "desktop/browser_private.h"
-#import "desktop/history_core.h"
+#import "desktop/local_history.h"
#import "desktop/plotters.h"
@implementation HistoryView
diff --git a/cocoa/NetSurf.xcodeproj/project.pbxproj b/cocoa/NetSurf.xcodeproj/project.pbxproj
index eacc80a43..ca0bed6f3 100644
--- a/cocoa/NetSurf.xcodeproj/project.pbxproj
+++ b/cocoa/NetSurf.xcodeproj/project.pbxproj
@@ -47,8 +47,8 @@
260F1F8B12D620E800D9B07F /* frames.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = frames.c; sourceTree = "<group>"; };
260F1F8C12D620E800D9B07F /* frames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frames.h; sourceTree = "<group>"; };
260F1F8D12D620E800D9B07F /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; };
- 260F1F8E12D620E800D9B07F /* history_core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = history_core.c; sourceTree = "<group>"; };
- 260F1F8F12D620E800D9B07F /* history_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = history_core.h; sourceTree = "<group>"; };
+ 260F1F8E12D620E800D9B07F /* local_history.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = local_history.c; sourceTree = "<group>"; };
+ 260F1F8F12D620E800D9B07F /* local_history.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = local_history.h; sourceTree = "<group>"; };
260F1F9012D620E800D9B07F /* history_global_core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = history_global_core.c; sourceTree = "<group>"; };
260F1F9112D620E800D9B07F /* history_global_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = history_global_core.h; sourceTree = "<group>"; };
260F1F9212D620E800D9B07F /* hotlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hotlist.c; sourceTree = "<group>"; };
@@ -404,8 +404,8 @@
260F1F8B12D620E800D9B07F /* frames.c */,
260F1F8C12D620E800D9B07F /* frames.h */,
260F1F8D12D620E800D9B07F /* gui.h */,
- 260F1F8E12D620E800D9B07F /* history_core.c */,
- 260F1F8F12D620E800D9B07F /* history_core.h */,
+ 260F1F8E12D620E800D9B07F /* local_history.c */,
+ 260F1F8F12D620E800D9B07F /* local_history.h */,
260F1F9012D620E800D9B07F /* history_global_core.c */,
260F1F9112D620E800D9B07F /* history_global_core.h */,
260F1F9212D620E800D9B07F /* hotlist.c */,
diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m
index 333cbe272..33e3bfa43 100644
--- a/cocoa/NetsurfApp.m
+++ b/cocoa/NetsurfApp.m
@@ -26,7 +26,7 @@
#import "content/fetch.h"
#import "css/utils.h"
#import "desktop/gui.h"
-#import "desktop/history_core.h"
+#import "desktop/local_history.h"
#import "desktop/mouse.h"
#import "desktop/netsurf.h"
#import "utils/nsoption.h"
diff --git a/desktop/Makefile b/desktop/Makefile
index f787fd295..ded75aaa2 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -12,7 +12,7 @@ desktop/version.c: testament utils/testament.h
# S_BROWSER are sources related to full browsers but are common
# between RISC OS, GTK, BeOS and AmigaOS builds
-S_BROWSER := browser.c download.c frames.c history_core.c netsurf.c \
+S_BROWSER := browser.c download.c frames.c local_history.c netsurf.c \
save_complete.c save_text.c selection.c textinput.c
S_BROWSER := $(addprefix desktop/,$(S_BROWSER))
diff --git a/desktop/browser.c b/desktop/browser.c
index b7ec98947..4df48e4fe 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -45,7 +45,7 @@
#include "desktop/browser_private.h"
#include "desktop/download.h"
#include "desktop/frames.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/hotlist.h"
#include "desktop/gui.h"
#include "desktop/knockout.h"
diff --git a/desktop/frames.c b/desktop/frames.c
index dcc66df9d..3f7613f32 100644
--- a/desktop/frames.c
+++ b/desktop/frames.c
@@ -32,7 +32,7 @@
#include "content/hlcache.h"
#include "desktop/browser_private.h"
#include "desktop/frames.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/gui.h"
#include "desktop/scrollbar.h"
#include "desktop/selection.h"
diff --git a/desktop/history_core.c b/desktop/local_history.c
index bc933c0c1..7b5ecc79a 100644
--- a/desktop/history_core.c
+++ b/desktop/local_history.c
@@ -32,7 +32,7 @@
#include "css/css.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/plotters.h"
#include "desktop/thumbnail.h"
#include "image/bitmap.h"
@@ -422,7 +422,7 @@ bool history_forward_available(struct history *history)
}
-/* Documented in history_core.h */
+/* Documented in local_history.h */
void history_go(struct browser_window *bw,
struct history *history,
struct history_entry *entry,
@@ -782,7 +782,7 @@ struct history_entry *history_find_position(struct history_entry *entry,
return 0;
}
-/* Documented in history_core.h */
+/* Documented in local_history.h */
void history_enumerate_forward(struct history *history,
history_enumerate_cb cb, void *user_data)
{
@@ -797,7 +797,7 @@ void history_enumerate_forward(struct history *history,
}
}
-/* Documented in history_core.h */
+/* Documented in local_history.h */
void history_enumerate_back(struct history *history,
history_enumerate_cb cb, void *user_data)
{
@@ -812,7 +812,7 @@ void history_enumerate_back(struct history *history,
}
}
-/* Documented in history_core.h */
+/* Documented in local_history.h */
void history_enumerate(const struct history *history, history_enumerate_cb cb,
void *user_data)
{
@@ -845,19 +845,19 @@ static bool history_enumerate_entry(const struct history *history,
return true;
}
-/* Documented in history_core.h */
+/* Documented in local_history.h */
const char *history_entry_get_url(const struct history_entry *entry)
{
return entry->page.url;
}
-/* Documented in history_core.h */
+/* Documented in local_history.h */
const char *history_entry_get_fragment_id(const struct history_entry *entry)
{
return entry->page.frag_id;
}
-/* Documented in history_core.h */
+/* Documented in local_history.h */
const char *history_entry_get_title(const struct history_entry *entry)
{
return entry->page.title;
diff --git a/desktop/history_core.h b/desktop/local_history.h
index 76f39a7c7..76f39a7c7 100644
--- a/desktop/history_core.h
+++ b/desktop/local_history.h
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index d9e78d7a8..c9adf6c0a 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -56,7 +56,7 @@
#include "framebuffer/font.h"
#include "content/urldb.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "content/fetch.h"
#define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrutc"
diff --git a/framebuffer/localhistory.c b/framebuffer/localhistory.c
index e23dd1f99..d4820980f 100644
--- a/framebuffer/localhistory.c
+++ b/framebuffer/localhistory.c
@@ -52,7 +52,7 @@
#include "framebuffer/font.h"
#include "content/urldb.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "content/fetch.h"
static int
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index b10fb69ae..c0736985c 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -33,7 +33,7 @@
#include "content/hlcache.h"
#include "css/utils.h"
#include "desktop/browser_private.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/hotlist.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
diff --git a/riscos/history.c b/riscos/history.c
index 65ae84758..be81e1aa4 100644
--- a/riscos/history.c
+++ b/riscos/history.c
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include "oslib/wimp.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/plotters.h"
#include "riscos/dialog.h"
#include "desktop/browser_private.h"
diff --git a/riscos/menus.c b/riscos/menus.c
index aaec8cfb4..337ca4810 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -38,7 +38,7 @@
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/hotlist.h"
#include "desktop/netsurf.h"
#include "desktop/textinput.h"
diff --git a/riscos/window.c b/riscos/window.c
index 772a0d1b1..8e0f0a018 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -49,7 +49,7 @@
#include "desktop/cookies.h"
#include "desktop/scrollbar.h"
#include "desktop/frames.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/hotlist.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"
diff --git a/windows/gui.c b/windows/gui.c
index f8d57fd33..767f6812e 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -33,7 +33,7 @@
#include "content/fetch.h"
#include "css/utils.h"
#include "desktop/browser_private.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/mouse.h"
#include "desktop/netsurf.h"
#include "utils/nsoption.h"
diff --git a/windows/localhistory.c b/windows/localhistory.c
index f58ab81cc..0b298719f 100644
--- a/windows/localhistory.c
+++ b/windows/localhistory.c
@@ -23,7 +23,7 @@
#include <commctrl.h>
#include "desktop/browser_private.h"
-#include "desktop/history_core.h"
+#include "desktop/local_history.h"
#include "desktop/plotters.h"
#include "utils/utils.h"
#include "utils/log.h"