From 990598ccdcb9610799dd22aa76056527574d0b6b Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Mon, 2 May 2016 10:32:54 +0100
Subject: fix cocoa include ordering to ensure error enum is available

---
 cocoa/BookmarksController.m         | 13 +++++++------
 cocoa/BrowserWindowController.m     | 11 ++++++-----
 cocoa/DownloadWindowController.m    |  6 +++---
 cocoa/PreferencesWindowController.m |  9 ++++-----
 cocoa/gui.m                         | 19 ++++++++++---------
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m
index 9aec9e534..0bd51b273 100644
--- a/cocoa/BookmarksController.m
+++ b/cocoa/BookmarksController.m
@@ -16,6 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "utils/messages.h"
+#import "utils/utils.h"
+#import "desktop/browser.h"
+#import "desktop/hotlist.h"
+#import "desktop/tree.h"
+#import "content/hlcache.h"
+
 #import "cocoa/BookmarksController.h"
 #import "cocoa/Tree.h"
 #import "cocoa/TreeView.h"
@@ -23,12 +30,6 @@
 #import "cocoa/BrowserViewController.h"
 #import "cocoa/gui.h"
 
-#import "desktop/browser.h"
-#import "desktop/hotlist.h"
-#import "desktop/tree.h"
-#import "utils/messages.h"
-#import "utils/utils.h"
-#import "content/hlcache.h"
 
 @interface BookmarksController ()
 - (void) noteAppWillTerminate: (NSNotification *) note;
diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m
index 686e37bbd..bfb8be05e 100644
--- a/cocoa/BrowserWindowController.m
+++ b/cocoa/BrowserWindowController.m
@@ -16,6 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "desktop/browser.h"
+#import "utils/nsoption.h"
+#import "utils/messages.h"
+#import "utils/utils.h"
+#import "utils/nsurl.h"
+
 #import "cocoa/BrowserWindowController.h"
 
 #import "cocoa/BrowserViewController.h"
@@ -25,11 +31,6 @@
 #import "cocoa/gui.h"
 #import "cocoa/NetsurfApp.h"
 
-#import "desktop/browser.h"
-#import "utils/nsoption.h"
-#import "utils/messages.h"
-#import "utils/utils.h"
-#import "utils/nsurl.h"
 
 @interface BrowserWindowController ()
 
diff --git a/cocoa/DownloadWindowController.m b/cocoa/DownloadWindowController.m
index 1241e5094..0c9d869f8 100644
--- a/cocoa/DownloadWindowController.m
+++ b/cocoa/DownloadWindowController.m
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "cocoa/DownloadWindowController.h"
-#import "cocoa/gui.h"
-
 #import "utils/log.h"
 #import "utils/nsurl.h"
 #import "desktop/download.h"
 #import "desktop/gui_download.h"
 
+#import "cocoa/DownloadWindowController.h"
+#import "cocoa/gui.h"
+
 @interface DownloadWindowController ()
 
 @property (readwrite, retain, nonatomic) NSFileHandle *outputFile;
diff --git a/cocoa/PreferencesWindowController.m b/cocoa/PreferencesWindowController.m
index f8a48499a..f314736e3 100644
--- a/cocoa/PreferencesWindowController.m
+++ b/cocoa/PreferencesWindowController.m
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "utils/nsoption.h"
+#import "desktop/browser.h"
+#import "content/content.h"
+#import "content/hlcache.h"
 
 #import "cocoa/PreferencesWindowController.h"
 #import "cocoa/NetsurfApp.h"
 #import "cocoa/gui.h"
 #import "cocoa/BrowserViewController.h"
 
-#import "desktop/browser.h"
-#import "content/content.h"
-#import "utils/nsoption.h"
-#import "content/hlcache.h"
-
 @implementation PreferencesWindowController
 
 - init;
diff --git a/cocoa/gui.m b/cocoa/gui.m
index afd4905be..a634f6a9e 100644
--- a/cocoa/gui.m
+++ b/cocoa/gui.m
@@ -18,15 +18,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "cocoa/gui.h"
-#import "cocoa/plotter.h"
-#import "cocoa/BrowserView.h"
-#import "cocoa/BrowserViewController.h"
-#import "cocoa/BrowserWindowController.h"
-#import "cocoa/FormSelectMenu.h"
-#import "cocoa/fetch.h"
-#import "cocoa/schedule.h"
-
 #import "utils/nsoption.h"
 #import "utils/utils.h"
 #import "utils/log.h"
@@ -40,6 +31,16 @@
 #import "content/hlcache.h"
 #import "content/content.h"
 
+#import "cocoa/gui.h"
+#import "cocoa/plotter.h"
+#import "cocoa/BrowserView.h"
+#import "cocoa/BrowserViewController.h"
+#import "cocoa/BrowserWindowController.h"
+#import "cocoa/FormSelectMenu.h"
+#import "cocoa/fetch.h"
+#import "cocoa/schedule.h"
+
+
 NSString * const kCookiesFileOption = @"CookiesFile";
 NSString * const kURLsFileOption = @"URLsFile";
 NSString * const kHotlistFileOption = @"Hotlist";
-- 
cgit v1.2.3