From b0296d86a48642f2f381c3e0b11a022482ae25e3 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 24 May 2014 15:15:49 +1000 Subject: Header include statements are now in a standardised order with that order defined in scripts/HeaderOrder.txt. --- cocoa/PlatCocoa.h | 8 ++++---- cocoa/PlatCocoa.mm | 20 +++++++++++--------- cocoa/ScintillaCocoa.h | 8 ++++---- 3 files changed, 19 insertions(+), 17 deletions(-) (limited to 'cocoa') diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index 06b7a1f5b..60977c92e 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -7,14 +7,14 @@ #ifndef PLATCOCOA_H #define PLATCOCOA_H -#include -#include -#include - #include #include +#include +#include +#include + #include #include "QuartzTextLayout.h" diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index a0a0e8943..2225631a6 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -12,25 +12,27 @@ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt). */ -#import "Platform.h" -#import "ScintillaView.h" -#import "ScintillaCocoa.h" -#import "PlatCocoa.h" +#include +#include +#include #include #include -#include -#include -#include + #include #include #include +#import + +#import "Platform.h" +#import "ScintillaView.h" +#import "ScintillaCocoa.h" +#import "PlatCocoa.h" + #include "StringCopy.h" #include "XPM.h" -#import - using namespace Scintilla; extern sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam); diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 7e4ed7214..8fa2d196b 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -14,11 +14,11 @@ */ #include -#include #include -#include #include +#include +#include #include #include @@ -40,18 +40,18 @@ #include "XPM.h" #include "LineMarker.h" #include "Style.h" -#include "AutoComplete.h" #include "ViewStyle.h" #include "CharClassify.h" #include "Decoration.h" #include "CaseFolder.h" #include "Document.h" +#include "CaseConvert.h" #include "Selection.h" #include "PositionCache.h" #include "Editor.h" +#include "AutoComplete.h" #include "ScintillaBase.h" -#include "CaseConvert.h" extern "C" NSString* ScintillaRecPboardType; -- cgit v1.2.3