Moved #import statemens to declaration files and changed them to @Class…

… directives in headers instead. To make common data classes including all their dependent objects handling easier, I added imports of all data objects to GBDataObjects.h, so it's a simple one line #import in client code to get access to all objects.
tomaz · Jul 28, 2010 · 1d947fb · 1d947fb
1 parent a0536a2
commit 1d947fb
Show file tree

Hide file tree

Showing 31 changed files with 68 additions and 23 deletions.
diff --git a/Model/GBCategoryData.h b/Model/GBCategoryData.h
@@ -7,8 +7,9 @@
 //
 
 #import "GBModelBase.h"
-#import "GBAdoptedProtocolsProvider.h"
-#import "GBMethodsProvider.h"
+
+@class GBAdoptedProtocolsProvider;
+@class GBMethodsProvider;
 
 /** Describes a category.
  */

diff --git a/Model/GBCategoryData.m b/Model/GBCategoryData.m
@@ -6,6 +6,7 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
+#import "GBDataObjects.h"
 #import "GBCategoryData.h"
 
 @implementation GBCategoryData

diff --git a/Model/GBClassData.h b/Model/GBClassData.h
@@ -7,9 +7,10 @@
 //
 
 #import "GBModelBase.h"
-#import "GBAdoptedProtocolsProvider.h"
-#import "GBIvarsProvider.h"
-#import "GBMethodsProvider.h"
+
+@class GBAdoptedProtocolsProvider;
+@class GBIvarsProvider;
+@class GBMethodsProvider;
 
 /** Describes a class.
  */

diff --git a/Model/GBClassData.m b/Model/GBClassData.m
@@ -6,6 +6,7 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
+#import "GBDataObjects.h"
 #import "GBClassData.h"
 
 @implementation GBClassData

