sort includes CHIP_Framework_iOS (#717)

project-chip · May 15, 2020 · 1182dc0 · 1182dc0
1 parent acc4ca7
commit 1182dc0
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIP.h b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIP.h
@@ -18,11 +18,13 @@
  *    limitations under the License.
  */
 
-#import <Foundation/Foundation.h>
-#import "CHIPSetupPayload.h"
-#import "CHIPQRCodeSetupPayloadParser.h"
-#import "CHIPManualSetupPayloadParser.h"
+// pull together CHIP headers
 #import "CHIPError.h"
+#import "CHIPManualSetupPayloadParser.h"
+#import "CHIPQRCodeSetupPayloadParser.h"
+#import "CHIPSetupPayload.h"
+
+#import <Foundation/Foundation.h>
 //! Project version number for CHIP.
 FOUNDATION_EXPORT double CHIPVersionNumber;
 

diff --git a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPManualSetupPayloadParser.h b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPManualSetupPayloadParser.h
@@ -17,10 +17,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+// module header
+#import "CHIPSetupPayload.h"
 
 #import <Foundation/Foundation.h>
-#import "CHIPSetupPayload.h"
-#import "CHIPError.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPQRCodeSetupPayloadParser.h b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPQRCodeSetupPayloadParser.h
@@ -17,9 +17,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#import <Foundation/Foundation.h>
+
+// module header
 #import "CHIPSetupPayload.h"
-#import "CHIPError.h"
+
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/src/CHIP_Framework_iOS/CHIP/CHIPTests/CHIPSetupPayloadParserTests.m b/src/CHIP_Framework_iOS/CHIP/CHIPTests/CHIPSetupPayloadParserTests.m
@@ -17,11 +17,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-#import <XCTest/XCTest.h>
+// module headers
 #import "CHIPManualSetupPayloadParser.h"
 #import "CHIPQRCodeSetupPayloadParser.h"
 
+// system dependencies
+#import <XCTest/XCTest.h>
+
 @interface CHIPSetupPayloadParserTests : XCTestCase
 
 @end

diff --git a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.h b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.h
@@ -18,8 +18,8 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
 #import <AVFoundation/AVFoundation.h>
+#import <UIKit/UIKit.h>
 
 @interface ViewController : UIViewController <AVCaptureMetadataOutputObjectsDelegate>
 

diff --git a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.m b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.m
@@ -17,9 +17,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
+// module header
 #import "ViewController.h"
+
+// local imports
 #import <CHIP/CHIP.h>
+
+// system imports
 #import <AVFoundation/AVFoundation.h>
 
 #define INDICATOR_DELAY 0.5 * NSEC_PER_SEC

diff --git a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/main.m b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/main.m
@@ -18,7 +18,6 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
 int main(int argc, char * argv[])