From 22d84a587b299f028dbff4d3f8d8ecd56b275c2f Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 12 Jun 2016 11:57:22 +0100
Subject: reduce cocoa unecessary use of core API

---
 frontends/cocoa/BrowserView.m    | 2 ++
 frontends/cocoa/FormSelectMenu.m | 1 +
 frontends/cocoa/NetsurfApp.m     | 1 +
 frontends/cocoa/coordinates.h    | 3 ---
 frontends/cocoa/font.m           | 6 +++---
 frontends/cocoa/gui.m            | 1 +
 frontends/cocoa/plotter.h        | 1 -
 frontends/cocoa/plotter.m        | 1 +
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index d2f3f51b4..2d1912840 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -19,6 +19,7 @@
 #import "utils/nsoption.h"
 #import "utils/messages.h"
 #import "utils/nsurl.h"
+#import "utils/utils.h"
 #import "netsurf/browser_window.h"
 #import "netsurf/plotters.h"
 #import "netsurf/content.h"
@@ -28,6 +29,7 @@
 #import "cocoa/BrowserView.h"
 #import "cocoa/HistoryView.h"
 #import "cocoa/font.h"
+#import "cocoa/coordinates.h"
 #import "cocoa/plotter.h"
 #import "cocoa/LocalHistoryController.h"
 #import "cocoa/BrowserWindowController.h"
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index b0ea0e62d..ab8add9cb 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -19,6 +19,7 @@
 #import "cocoa/FormSelectMenu.h"
 #import "cocoa/coordinates.h"
 
+#import "utils/utils.h"
 #import "netsurf/browser_window.h"
 #import "render/form.h"
 
diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m
index 5becdf92b..7584f4f05 100644
--- a/frontends/cocoa/NetsurfApp.m
+++ b/frontends/cocoa/NetsurfApp.m
@@ -35,6 +35,7 @@
 #import "netsurf/plotters.h"
 #import "netsurf/mouse.h"
 #import "netsurf/netsurf.h"
+#import "netsurf/browser_window.h"
 #import "content/urldb.h"
 #import "desktop/save_complete.h"
 #import "desktop/textinput.h"
diff --git a/frontends/cocoa/coordinates.h b/frontends/cocoa/coordinates.h
index 4bd92220f..a9614389b 100644
--- a/frontends/cocoa/coordinates.h
+++ b/frontends/cocoa/coordinates.h
@@ -19,9 +19,6 @@
 #ifndef COCOA_COORDINATES_H
 #define COCOA_COORDINATES_H
 
-#include "utils/utils.h"
-#import "netsurf/browser_window.h"
-
 extern CGFloat cocoa_scale_factor;
 
 static inline CGFloat cocoa_px_to_pt( int location ) __attribute__((always_inline,pure));
diff --git a/frontends/cocoa/font.m b/frontends/cocoa/font.m
index 483d98933..17212fff9 100644
--- a/frontends/cocoa/font.m
+++ b/frontends/cocoa/font.m
@@ -18,13 +18,13 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "cocoa/plotter.h"
-#import "cocoa/font.h"
-
 #import "utils/nsoption.h"
 #import "netsurf/layout.h"
 #import "netsurf/plotters.h"
 
+#import "cocoa/coordinates.h"
+#import "cocoa/plotter.h"
+#import "cocoa/font.h"
 
 static NSLayoutManager *cocoa_prepare_layout_manager( const char *string, size_t length, 
 													 const plot_font_style_t *style );
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index 5702bb3d9..7e6c996ec 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -30,6 +30,7 @@
 #import "desktop/textinput.h"
 
 #import "cocoa/gui.h"
+#import "cocoa/coordinates.h"
 #import "cocoa/plotter.h"
 #import "cocoa/BrowserView.h"
 #import "cocoa/BrowserViewController.h"
diff --git a/frontends/cocoa/plotter.h b/frontends/cocoa/plotter.h
index 8a26e5246..88f9fcab6 100644
--- a/frontends/cocoa/plotter.h
+++ b/frontends/cocoa/plotter.h
@@ -21,7 +21,6 @@
 
 #import <Cocoa/Cocoa.h>
 #import "desktop/plot_style.h"
-#import "cocoa/coordinates.h"
 
 extern const struct plotter_table cocoa_plotters;
 
diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index 2b721bfe6..20b688414 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -25,6 +25,7 @@
 #import "desktop/plot_style.h"
 
 #import "cocoa/font.h"
+#import "cocoa/coordinates.h"
 #import "cocoa/plotter.h"
 #import "cocoa/bitmap.h"
 
-- 
cgit v1.2.3