[macOS] Tidy up imports (#301)

qmk · Aug 31, 2021 · 02cf5de · 02cf5de
1 parent 1bf0625
commit 02cf5de
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 13 deletions.
diff --git a/macos/QMK Toolbox/AppDelegate.h b/macos/QMK Toolbox/AppDelegate.h
@@ -7,9 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
+
 #import "Printing.h"
-#import "Flashing.h"
-#import "USB.h"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
 

diff --git a/macos/QMK Toolbox/AppDelegate.m b/macos/QMK Toolbox/AppDelegate.m
@@ -7,9 +7,12 @@
 //
 
 #import "AppDelegate.h"
+
 #import "Constants.h"
-#import "QMKWindow.h"
+#import "Flashing.h"
 #import "HIDConsoleListener.h"
+#import "QMKWindow.h"
+#import "USB.h"
 
 @interface AppDelegate () <NSTextViewDelegate, NSComboBoxDelegate, HIDConsoleListenerDelegate, FlashingDelegate, USBDelegate>
 

diff --git a/macos/QMK Toolbox/Constants.m b/macos/QMK Toolbox/Constants.m
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+
 #import "Constants.h"
 
 NSString * const QMKMicrocontrollerKey = @"Microcontroller";
diff --git a/macos/QMK Toolbox/Flashing.h b/macos/QMK Toolbox/Flashing.h
@@ -7,8 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#include <AppKit/AppKit.h>
-#include "Printing.h"
+
+#import "Printing.h"
 
 typedef enum {
     APM32DFU,

diff --git a/macos/QMK Toolbox/Flashing.m b/macos/QMK Toolbox/Flashing.m
@@ -7,6 +7,7 @@
 //
 
 #import "Flashing.h"
+
 #import "USB.h"
 
 @interface Flashing ()

diff --git a/macos/QMK Toolbox/HIDConsole/HIDConsoleDevice.h b/macos/QMK Toolbox/HIDConsole/HIDConsoleDevice.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+
 #import <IOKit/hid/IOHIDDevice.h>
 
 @class HIDConsoleDevice;

diff --git a/macos/QMK Toolbox/HIDConsole/HIDConsoleListener.h b/macos/QMK Toolbox/HIDConsole/HIDConsoleListener.h
@@ -1,6 +1,6 @@
 #import <IOKit/hid/IOHIDManager.h>
 
-#include "HIDConsoleDevice.h"
+#import "HIDConsoleDevice.h"
 
 @protocol HIDConsoleListenerDelegate <NSObject>
 - (void)consoleDeviceDidConnect:(HIDConsoleDevice *)device;

diff --git a/macos/QMK Toolbox/Printing.h b/macos/QMK Toolbox/Printing.h
@@ -6,8 +6,7 @@
 //  Copyright © 2017 Jack Humbert. This code is licensed under MIT license (see LICENSE.md for details).
 //
 
-#import <Foundation/Foundation.h>
-#include <AppKit/AppKit.h>
+#import <Cocoa/Cocoa.h>
 
 @interface Printing : NSObject
 

diff --git a/macos/QMK Toolbox/QMKWindow.h b/macos/QMK Toolbox/QMKWindow.h
@@ -7,7 +7,6 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "AppDelegate.h"
 
 @interface QMKWindow : NSWindow <NSDraggingDestination>
 

diff --git a/macos/QMK Toolbox/QMKWindow.m b/macos/QMK Toolbox/QMKWindow.m
@@ -8,6 +8,8 @@
 
 #import "QMKWindow.h"
 
+#import "AppDelegate.h"
+
 @implementation QMKWindow
 
 - (void)setup {

diff --git a/macos/QMK Toolbox/USB.h b/macos/QMK Toolbox/USB.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <AppKit/AppKit.h>
+
 #import "Printing.h"
 #import "Flashing.h"
 

diff --git a/macos/QMK Toolbox/USB.m b/macos/QMK Toolbox/USB.m
@@ -6,10 +6,11 @@
 //  Copyright © 2017 Jack Humbert. This code is licensed under MIT license (see LICENSE.md for details).
 //
 
+#import <IOKit/usb/IOUSBLib.h>
+#import <IOKit/serial/IOSerialKeys.h>
+#import <IOKit/storage/IOMedia.h>
+
 #import "USB.h"
-#include <IOKit/usb/IOUSBLib.h>
-#include <IOKit/serial/IOSerialKeys.h>
-#include <IOKit/storage/IOMedia.h>
 
 static io_iterator_t usbConnectedIter;
 static io_iterator_t usbDisconnectedIter;
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     //
     #import "Flashing.h"
     #import "USB.h"
     @interface Flashing ()
@@ Expand Down @@