fix cocoa include ordering to ensure error enum is available

This commit is contained in:
Vincent Sanders 2016-05-02 10:32:54 +01:00
parent 505ae08df2
commit 990598ccdc
5 changed files with 30 additions and 28 deletions

View File

@ -16,6 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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/BookmarksController.h"
#import "cocoa/Tree.h" #import "cocoa/Tree.h"
#import "cocoa/TreeView.h" #import "cocoa/TreeView.h"
@ -23,12 +30,6 @@
#import "cocoa/BrowserViewController.h" #import "cocoa/BrowserViewController.h"
#import "cocoa/gui.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 () @interface BookmarksController ()
- (void) noteAppWillTerminate: (NSNotification *) note; - (void) noteAppWillTerminate: (NSNotification *) note;

View File

@ -16,6 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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/BrowserWindowController.h"
#import "cocoa/BrowserViewController.h" #import "cocoa/BrowserViewController.h"
@ -25,11 +31,6 @@
#import "cocoa/gui.h" #import "cocoa/gui.h"
#import "cocoa/NetsurfApp.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 () @interface BrowserWindowController ()

View File

@ -16,14 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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/log.h"
#import "utils/nsurl.h" #import "utils/nsurl.h"
#import "desktop/download.h" #import "desktop/download.h"
#import "desktop/gui_download.h" #import "desktop/gui_download.h"
#import "cocoa/DownloadWindowController.h"
#import "cocoa/gui.h"
@interface DownloadWindowController () @interface DownloadWindowController ()
@property (readwrite, retain, nonatomic) NSFileHandle *outputFile; @property (readwrite, retain, nonatomic) NSFileHandle *outputFile;

View File

@ -16,17 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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/PreferencesWindowController.h"
#import "cocoa/NetsurfApp.h" #import "cocoa/NetsurfApp.h"
#import "cocoa/gui.h" #import "cocoa/gui.h"
#import "cocoa/BrowserViewController.h" #import "cocoa/BrowserViewController.h"
#import "desktop/browser.h"
#import "content/content.h"
#import "utils/nsoption.h"
#import "content/hlcache.h"
@implementation PreferencesWindowController @implementation PreferencesWindowController
- init; - init;

View File

@ -18,15 +18,6 @@
#import <Cocoa/Cocoa.h> #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/nsoption.h"
#import "utils/utils.h" #import "utils/utils.h"
#import "utils/log.h" #import "utils/log.h"
@ -40,6 +31,16 @@
#import "content/hlcache.h" #import "content/hlcache.h"
#import "content/content.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 kCookiesFileOption = @"CookiesFile";
NSString * const kURLsFileOption = @"URLsFile"; NSString * const kURLsFileOption = @"URLsFile";
NSString * const kHotlistFileOption = @"Hotlist"; NSString * const kHotlistFileOption = @"Hotlist";