diff --git a/Model/GBDataObjects.h b/Model/GBDataObjects.h
@@ -0,0 +1,17 @@
+//
+//  GBDataObjects.h
+//  appledoc
+//
+//  Created by Tomaz Kragelj on 28.7.10.
+//  Copyright (C) 2010, Gentle Bytes. All rights reserved.
+//
+
+#import "GBClassData.h"
+#import "GBCategoryData.h"
+#import "GBProtocolData.h"
+#import "GBIvarData.h"
+#import "GBMethodData.h"
+#import "GBMethodArgument.h"
+#import "GBAdoptedProtocolsProvider.h"
+#import "GBIvarsProvider.h"
+#import "GBMethodsProvider.h"
diff --git a/Model/GBIvarsProvider.h b/Model/GBIvarsProvider.h
@@ -6,7 +6,9 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
-#import "GBIvarData.h"
+#import <Foundation/Foundation.h>
+
+@class GBIvarData;
 
 /** A helper class that unifies ivars handling.
  

diff --git a/Model/GBIvarsProvider.m b/Model/GBIvarsProvider.m
@@ -6,6 +6,7 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
+#import "GBIvarData.h"
 #import "GBIvarsProvider.h"
 
 @implementation GBIvarsProvider

diff --git a/Model/GBMethodData.h b/Model/GBMethodData.h
@@ -7,7 +7,9 @@
 //
 
 #import "GBModelBase.h"
-#import "GBMethodArgument.h"
+
+@class GBMethodArgument;
+
 
 /** Defines different method types. */
 enum {

diff --git a/Model/GBMethodData.m b/Model/GBMethodData.m
@@ -6,6 +6,7 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
+#import "GBMethodArgument.h"
 #import "GBMethodData.h"
 
 @interface GBMethodData ()

diff --git a/Model/GBMethodsProvider.h b/Model/GBMethodsProvider.h
@@ -6,7 +6,9 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
-#import "GBMethodData.h"
+#import <Foundation/Foundation.h>
+
+@class GBMethodData;
 
 /** A helper class that unifies methods handling.
  

diff --git a/Model/GBMethodsProvider.m b/Model/GBMethodsProvider.m
@@ -6,6 +6,7 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
+#import "GBMethodData.h"
 #import "GBMethodsProvider.h"
 
 @implementation GBMethodsProvider

diff --git a/Model/GBProtocolData.h b/Model/GBProtocolData.h
@@ -7,8 +7,9 @@
 //
 
 #import "GBModelBase.h"
-#import "GBAdoptedProtocolsProvider.h"
-#import "GBMethodsProvider.h"
+
+@class GBAdoptedProtocolsProvider;
+@class GBMethodsProvider;
 
 /** Describes a protocol. */
 @interface GBProtocolData : GBModelBase {

diff --git a/Model/GBProtocolData.m b/Model/GBProtocolData.m
@@ -6,6 +6,7 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
+#import "GBDataObjects.h"
 #import "GBProtocolData.h"
 
 @implementation GBProtocolData

diff --git a/Model/GBStore.m b/Model/GBStore.m
@@ -6,6 +6,7 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
+#import "GBDataObjects.h"
 #import "GBStore.h"
 
 @implementation GBStore

diff --git a/Model/GBStoreProviding.h b/Model/GBStoreProviding.h
@@ -6,9 +6,11 @@
 //  Copyright 2010 Gentle Bytes. All rights reserved.
 //
 
-#import "GBClassData.h"
-#import "GBCategoryData.h"
-#import "GBProtocolData.h"
+#import <Foundation/Foundation.h>
+
+@class GBClassData;
+@class GBCategoryData;
+@class GBProtocolData;
 
 /** Defines the requirements for store providers.
  

diff --git a/Parsing/GBObjectiveCParser.m b/Parsing/GBObjectiveCParser.m
@@ -11,6 +11,7 @@
 #import "GBTokenizer.h"
 #import "GBApplicationSettingsProviding.h"
 #import "GBStoreProviding.h"
+#import "GBDataObjects.h"
 #import "GBObjectiveCParser.h"
 
 @interface GBObjectiveCParser ()

diff --git a/Testing/GBCategoryDataTesting.m b/Testing/GBCategoryDataTesting.m
@@ -6,8 +6,7 @@
 //  Copyright (C) 2010 Gentle Bytes. All rights reserved.
 //
 
-#import "GBProtocolData.h"
-#import "GBCategoryData.h"
+#import "GBDataObjects.h"
 
 @interface GBCategoryDataTesting : SenTestCase
 @end

diff --git a/Testing/GBClassDataTesting.m b/Testing/GBClassDataTesting.m
@@ -6,8 +6,7 @@
 //  Copyright (C) 2010 Gentle Bytes. All rights reserved.
 //
 
-#import "GBProtocolData.h"
-#import "GBClassData.h"
+#import "GBDataObjects.h"
 
 @interface GBClassDataTesting : SenTestCase
 @end

diff --git a/Testing/GBMethodDataTesting.m b/Testing/GBMethodDataTesting.m
@@ -7,7 +7,7 @@
 //
 
 #import "GBTestObjectsRegistry.h"
-#import "GBMethodData.h"
+#import "GBDataObjects.h"
 
 @interface GBMethodDataTesting : SenTestCase
 @end

diff --git a/Testing/GBObjectiveCParser-AdoptedProtocolsParsingTesting.m b/Testing/GBObjectiveCParser-AdoptedProtocolsParsingTesting.m
@@ -7,6 +7,7 @@
 //
 
 #import "GBStore.h"
+#import "GBDataObjects.h"
 #import "GBObjectiveCParser.h"
 
 // Note that we use class for invoking parsing of adopted protocols. Probably not the best option - i.e. we could isolate

diff --git a/Testing/GBObjectiveCParser-CategoryParsingTesting.m b/Testing/GBObjectiveCParser-CategoryParsingTesting.m
@@ -7,6 +7,7 @@
 //
 
 #import "GBStore.h"
+#import "GBDataObjects.h"
 #import "GBObjectiveCParser.h"
 
 // Note that we're only testing category specific stuff here - i.e. all common parsing modules (adopted protocols,

diff --git a/Testing/GBObjectiveCParser-ClassParsingTesting.m b/Testing/GBObjectiveCParser-ClassParsingTesting.m
@@ -7,6 +7,7 @@
 //
 
 #import "GBStore.h"
+#import "GBDataObjects.h"
 #import "GBObjectiveCParser.h"
 
 // Note that we're only testing class specific stuff here - i.e. all common parsing modules (adopted protocols,

diff --git a/Testing/GBObjectiveCParser-IvarsParsingTesting.m b/Testing/GBObjectiveCParser-IvarsParsingTesting.m
@@ -7,6 +7,7 @@
 //
 
 #import "GBStore.h"
+#import "GBDataObjects.h"
 #import "GBObjectiveCParser.h"
 
 // Note that we use class for invoking parsing of ivars. Probably not the best option - i.e. we could isolate ivars

diff --git a/Testing/GBObjectiveCParser-MethodsParsingTesting.m b/Testing/GBObjectiveCParser-MethodsParsingTesting.m
@@ -7,6 +7,7 @@
 //
 
 #import "GBStore.h"
+#import "GBDataObjects.h"
 #import "GBObjectiveCParser.h"
 
 // Note that we use class for invoking parsing of methods. Probably not the best option - i.e. we could isolate method

diff --git a/Testing/GBObjectiveCParser-ProtocolParsingTesting.m b/Testing/GBObjectiveCParser-ProtocolParsingTesting.m
@@ -7,6 +7,7 @@
 //
 
 #import "GBStore.h"
+#import "GBDataObjects.h"
 #import "GBObjectiveCParser.h"
 
 // Note that we're only testing protocol specific stuff here - i.e. all common parsing modules (adopted protocols,

diff --git a/Testing/GBObjectsAssertor.h b/Testing/GBObjectsAssertor.h
@@ -6,8 +6,10 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
-#import "GBIvarData.h"
-#import "GBMethodData.h"
+#import <Foundation/Foundation.h>
+
+@class GBIvarData;
+@class GBMethodData;
 
 // Need to derive from SenTestCase otherwise ST macros used wouldn't work...
 @interface GBObjectsAssertor : SenTestCase

diff --git a/Testing/GBObjectsAssertor.m b/Testing/GBObjectsAssertor.m
@@ -6,6 +6,7 @@
 //  Copyright (C) 2010, Gentle Bytes. All rights reserved.
 //
 
+#import "GBDataObjects.h"
 #import "GBObjectsAssertor.h"
 
 @implementation GBObjectsAssertor

diff --git a/Testing/GBProtocolDataTesting.m b/Testing/GBProtocolDataTesting.m
@@ -6,7 +6,7 @@
 //  Copyright (C) 2010 Gentle Bytes. All rights reserved.
 //
 
-#import "GBProtocolData.h"
+#import "GBDataObjects.h"
 
 @interface GBProtocolDataTesting : SenTestCase
 @end

diff --git a/Testing/GBStoreTesting.m b/Testing/GBStoreTesting.m
@@ -7,7 +7,7 @@
 //
 
 #import "GBStore.h"
-#import "GBClassData.h"
+#import "GBDataObjects.h"
 
 @interface GBStoreTesting : SenTestCase
 @end

diff --git a/Testing/GBTestObjectsRegistry.m b/Testing/GBTestObjectsRegistry.m
@@ -7,6 +7,7 @@
 //
 
 #import "GBApplicationSettingsProviding.h"
+#import "GBDataObjects.h"
 #import "GBTestObjectsRegistry.h"
 
 @implementation GBTestObjectsRegistry
@@ -78,7 +79,6 @@ + (GBMethodData *)classMethodWithNames:(NSString *)first,... {
 	return [GBMethodData methodDataWithType:GBMethodTypeClass result:[NSArray arrayWithObject:@"void"] arguments:arguments];
 }
 
-
 + (GBMethodData *)propertyMethodWithArgument:(NSString *)name {
 	GBMethodArgument *argument = [GBMethodArgument methodArgumentWithName:name];
 	return [GBMethodData methodDataWithType:GBMethodTypeProperty result:[NSArray arrayWithObject:@"int"] arguments:[NSArray arrayWithObject:argument]];

diff --git a/appledoc.xcodeproj/project.pbxproj b/appledoc.xcodeproj/project.pbxproj
@@ -113,6 +113,7 @@
 		7367BB3512003CAB005ED6CD /* GBModelBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBModelBase.m; sourceTree = "<group>"; };
 		7367BB5112004058005ED6CD /* GBModelBaseTesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBModelBaseTesting.m; sourceTree = "<group>"; };
 		7367BBB612004928005ED6CD /* GBCategoryDataTesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBCategoryDataTesting.m; sourceTree = "<group>"; };
+		7367BC4212005888005ED6CD /* GBDataObjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBDataObjects.h; sourceTree = "<group>"; };
 		73D54C6111F8CE6D00CCDDB0 /* appledoc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = appledoc.m; sourceTree = "<group>"; };
 		73D54C6911F8CEEF00CCDDB0 /* appledoc_prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = appledoc_prefix.pch; sourceTree = "<group>"; };
 		73D54C9811F8D22B00CCDDB0 /* DDConsoleLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDConsoleLogger.h; sourceTree = "<group>"; };
@@ -434,6 +435,7 @@
 			isa = PBXGroup;
 			children = (
 				73FC6DE311FCD09400AAD0B9 /* GBStoreProviding.h */,
+				7367BC4212005888005ED6CD /* GBDataObjects.h */,
 				73FC6E0D11FCD54400AAD0B9 /* GBStore.h */,
 				73FC6E0E11FCD54400AAD0B9 /* GBStore.m */,
 				73FC6E8511FCD93A00AAD0B9 /* GBClassData.h */,