Author: swdr Date: Mon Jan 31 13:12:00 2011 New Revision: 11567 URL: http://source.netsurf-browser.org?rev=11567&view=rev Log: Reorganized includes. Modified: trunk/netsurf/cocoa/BrowserView.h trunk/netsurf/cocoa/BrowserView.m trunk/netsurf/cocoa/BrowserViewController.m trunk/netsurf/cocoa/BrowserWindowController.m trunk/netsurf/cocoa/DownloadWindowController.m trunk/netsurf/cocoa/FormSelectMenu.m trunk/netsurf/cocoa/HistoryView.m trunk/netsurf/cocoa/Makefile.target trunk/netsurf/cocoa/NetSurfAppDelegate.m trunk/netsurf/cocoa/NetsurfApp.m trunk/netsurf/cocoa/ScrollableView.m trunk/netsurf/cocoa/TreeView.h trunk/netsurf/cocoa/TreeView.m trunk/netsurf/cocoa/URLFieldCell.m trunk/netsurf/cocoa/bitmap.m trunk/netsurf/cocoa/font.h trunk/netsurf/cocoa/font.m trunk/netsurf/cocoa/gui.m trunk/netsurf/cocoa/plotter.m trunk/netsurf/cocoa/schedule.m trunk/netsurf/cocoa/thumbnail.m trunk/netsurf/cocoa/url.m trunk/netsurf/cocoa/utils.m Modified: trunk/netsurf/cocoa/BrowserView.h URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/BrowserView.h?rev=1... ============================================================================== --- trunk/netsurf/cocoa/BrowserView.h (original) +++ trunk/netsurf/cocoa/BrowserView.h Mon Jan 31 13:12:00 2011 @@ -18,7 +18,7 @@ #import <Cocoa/Cocoa.h> -#import "ScrollableView.h" +#import "cocoa/ScrollableView.h" @class HistoryView; @interface BrowserView : ScrollableView { Modified: trunk/netsurf/cocoa/BrowserView.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/BrowserView.m?rev=1... ============================================================================== --- trunk/netsurf/cocoa/BrowserView.m (original) +++ trunk/netsurf/cocoa/BrowserView.m Mon Jan 31 13:12:00 2011 @@ -16,8 +16,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "BrowserView.h" -#import "HistoryView.h" +#import "cocoa/BrowserView.h" +#import "cocoa/HistoryView.h" +#import "cocoa/font.h" +#import "cocoa/plotter.h" #import "desktop/browser.h" #import "desktop/history_core.h" @@ -25,9 +27,6 @@ #import "desktop/textinput.h" #import "desktop/options.h" #import "desktop/selection.h" - -#import "cocoa/font.h" -#import "cocoa/plotter.h" @interface BrowserView () Modified: trunk/netsurf/cocoa/BrowserViewController.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/BrowserViewControll... ============================================================================== --- trunk/netsurf/cocoa/BrowserViewController.m (original) +++ trunk/netsurf/cocoa/BrowserViewController.m Mon Jan 31 13:12:00 2011 @@ -17,9 +17,9 @@ */ -#import "BrowserViewController.h" -#import "BrowserView.h" -#import "BrowserWindowController.h" +#import "cocoa/BrowserViewController.h" +#import "cocoa/BrowserView.h" +#import "cocoa/BrowserWindowController.h" #import "desktop/browser.h" #import "desktop/history_core.h" Modified: trunk/netsurf/cocoa/BrowserWindowController.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/BrowserWindowContro... ============================================================================== --- trunk/netsurf/cocoa/BrowserWindowController.m (original) +++ trunk/netsurf/cocoa/BrowserWindowController.m Mon Jan 31 13:12:00 2011 @@ -16,12 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "BrowserWindowController.h" - -#import "BrowserViewController.h" -#import "PSMTabBarControl.h" -#import "PSMRolloverButton.h" -#import "URLFieldCell.h" +#import "cocoa/BrowserWindowController.h" + +#import "cocoa/BrowserViewController.h" +#import "cocoa/PSMTabBarControl/PSMTabBarControl.h" +#import "cocoa/PSMTabBarControl/PSMRolloverButton.h" +#import "cocoa/URLFieldCell.h" #import "cocoa/gui.h" #import "cocoa/NetsurfApp.h" Modified: trunk/netsurf/cocoa/DownloadWindowController.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/DownloadWindowContr... ============================================================================== --- trunk/netsurf/cocoa/DownloadWindowController.m (original) +++ trunk/netsurf/cocoa/DownloadWindowController.m Mon Jan 31 13:12:00 2011 @@ -16,11 +16,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "DownloadWindowController.h" +#import "cocoa/DownloadWindowController.h" +#import "cocoa/gui.h" #import "desktop/download.h" #import "desktop/gui.h" -#import "cocoa/gui.h" @interface DownloadWindowController () Modified: trunk/netsurf/cocoa/FormSelectMenu.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/FormSelectMenu.m?re... ============================================================================== --- trunk/netsurf/cocoa/FormSelectMenu.m (original) +++ trunk/netsurf/cocoa/FormSelectMenu.m Mon Jan 31 13:12:00 2011 @@ -16,10 +16,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "FormSelectMenu.h" +#import "cocoa/FormSelectMenu.h" +#import "cocoa/coordinates.h" #import "render/form.h" -#import "cocoa/coordinates.h" @interface FormSelectMenu () Modified: trunk/netsurf/cocoa/HistoryView.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/HistoryView.m?rev=1... ============================================================================== --- trunk/netsurf/cocoa/HistoryView.m (original) +++ trunk/netsurf/cocoa/HistoryView.m Mon Jan 31 13:12:00 2011 @@ -16,14 +16,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "HistoryView.h" +#import "cocoa/HistoryView.h" +#import "cocoa/font.h" +#import "cocoa/coordinates.h" +#import "cocoa/plotter.h" #import "desktop/browser.h" #import "desktop/history_core.h" #import "desktop/plotters.h" -#import "cocoa/font.h" -#import "cocoa/coordinates.h" -#import "cocoa/plotter.h" static NSRect cocoa_history_rect( struct browser_window *bw ) { Modified: trunk/netsurf/cocoa/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/Makefile.target?rev... ============================================================================== --- trunk/netsurf/cocoa/Makefile.target (original) +++ trunk/netsurf/cocoa/Makefile.target Mon Jan 31 13:12:00 2011 @@ -29,7 +29,6 @@ CFLAGS += -I/usr/X11/include CFLAGS += -I/usr/include/libxml2 - CFLAGS += -Icocoa/PSMTabBarControl CFLAGS += -include cocoa/Prefix.pch ifneq ($(wildcard /opt/local*),) Modified: trunk/netsurf/cocoa/NetSurfAppDelegate.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/NetSurfAppDelegate.... ============================================================================== --- trunk/netsurf/cocoa/NetSurfAppDelegate.m (original) +++ trunk/netsurf/cocoa/NetSurfAppDelegate.m Mon Jan 31 13:12:00 2011 @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "NetSurfAppDelegate.h" +#import "cocoa/NetSurfAppDelegate.h" #import "cocoa/SearchWindowController.h" #import "cocoa/PreferencesWindowController.h" Modified: trunk/netsurf/cocoa/NetsurfApp.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/NetsurfApp.m?rev=11... ============================================================================== --- trunk/netsurf/cocoa/NetsurfApp.m (original) +++ trunk/netsurf/cocoa/NetsurfApp.m Mon Jan 31 13:12:00 2011 @@ -16,29 +16,28 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "NetsurfApp.h" - +#import "cocoa/NetsurfApp.h" #import "cocoa/gui.h" #import "cocoa/plotter.h" #import "desktop/gui.h" -#include "content/urldb.h" -#include "content/fetch.h" -#include "css/utils.h" -#include "desktop/gui.h" -#include "desktop/history_core.h" -#include "desktop/mouse.h" -#include "desktop/netsurf.h" -#include "desktop/options.h" -#include "desktop/plotters.h" -#include "desktop/save_complete.h" -#include "desktop/selection.h" -#include "desktop/textinput.h" -#include "render/html.h" -#include "utils/url.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" +#import "content/urldb.h" +#import "content/fetch.h" +#import "css/utils.h" +#import "desktop/gui.h" +#import "desktop/history_core.h" +#import "desktop/mouse.h" +#import "desktop/netsurf.h" +#import "desktop/options.h" +#import "desktop/plotters.h" +#import "desktop/save_complete.h" +#import "desktop/selection.h" +#import "desktop/textinput.h" +#import "render/html.h" +#import "utils/url.h" +#import "utils/log.h" +#import "utils/messages.h" +#import "utils/utils.h" #import "css/utils.h" #ifndef NETSURF_HOMEPAGE Modified: trunk/netsurf/cocoa/ScrollableView.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/ScrollableView.m?re... ============================================================================== --- trunk/netsurf/cocoa/ScrollableView.m (original) +++ trunk/netsurf/cocoa/ScrollableView.m Mon Jan 31 13:12:00 2011 @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "ScrollableView.h" +#import "cocoa/ScrollableView.h" @interface ScrollableView () Modified: trunk/netsurf/cocoa/TreeView.h URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/TreeView.h?rev=1156... ============================================================================== --- trunk/netsurf/cocoa/TreeView.h (original) +++ trunk/netsurf/cocoa/TreeView.h Mon Jan 31 13:12:00 2011 @@ -18,7 +18,7 @@ #import <Cocoa/Cocoa.h> -#import "ScrollableView.h" +#import "cocoa/ScrollableView.h" @interface TreeView : ScrollableView { struct tree *treeHandle; Modified: trunk/netsurf/cocoa/TreeView.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/TreeView.m?rev=1156... ============================================================================== --- trunk/netsurf/cocoa/TreeView.m (original) +++ trunk/netsurf/cocoa/TreeView.m Mon Jan 31 13:12:00 2011 @@ -16,12 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "TreeView.h" +#import "cocoa/TreeView.h" +#import "cocoa/coordinates.h" #import "desktop/tree.h" #import "desktop/plotters.h" #import "desktop/history_global_core.h" -#import "cocoa/coordinates.h" @implementation TreeView Modified: trunk/netsurf/cocoa/URLFieldCell.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/URLFieldCell.m?rev=... ============================================================================== --- trunk/netsurf/cocoa/URLFieldCell.m (original) +++ trunk/netsurf/cocoa/URLFieldCell.m Mon Jan 31 13:12:00 2011 @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import "URLFieldCell.h" +#import "cocoa/URLFieldCell.h" @interface URLFieldCell () Modified: trunk/netsurf/cocoa/bitmap.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/bitmap.m?rev=11567&... ============================================================================== --- trunk/netsurf/cocoa/bitmap.m (original) +++ trunk/netsurf/cocoa/bitmap.m Mon Jan 31 13:12:00 2011 @@ -18,8 +18,9 @@ #import <Cocoa/Cocoa.h> +#import "cocoa/bitmap.h" + #import "image/bitmap.h" -#import "cocoa/bitmap.h" #define BITS_PER_SAMPLE (8) #define SAMPLES_PER_PIXEL (4) Modified: trunk/netsurf/cocoa/font.h URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/font.h?rev=11567&am... ============================================================================== --- trunk/netsurf/cocoa/font.h (original) +++ trunk/netsurf/cocoa/font.h Mon Jan 31 13:12:00 2011 @@ -19,6 +19,8 @@ #ifndef COCOA_FONT_H #define COCOA_FONT_H +#import "desktop/plot_style.h" + void cocoa_draw_string( CGFloat x, CGFloat y, const char *bytes, size_t length, const plot_font_style_t *style ); void cocoa_set_font_scale_factor( float newFactor ); Modified: trunk/netsurf/cocoa/font.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/font.m?rev=11567&am... ============================================================================== --- trunk/netsurf/cocoa/font.m (original) +++ trunk/netsurf/cocoa/font.m Mon Jan 31 13:12:00 2011 @@ -18,17 +18,14 @@ #import <Cocoa/Cocoa.h> -#include <inttypes.h> - -#include <assert.h> - -#include "css/css.h" -#include "render/font.h" -#include "desktop/options.h" - -#import "font.h" -#import "plotter.h" #import "cocoa/plotter.h" +#import "cocoa/font.h" + +#import "css/css.h" +#import "desktop/options.h" +#import "render/font.h" +#import "desktop/plotters.h" + static NSLayoutManager *cocoa_prepare_layout_manager( const char *string, size_t length, const plot_font_style_t *style ); Modified: trunk/netsurf/cocoa/gui.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/gui.m?rev=11567&... ============================================================================== --- trunk/netsurf/cocoa/gui.m (original) +++ trunk/netsurf/cocoa/gui.m Mon Jan 31 13:12:00 2011 @@ -20,11 +20,10 @@ #import "cocoa/gui.h" #import "cocoa/plotter.h" - -#import "BrowserView.h" -#import "BrowserViewController.h" -#import "BrowserWindowController.h" -#import "FormSelectMenu.h" +#import "cocoa/BrowserView.h" +#import "cocoa/BrowserViewController.h" +#import "cocoa/BrowserWindowController.h" +#import "cocoa/FormSelectMenu.h" #import "desktop/gui.h" #import "desktop/netsurf.h" Modified: trunk/netsurf/cocoa/plotter.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/plotter.m?rev=11567... ============================================================================== --- trunk/netsurf/cocoa/plotter.m (original) +++ trunk/netsurf/cocoa/plotter.m Mon Jan 31 13:12:00 2011 @@ -18,13 +18,13 @@ #include <Cocoa/Cocoa.h> -#include "desktop/plotters.h" -#import "desktop/plot_style.h" -#import "utils/log.h" - #import "cocoa/font.h" #import "cocoa/plotter.h" #import "cocoa/bitmap.h" + +#import "desktop/plotters.h" +#import "desktop/plot_style.h" +#import "utils/log.h" #import "css/utils.h" static void cocoa_plot_render_path(NSBezierPath *path,const plot_style_t *pstyle); Modified: trunk/netsurf/cocoa/schedule.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/schedule.m?rev=1156... ============================================================================== --- trunk/netsurf/cocoa/schedule.m (original) +++ trunk/netsurf/cocoa/schedule.m Mon Jan 31 13:12:00 2011 @@ -16,9 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ +#import <Cocoa/Cocoa.h> + #import "desktop/browser.h" - -#import <Cocoa/Cocoa.h> @interface ScheduledCallback : NSObject { void (*callback)( void *userData ); Modified: trunk/netsurf/cocoa/thumbnail.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/thumbnail.m?rev=115... ============================================================================== --- trunk/netsurf/cocoa/thumbnail.m (original) +++ trunk/netsurf/cocoa/thumbnail.m Mon Jan 31 13:12:00 2011 @@ -16,12 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ +#import <Cocoa/Cocoa.h> + #import "desktop/browser.h" #import "desktop/plotters.h" #import "content/urldb.h" #import "image/bitmap.h" - -#import <Cocoa/Cocoa.h> /* In platform specific thumbnail.c. */ bool thumbnail_create(struct hlcache_handle *content, struct bitmap *bitmap, Modified: trunk/netsurf/cocoa/url.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/url.m?rev=11567&... ============================================================================== --- trunk/netsurf/cocoa/url.m (original) +++ trunk/netsurf/cocoa/url.m Mon Jan 31 13:12:00 2011 @@ -16,11 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>;. */ -#import <stdbool.h> -#import <stdlib.h> +#import <Cocoa/Cocoa.h> + #import "utils/url.h" - -#import <Cocoa/Cocoa.h> char *url_to_path(const char *url) Modified: trunk/netsurf/cocoa/utils.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/utils.m?rev=11567&a... ============================================================================== --- trunk/netsurf/cocoa/utils.m (original) +++ trunk/netsurf/cocoa/utils.m Mon Jan 31 13:12:00 2011 @@ -17,6 +17,7 @@ */ #import <Cocoa/Cocoa.h> + #import "utils/utils.h" #import "desktop/tree_url_node.h"