Skip to content

Commit 419de28

Browse files
Tyler FoxTyler Fox
Tyler Fox
authored and
Tyler Fox
committed
Rename INTUDefines --> INTUGroupedArrayDefines
This avoids some namespace issues when using multiple Intuit open source projects together.
1 parent 0b51dd3 commit 419de28

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

GroupedArraySample/GroupedArraySample.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
/* End PBXContainerItemProxy section */
5252

5353
/* Begin PBXFileReference section */
54-
A798B1A91B2BC875008B7D63 /* INTUDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = INTUDefines.h; sourceTree = "<group>"; };
54+
A798B1A91B2BC875008B7D63 /* INTUGroupedArrayDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = INTUGroupedArrayDefines.h; sourceTree = "<group>"; };
5555
B14F257D1A05EB6E0067C976 /* INTUGroupedArrayInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = INTUGroupedArrayInternal.h; sourceTree = "<group>"; };
5656
B14F257E1A05EB6E0067C976 /* INTUGroupedArraySectionContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = INTUGroupedArraySectionContainer.h; sourceTree = "<group>"; };
5757
B14F257F1A05EB6E0067C976 /* INTUGroupedArraySectionContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = INTUGroupedArraySectionContainer.m; sourceTree = "<group>"; };
@@ -139,7 +139,7 @@
139139
B14F257C1A05EB6E0067C976 /* Internal */ = {
140140
isa = PBXGroup;
141141
children = (
142-
A798B1A91B2BC875008B7D63 /* INTUDefines.h */,
142+
A798B1A91B2BC875008B7D63 /* INTUGroupedArrayDefines.h */,
143143
B14F257D1A05EB6E0067C976 /* INTUGroupedArrayInternal.h */,
144144
B14F25811A05EB6E0067C976 /* INTUMutableGroupedArrayInternal.h */,
145145
B14F257E1A05EB6E0067C976 /* INTUGroupedArraySectionContainer.h */,

Source/INTUGroupedArray/INTUGroupedArray.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
//
2626

2727
#import <Foundation/Foundation.h>
28-
#import "INTUDefines.h"
28+
#import "INTUGroupedArrayDefines.h"
2929

3030
__INTU_ASSUME_NONNULL_BEGIN
3131

Source/INTUGroupedArray/Internal/INTUDefines.h Source/INTUGroupedArray/Internal/INTUGroupedArrayDefines.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// INTUDefines.h
2+
// INTUGroupedArrayDefines.h
33
// https://github.com/intuit/GroupedArray
44
//
55
// Copyright (c) 2015 Intuit Inc.
@@ -24,8 +24,8 @@
2424
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2525
//
2626

27-
#ifndef INTUDefines_h
28-
#define INTUDefines_h
27+
#ifndef INTUGroupedArrayDefines_h
28+
#define INTUGroupedArrayDefines_h
2929

3030
#if __has_feature(nullability)
3131
# define __INTU_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@@ -45,4 +45,4 @@
4545
# define __INTU_GENERICS_TYPE(type) id
4646
#endif
4747

48-
#endif /* INTUDefines_h */
48+
#endif /* INTUGroupedArrayDefines_h */

Source/INTUGroupedArray/Internal/INTUGroupedArraySectionContainer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
//
2626

2727
#import <Foundation/Foundation.h>
28-
#import "INTUDefines.h"
28+
#import "INTUGroupedArrayDefines.h"
2929

3030
__INTU_ASSUME_NONNULL_BEGIN
3131

Source/INTUGroupedArray/Internal/INTUIndexPair.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define INTUIndexPair_h
2929

3030
#import <Foundation/Foundation.h>
31-
#import "INTUDefines.h"
31+
#import "INTUGroupedArrayDefines.h"
3232

3333
__INTU_ASSUME_NONNULL_BEGIN
3434

SwiftGroupedArray/SwiftGroupedArray.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
/* End PBXContainerItemProxy section */
3131

3232
/* Begin PBXFileReference section */
33-
A76593101B2C02AD00B7C19E /* INTUDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = INTUDefines.h; sourceTree = "<group>"; };
3433
B14F256B1A05E9F90067C976 /* INTUGroupedArrayInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = INTUGroupedArrayInternal.h; sourceTree = "<group>"; };
3534
B14F256C1A05E9F90067C976 /* INTUGroupedArraySectionContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = INTUGroupedArraySectionContainer.h; sourceTree = "<group>"; };
3635
B14F256D1A05E9F90067C976 /* INTUGroupedArraySectionContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = INTUGroupedArraySectionContainer.m; sourceTree = "<group>"; };
@@ -54,6 +53,7 @@
5453
B1A683A21A02DB8300C73235 /* SwiftGroupedArrayTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftGroupedArrayTests.swift; sourceTree = "<group>"; };
5554
B1A683AC1A02DBA900C73235 /* SwiftGroupedArray-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SwiftGroupedArray-Bridging-Header.h"; sourceTree = SOURCE_ROOT; };
5655
B1A683AD1A02DBA900C73235 /* SwiftGroupedArrayTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SwiftGroupedArrayTests-Bridging-Header.h"; sourceTree = SOURCE_ROOT; };
56+
B1D1242D1B7A720E000282D2 /* INTUGroupedArrayDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = INTUGroupedArrayDefines.h; sourceTree = "<group>"; };
5757
/* End PBXFileReference section */
5858

5959
/* Begin PBXFrameworksBuildPhase section */
@@ -91,7 +91,7 @@
9191
B14F256A1A05E9F90067C976 /* Internal */ = {
9292
isa = PBXGroup;
9393
children = (
94-
A76593101B2C02AD00B7C19E /* INTUDefines.h */,
94+
B1D1242D1B7A720E000282D2 /* INTUGroupedArrayDefines.h */,
9595
B14F256B1A05E9F90067C976 /* INTUGroupedArrayInternal.h */,
9696
B14F256F1A05E9F90067C976 /* INTUMutableGroupedArrayInternal.h */,
9797
B14F256C1A05E9F90067C976 /* INTUGroupedArraySectionContainer.h */,

0 commit comments

Comments
 (0)