summaryrefslogtreecommitdiff
path: root/cocoa
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2013-02-18 11:51:42 +0000
committerVincent Sanders <vince@netsurf-browser.org>2013-02-18 11:51:42 +0000
commit529ca251fcc47de243e0dba22af83828de3d97e7 (patch)
tree883ace5365cd08f7ea440571974811867b8a74b7 /cocoa
parentb112dec78d5e8289ded3f61db96e495690ae96b5 (diff)
downloadnetsurf-529ca251fcc47de243e0dba22af83828de3d97e7.tar.gz
netsurf-529ca251fcc47de243e0dba22af83828de3d97e7.tar.bz2
rename flags for browser_window routines to be shorter
Diffstat (limited to 'cocoa')
-rw-r--r--cocoa/BookmarksController.m8
-rw-r--r--cocoa/BrowserView.m18
-rw-r--r--cocoa/BrowserViewController.m8
-rw-r--r--cocoa/BrowserWindowController.m6
-rw-r--r--cocoa/NetSurfAppDelegate.m16
-rw-r--r--cocoa/NetsurfApp.m4
6 files changed, 30 insertions, 30 deletions
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m
index 830c054a7..1f7be4fdf 100644
--- a/cocoa/BookmarksController.m
+++ b/cocoa/BookmarksController.m
@@ -141,14 +141,14 @@ static const char *cocoa_hotlist_path( void )
error = browser_window_navigate([tab browser],
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
} else {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index aed2230b9..02aa15bab 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -580,9 +580,9 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
error = nsurl_create([[sender representedObject] UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
browser,
@@ -601,8 +601,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
error = nsurl_create([[sender representedObject] UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
browser,
@@ -622,8 +622,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
browser_window_navigate(browser,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -687,8 +687,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
browser_window_navigate(browser,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m
index 7a134eedf..cd0f4bd12 100644
--- a/cocoa/BrowserViewController.m
+++ b/cocoa/BrowserViewController.m
@@ -77,8 +77,8 @@
browser_window_navigate(browser,
nsurl,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -141,8 +141,8 @@
browser_window_navigate(browser,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m
index 771ae0841..9e6581ecc 100644
--- a/cocoa/BrowserWindowController.m
+++ b/cocoa/BrowserWindowController.m
@@ -159,9 +159,9 @@
error = nsurl_create(NETSURF_HOMEPAGE, &url);
}
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
[activeBrowser browser],
diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m
index ba8678d42..fc9171b40 100644
--- a/cocoa/NetSurfAppDelegate.m
+++ b/cocoa/NetSurfAppDelegate.m
@@ -49,8 +49,8 @@
}
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -73,8 +73,8 @@
for (NSURL *url in [openPanel URLs]) {
error = nsurl_create([[url absoluteString] UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -96,8 +96,8 @@
error = nsurl_create([urlAsString UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -180,8 +180,8 @@
error = nsurl_create([[urltxt absoluteString] UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m
index b9cf4b999..9d19824ae 100644
--- a/cocoa/NetsurfApp.m
+++ b/cocoa/NetsurfApp.m
@@ -199,8 +199,8 @@ int main( int argc, char **argv )
error = nsurl_create(argv[i], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,