[Darwin] Cleanup unused imports and forward declare where possible (#…

…3893)
project-chip · Nov 20, 2020 · f408bf6 · f408bf6
1 parent fba2fdc
commit f408bf6
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 14 deletions.
diff --git a/src/darwin/Framework/CHIP/CHIP.h b/src/darwin/Framework/CHIP/CHIP.h
@@ -17,6 +17,7 @@
 
 // pull together CHIP headers
 #import <CHIP/CHIPDevice.h>
+#import <CHIP/CHIPDeviceCallback.h>
 #import <CHIP/CHIPDeviceController.h>
 #import <CHIP/CHIPDevicePairingDelegate.h>
 #import <CHIP/CHIPError.h>

diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.h b/src/darwin/Framework/CHIP/CHIPDeviceController.h
@@ -18,11 +18,11 @@
 #ifndef CHIP_DEVICE_CONTROLLER_H
 #define CHIP_DEVICE_CONTROLLER_H
 
-#import "CHIPDevice.h"
-#import "CHIPDeviceStatusDelegate.h"
-#import "CHIPError.h"
+#import <CHIP/CHIPDeviceStatusDelegate.h>
 #import <Foundation/Foundation.h>
 
+@class CHIPDevice;
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^ControllerOnConnectedBlock)(void);

diff --git a/src/darwin/Framework/CHIP/CHIPDevicePairingDelegate.h b/src/darwin/Framework/CHIP/CHIPDevicePairingDelegate.h
@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 
-#import "CHIPError.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/src/darwin/Framework/CHIP/CHIPDevicePairingDelegateBridge.mm b/src/darwin/Framework/CHIP/CHIPDevicePairingDelegateBridge.mm
@@ -16,6 +16,7 @@
  */
 
 #import "CHIPDevicePairingDelegateBridge.h"
+#import "CHIPError.h"
 #import <Foundation/Foundation.h>
 
 CHIPDevicePairingDelegateBridge::CHIPDevicePairingDelegateBridge(void)

diff --git a/src/darwin/Framework/CHIP/CHIPDeviceStatusDelegate.h b/src/darwin/Framework/CHIP/CHIPDeviceStatusDelegate.h
@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 
-#import "CHIPError.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.h b/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.h
@@ -14,11 +14,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-// module header
-#import "CHIPSetupPayload.h"
 
 #import <Foundation/Foundation.h>
 
+@class CHIPSetupPayload;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CHIPManualSetupPayloadParser : NSObject

diff --git a/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.mm b/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.mm
@@ -18,6 +18,7 @@
 
 #import "CHIPError.h"
 #import "CHIPLogging.h"
+#import "CHIPSetupPayload.h"
 
 #import <setup_payload/ManualSetupPayloadParser.h>
 #import <setup_payload/SetupPayload.h>

diff --git a/src/darwin/Framework/CHIP/CHIPOnOff.h b/src/darwin/Framework/CHIP/CHIPOnOff.h
@@ -18,10 +18,11 @@
 #ifndef CHIP_ONOFF_H
 #define CHIP_ONOFF_H
 
-#import "CHIPDevice.h"
-#import "CHIPDeviceCallback.h"
+#import <CHIP/CHIPDeviceCallback.h>
 #import <Foundation/Foundation.h>
 
+@class CHIPDevice;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CHIPOnOff : NSObject

diff --git a/src/darwin/Framework/CHIP/CHIPOnOff.mm b/src/darwin/Framework/CHIP/CHIPOnOff.mm
@@ -18,6 +18,7 @@
 #import <Foundation/Foundation.h>
 
 #import "CHIPCallbackBridge.h"
+#import "CHIPDevice.h"
 #import "CHIPDevice_Internal.h"
 #import "CHIPOnOff.h"
 

diff --git a/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegate.h b/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegate.h
@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 
-#import "CHIPError.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.h b/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.h
@@ -15,11 +15,10 @@
  *    limitations under the License.
  */
 
-// module header
-#import "CHIPSetupPayload.h"
-
 #import <Foundation/Foundation.h>
 
+@class CHIPSetupPayload;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CHIPQRCodeSetupPayloadParser : NSObject

diff --git a/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.mm b/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.mm
@@ -18,6 +18,7 @@
 #import "CHIPQRCodeSetupPayloadParser.h"
 #import "CHIPError.h"
 #import "CHIPLogging.h"
+#import "CHIPSetupPayload.h"
 
 #import <setup_payload/QRCodeSetupPayloadParser.h>
 #import <setup_payload/SetupPayload.h>

diff --git a/src/darwin/Framework/CHIP/CHIPSetupPayload.h b/src/darwin/Framework/CHIP/CHIPSetupPayload.h
@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 
-#import "CHIPError.h"
 #import <Foundation/Foundation.h>
 
 #ifdef __cplusplus

diff --git a/src/darwin/Framework/CHIP/CHIPSetupPayload.mm b/src/darwin/Framework/CHIP/CHIPSetupPayload.mm
@@ -16,6 +16,7 @@
  */
 
 #import "CHIPSetupPayload.h"
+#import "CHIPError.h"
 #import <setup_payload/SetupPayload.h>
 
 @implementation CHIPOptionalQRCodeInfo

diff --git a/src/darwin/Framework/CHIPTests/CHIPSetupPayloadParserTests.m b/src/darwin/Framework/CHIPTests/CHIPSetupPayloadParserTests.m
@@ -20,6 +20,7 @@
 // module headers
 #import "CHIPManualSetupPayloadParser.h"
 #import "CHIPQRCodeSetupPayloadParser.h"
+#import "CHIPSetupPayload.h"
 
 // additional includes
 #import "CHIPError.h"