diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2016-04-08 10:49:16 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2016-04-08 10:49:16 +1000 |
| commit | 8c9d0f1640b7133977d73285e6b103158bbe7653 (patch) | |
| tree | c9ee5c488bdcdc04500f8ad9fd3231d50d193c4a | |
| parent | 0d20c56f749576c60c54410985cd31aa27120231 (diff) | |
| download | scintilla-mirror-8c9d0f1640b7133977d73285e6b103158bbe7653.tar.gz | |
Update header ordering to cover all headers used in Scintilla and reorder
in Cocoa source consistently.
| -rw-r--r-- | cocoa/PlatCocoa.h | 3 | ||||
| -rw-r--r-- | cocoa/PlatCocoa.mm | 7 | ||||
| -rw-r--r-- | scripts/HeaderOrder.txt | 12 |
3 files changed, 18 insertions, 4 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index 60977c92e..0465cb4c8 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -16,11 +16,12 @@ #include <cstdio> #include <Cocoa/Cocoa.h> -#include "QuartzTextLayout.h" #include "Platform.h" #include "Scintilla.h" +#include "QuartzTextLayout.h" + NSRect PRectangleToNSRect(Scintilla::PRectangle& rc); Scintilla::PRectangle NSRectToPRectangle(NSRect& rc); CFStringEncoding EncodingFromCharacterSet(bool unicode, int characterSet); diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 60eac53dc..82a172e3f 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -26,13 +26,14 @@ #import <Foundation/NSGeometry.h> #import "Platform.h" -#import "ScintillaView.h" -#import "ScintillaCocoa.h" -#import "PlatCocoa.h" #include "StringCopy.h" #include "XPM.h" +#import "ScintillaView.h" +#import "ScintillaCocoa.h" +#import "PlatCocoa.h" + using namespace Scintilla; extern sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam); diff --git a/scripts/HeaderOrder.txt b/scripts/HeaderOrder.txt index 054086d40..df4f0f4a2 100644 --- a/scripts/HeaderOrder.txt +++ b/scripts/HeaderOrder.txt @@ -13,6 +13,7 @@ #include <assert.h> #include <ctype.h> #include <limits.h> +#include <sys/time.h> // C++ wrappers of C standard library #include <cstdlib> @@ -31,6 +32,7 @@ #include <map> #include <set> #include <algorithm> +#include <functional> #include <memory> #include <regex> #include <sstream> @@ -54,6 +56,10 @@ // Cocoa headers #include <Cocoa/Cocoa.h> +#import <Foundation/NSGeometry.h> +#import <QuartzCore/CAGradientLayer.h> +#import <QuartzCore/CAAnimation.h> +#import <QuartzCore/CATransaction.h> // Scintilla headers @@ -106,6 +112,7 @@ #include "Decoration.h" #include "CaseFolder.h" #include "Document.h" +#include "RESearch.h" #include "CaseConvert.h" #include "UniConversion.h" #include "UnicodeFromUTF8.h" @@ -129,10 +136,15 @@ #include "HanjaDic.h" // gtk +#include "scintilla-marshal.h" #include "Converter.h" // cocoa #include "QuartzTextStyle.h" #include "QuartzTextStyleAttribute.h" +#include "QuartzTextLayout.h" #import "InfoBarCommunicator.h" #include "InfoBar.h" +#import "ScintillaView.h" +#import "ScintillaCocoa.h" +#import "PlatCocoa.h" |