diff options
author | Tobias Markmann <tm@ayena.de> | 2016-03-29 17:27:10 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2016-03-30 11:24:00 (GMT) |
commit | 5de19b60ae5593adbc3d913f9c64162e21bc702a (patch) | |
tree | 07d3e7a9e6105609858931154ee7fbfc599bd34a /Slimber/Cocoa | |
parent | 74e51310d27e9d9a66d2d790360549c48abec8d1 (diff) | |
download | swift-5de19b60ae5593adbc3d913f9c64162e21bc702a.zip swift-5de19b60ae5593adbc3d913f9c64162e21bc702a.tar.bz2 |
Apply consistent #include grouping and sorting style
Changed "" style includes to <> style.
Test-Information:
Build with Clang 3.9.0 and ran all tests on OS X 10.11.4.
Change-Id: Ic05e53f2e5dba39cc1307b116fc5f17b62ab9eb8
Diffstat (limited to 'Slimber/Cocoa')
-rw-r--r-- | Slimber/Cocoa/CocoaController.mm | 4 | ||||
-rw-r--r-- | Slimber/Cocoa/CocoaMenulet.h | 3 | ||||
-rw-r--r-- | Slimber/Cocoa/main.mm | 9 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Slimber/Cocoa/CocoaController.mm b/Slimber/Cocoa/CocoaController.mm index da1df98..1d2ef5c 100644 --- a/Slimber/Cocoa/CocoaController.mm +++ b/Slimber/Cocoa/CocoaController.mm @@ -1,14 +1,14 @@ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Slimber/Cocoa/CocoaController.h> -#include <Slimber/MainController.h> #include <Slimber/Cocoa/CocoaMenulet.h> #include <Slimber/Cocoa/main.h> +#include <Slimber/MainController.h> @implementation CocoaController { CocoaMenulet* menulet; diff --git a/Slimber/Cocoa/CocoaMenulet.h b/Slimber/Cocoa/CocoaMenulet.h index 887fdf9..c31f15c 100644 --- a/Slimber/Cocoa/CocoaMenulet.h +++ b/Slimber/Cocoa/CocoaMenulet.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,6 +7,7 @@ #pragma once #include <Cocoa/Cocoa.h> + #include <Slimber/Menulet.h> #include <SwifTools/Cocoa/CocoaAction.h> diff --git a/Slimber/Cocoa/main.mm b/Slimber/Cocoa/main.mm index 167c1ab..41678f1 100644 --- a/Slimber/Cocoa/main.mm +++ b/Slimber/Cocoa/main.mm @@ -1,6 +1,13 @@ +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + +#include <Slimber/Cocoa/main.h> + #include <Cocoa/Cocoa.h> -#include "Slimber/Cocoa/main.h" #include <Swiften/EventLoop/Cocoa/CocoaEventLoop.h> Swift::CocoaEventLoop* eventLoop; |