Просмотр исходного кода

Namespace some category filenames

Tanner Bennett лет назад: 6
Родитель
Сommit
fbeb1beca0
33 измененных файлов с 65 добавлено и 65 удалено
  1. 1 1
      Classes/Core/Controllers/FLEXFilteringTableViewController.m
  2. 1 1
      Classes/Core/FLEXTableViewSection.h
  3. 3 3
      Classes/FLEX-Categories.h
  4. 1 1
      Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.m
  5. 1 1
      Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.m
  6. 1 1
      Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.m
  7. 1 1
      Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m
  8. 1 1
      Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m
  9. 1 1
      Classes/GlobalStateExplorers/FLEXObjectListViewController.m
  10. 1 1
      Classes/GlobalStateExplorers/FLEXObjectRef.m
  11. 1 1
      Classes/GlobalStateExplorers/Globals/FLEXGlobalsSection.m
  12. 2 2
      Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeClient.m
  13. 2 2
      Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeExporter.m
  14. 2 2
      Classes/GlobalStateExplorers/RuntimeBrowser/FLEXKeyPathSearchController.m
  15. 1 1
      Classes/Network/PonyDebugger/FLEXNetworkObserver.m
  16. 1 2
      Classes/ObjectExplorers/FLEXObjectExplorer.m
  17. 1 1
      Classes/ObjectExplorers/Sections/FLEXMetadataSection.m
  18. 1 1
      Classes/ObjectExplorers/Sections/Shortcuts/FLEXClassShortcuts.m
  19. 1 1
      Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsFactory+Defaults.m
  20. 1 1
      Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m
  21. 1 1
      Classes/Utility/Categories/NSArray+Functional.h
  22. 2 2
      Classes/Utility/Categories/NSArray+Functional.m
  23. 1 1
      Classes/Utility/Categories/NSObject+Reflection.h
  24. 3 3
      Classes/Utility/Categories/NSObject+Reflection.m
  25. 1 0
      Classes/Utility/Categories/NSTimer+Blocks.h
  26. 1 1
      Classes/Utility/Categories/NSTimer+Blocks.m
  27. 1 1
      Classes/Utility/FLEXUtility.h
  28. 1 1
      Classes/Utility/Runtime/Objc/Reflection/FLEXProtocol.m
  29. 1 1
      Classes/ViewHierarchy/SnapshotExplorer/FHSView.m
  30. 1 1
      Classes/ViewHierarchy/SnapshotExplorer/FHSViewController.m
  31. 1 1
      Classes/ViewHierarchy/SnapshotExplorer/FHSViewSnapshot.m
  32. 24 24
      FLEX.xcodeproj/project.pbxproj
  33. 2 2
      FLEXTests/FLEXTests.m

+ 1 - 1
Classes/Core/Controllers/FLEXFilteringTableViewController.m

@@ -8,7 +8,7 @@
 
 
 #import "FLEXFilteringTableViewController.h"
 #import "FLEXFilteringTableViewController.h"
 #import "FLEXTableViewSection.h"
 #import "FLEXTableViewSection.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 
 @interface FLEXFilteringTableViewController ()
 @interface FLEXFilteringTableViewController ()
 
 

+ 1 - 1
Classes/Core/FLEXTableViewSection.h

@@ -8,7 +8,7 @@
 
 
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
 #import "FLEXMacros.h"
 #import "FLEXMacros.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 @class FLEXTableView;
 @class FLEXTableView;
 
 
 NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_BEGIN

+ 3 - 3
Classes/FLEX-Categories.h

@@ -17,11 +17,11 @@
 #import <FLEX/UIMenu+FLEX.h>
 #import <FLEX/UIMenu+FLEX.h>
 #import <FLEX/UITextField+Range.h>
 #import <FLEX/UITextField+Range.h>
 
 
-#import <FLEX/NSObject+Reflection.h>
-#import <FLEX/NSArray+Functional.h>
+#import <FLEX/NSObject+FLEX_Reflection.h>
+#import <FLEX/NSArray+FLEX.h>
 #import <FLEX/NSDictionary+ObjcRuntime.h>
 #import <FLEX/NSDictionary+ObjcRuntime.h>
 #import <FLEX/NSString+ObjcRuntime.h>
 #import <FLEX/NSString+ObjcRuntime.h>
 #import <FLEX/NSString+FLEX.h>
 #import <FLEX/NSString+FLEX.h>
 #import <FLEX/NSUserDefaults+FLEX.h>
 #import <FLEX/NSUserDefaults+FLEX.h>
 #import <FLEX/NSMapTable+FLEX_Subscripting.h>
 #import <FLEX/NSMapTable+FLEX_Subscripting.h>
-#import <FLEX/NSTimer+Blocks.h>
+#import <FLEX/NSTimer+FLEX.h>

+ 1 - 1
Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.m

@@ -8,7 +8,7 @@
 
 
 #import "FLEXDBQueryRowCell.h"
 #import "FLEXDBQueryRowCell.h"
 #import "FLEXMultiColumnTableView.h"
 #import "FLEXMultiColumnTableView.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIFont+FLEX.h"
 #import "UIFont+FLEX.h"
 #import "FLEXColor.h"
 #import "FLEXColor.h"
 
 

+ 1 - 1
Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.m

@@ -7,7 +7,7 @@
 //
 //
 
 
 #import "FLEXRealmDatabaseManager.h"
 #import "FLEXRealmDatabaseManager.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXSQLResult.h"
 #import "FLEXSQLResult.h"
 
 
 #if __has_include(<Realm/Realm.h>)
 #if __has_include(<Realm/Realm.h>)

+ 1 - 1
Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.m

@@ -7,7 +7,7 @@
 //
 //
 
 
 #import "FLEXSQLResult.h"
 #import "FLEXSQLResult.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 
 @implementation FLEXSQLResult
 @implementation FLEXSQLResult
 @synthesize keyedRows = _keyedRows;
 @synthesize keyedRows = _keyedRows;

+ 1 - 1
Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m

@@ -8,7 +8,7 @@
 
 
 #import "FLEXSQLiteDatabaseManager.h"
 #import "FLEXSQLiteDatabaseManager.h"
 #import "FLEXManager.h"
 #import "FLEXManager.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXRuntimeConstants.h"
 #import "FLEXRuntimeConstants.h"
 #import <sqlite3.h>
 #import <sqlite3.h>
 
 

+ 1 - 1
Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m

@@ -12,7 +12,7 @@
 #import "FLEXRealmDatabaseManager.h"
 #import "FLEXRealmDatabaseManager.h"
 #import "FLEXTableContentViewController.h"
 #import "FLEXTableContentViewController.h"
 #import "FLEXMutableListSection.h"
 #import "FLEXMutableListSection.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXAlert.h"
 #import "FLEXAlert.h"
 
 
 @interface FLEXTableListViewController ()
 @interface FLEXTableListViewController ()

+ 1 - 1
Classes/GlobalStateExplorers/FLEXObjectListViewController.m

@@ -15,7 +15,7 @@
 #import "FLEXHeapEnumerator.h"
 #import "FLEXHeapEnumerator.h"
 #import "FLEXObjectRef.h"
 #import "FLEXObjectRef.h"
 #import "NSString+FLEX.h"
 #import "NSString+FLEX.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXTableViewCell.h"
 #import "FLEXTableViewCell.h"
 #import <malloc/malloc.h>
 #import <malloc/malloc.h>
 
 

+ 1 - 1
Classes/GlobalStateExplorers/FLEXObjectRef.m

@@ -8,7 +8,7 @@
 
 
 #import "FLEXObjectRef.h"
 #import "FLEXObjectRef.h"
 #import "FLEXRuntimeUtility.h"
 #import "FLEXRuntimeUtility.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 
 @interface FLEXObjectRef ()
 @interface FLEXObjectRef ()
 @property (nonatomic, readonly) BOOL wantsSummary;
 @property (nonatomic, readonly) BOOL wantsSummary;

+ 1 - 1
Classes/GlobalStateExplorers/Globals/FLEXGlobalsSection.m

@@ -7,7 +7,7 @@
 //
 //
 
 
 #import "FLEXGlobalsSection.h"
 #import "FLEXGlobalsSection.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIFont+FLEX.h"
 #import "UIFont+FLEX.h"
 
 
 @interface FLEXGlobalsSection ()
 @interface FLEXGlobalsSection ()

+ 2 - 2
Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeClient.m

@@ -7,9 +7,9 @@
 //
 //
 
 
 #import "FLEXRuntimeClient.h"
 #import "FLEXRuntimeClient.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXMethod.h"
 #import "FLEXMethod.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXRuntimeSafety.h"
 #import "FLEXRuntimeSafety.h"
 #include <dlfcn.h>
 #include <dlfcn.h>
 
 

+ 2 - 2
Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeExporter.m

@@ -8,10 +8,10 @@
 
 
 #import "FLEXRuntimeExporter.h"
 #import "FLEXRuntimeExporter.h"
 #import "FLEXSQLiteDatabaseManager.h"
 #import "FLEXSQLiteDatabaseManager.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXRuntimeController.h"
 #import "FLEXRuntimeController.h"
 #import "FLEXRuntimeClient.h"
 #import "FLEXRuntimeClient.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXTypeEncodingParser.h"
 #import "FLEXTypeEncodingParser.h"
 #import <sqlite3.h>
 #import <sqlite3.h>
 
 

+ 2 - 2
Classes/GlobalStateExplorers/RuntimeBrowser/FLEXKeyPathSearchController.m

@@ -10,9 +10,9 @@
 #import "FLEXRuntimeKeyPathTokenizer.h"
 #import "FLEXRuntimeKeyPathTokenizer.h"
 #import "FLEXRuntimeController.h"
 #import "FLEXRuntimeController.h"
 #import "NSString+FLEX.h"
 #import "NSString+FLEX.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UITextField+Range.h"
 #import "UITextField+Range.h"
-#import "NSTimer+Blocks.h"
+#import "NSTimer+FLEX.h"
 #import "FLEXTableView.h"
 #import "FLEXTableView.h"
 #import "FLEXUtility.h"
 #import "FLEXUtility.h"
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXObjectExplorerFactory.h"

+ 1 - 1
Classes/Network/PonyDebugger/FLEXNetworkObserver.m

@@ -15,7 +15,7 @@
 #import "FLEXNetworkObserver.h"
 #import "FLEXNetworkObserver.h"
 #import "FLEXNetworkRecorder.h"
 #import "FLEXNetworkRecorder.h"
 #import "FLEXUtility.h"
 #import "FLEXUtility.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXMethod.h"
 #import "FLEXMethod.h"
 
 
 #import <objc/runtime.h>
 #import <objc/runtime.h>

+ 1 - 2
Classes/ObjectExplorers/FLEXObjectExplorer.m

@@ -9,11 +9,10 @@
 #import "FLEXObjectExplorer.h"
 #import "FLEXObjectExplorer.h"
 #import "FLEXUtility.h"
 #import "FLEXUtility.h"
 #import "FLEXRuntimeUtility.h"
 #import "FLEXRuntimeUtility.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXRuntime+Compare.h"
 #import "FLEXRuntime+Compare.h"
 #import "FLEXRuntime+UIKitHelpers.h"
 #import "FLEXRuntime+UIKitHelpers.h"
 #import "FLEXPropertyAttributes.h"
 #import "FLEXPropertyAttributes.h"
-#import "NSObject+Reflection.h"
 #import "FLEXMetadataSection.h"
 #import "FLEXMetadataSection.h"
 #import "NSUserDefaults+FLEX.h"
 #import "NSUserDefaults+FLEX.h"
 
 

+ 1 - 1
Classes/ObjectExplorers/Sections/FLEXMetadataSection.m

@@ -13,7 +13,7 @@
 #import "FLEXFieldEditorViewController.h"
 #import "FLEXFieldEditorViewController.h"
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXIvar.h"
 #import "FLEXIvar.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXRuntime+UIKitHelpers.h"
 #import "FLEXRuntime+UIKitHelpers.h"
 
 
 @interface FLEXMetadataSection ()
 @interface FLEXMetadataSection ()

+ 1 - 1
Classes/ObjectExplorers/Sections/Shortcuts/FLEXClassShortcuts.m

@@ -10,7 +10,7 @@
 #import "FLEXShortcut.h"
 #import "FLEXShortcut.h"
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXObjectListViewController.h"
 #import "FLEXObjectListViewController.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 
 
 @interface FLEXClassShortcuts ()
 @interface FLEXClassShortcuts ()
 @property (nonatomic, readonly) Class cls;
 @property (nonatomic, readonly) Class cls;

+ 1 - 1
Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsFactory+Defaults.m

@@ -9,7 +9,7 @@
 #import "FLEXShortcutsFactory+Defaults.h"
 #import "FLEXShortcutsFactory+Defaults.h"
 #import "FLEXShortcut.h"
 #import "FLEXShortcut.h"
 #import "FLEXRuntimeUtility.h"
 #import "FLEXRuntimeUtility.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 
 
 #pragma mark - Views
 #pragma mark - Views
 
 

+ 1 - 1
Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m

@@ -15,7 +15,7 @@
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXTableView.h"
 #import "FLEXTableView.h"
 #import "FLEXUtility.h"
 #import "FLEXUtility.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "NSString+FLEX.h"
 #import "NSString+FLEX.h"
 
 
 #define FLEXObjectExplorerDefaultsImpl \
 #define FLEXObjectExplorerDefaultsImpl \

+ 1 - 1
Classes/Utility/Categories/NSArray+Functional.h

@@ -1,5 +1,5 @@
 //
 //
-//  NSArray+Functional.h
+//  NSArray+FLEX.h
 //  FLEX
 //  FLEX
 //
 //
 //  Created by Tanner Bennett on 9/25/19.
 //  Created by Tanner Bennett on 9/25/19.

+ 2 - 2
Classes/Utility/Categories/NSArray+Functional.m

@@ -1,12 +1,12 @@
 //
 //
-//  NSArray+Functional.m
+//  NSArray+FLEX.m
 //  FLEX
 //  FLEX
 //
 //
 //  Created by Tanner Bennett on 9/25/19.
 //  Created by Tanner Bennett on 9/25/19.
 //  Copyright © 2019 Flipboard. All rights reserved.
 //  Copyright © 2019 Flipboard. All rights reserved.
 //
 //
 
 
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 
 #define FLEXArrayClassIsMutable(me) ([[self class] isSubclassOfClass:[NSMutableArray class]])
 #define FLEXArrayClassIsMutable(me) ([[self class] isSubclassOfClass:[NSMutableArray class]])
 
 

+ 1 - 1
Classes/Utility/Categories/NSObject+Reflection.h

@@ -1,5 +1,5 @@
 //
 //
-//  NSObject+Reflection.h
+//  NSObject+FLEX_Reflection.h
 //  FLEX
 //  FLEX
 //
 //
 //  Derived from MirrorKit.
 //  Derived from MirrorKit.

+ 3 - 3
Classes/Utility/Categories/NSObject+Reflection.m

@@ -1,5 +1,5 @@
 //
 //
-//  NSObject+Reflection.m
+//  NSObject+FLEX_Reflection.m
 //  FLEX
 //  FLEX
 //
 //
 //  Derived from MirrorKit.
 //  Derived from MirrorKit.
@@ -7,7 +7,7 @@
 //  Copyright (c) 2015 Tanner Bennett. All rights reserved.
 //  Copyright (c) 2015 Tanner Bennett. All rights reserved.
 //
 //
 
 
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXClassBuilder.h"
 #import "FLEXClassBuilder.h"
 #import "FLEXMirror.h"
 #import "FLEXMirror.h"
 #import "FLEXProperty.h"
 #import "FLEXProperty.h"
@@ -15,7 +15,7 @@
 #import "FLEXIvar.h"
 #import "FLEXIvar.h"
 #import "FLEXProtocol.h"
 #import "FLEXProtocol.h"
 #import "FLEXPropertyAttributes.h"
 #import "FLEXPropertyAttributes.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXUtility.h"
 #import "FLEXUtility.h"
 
 
 
 

+ 1 - 0
Classes/Utility/Categories/NSTimer+Blocks.h

@@ -8,6 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
 
 
 typedef void (^VoidBlock)(void);
 typedef void (^VoidBlock)(void);
+
 @interface NSTimer (Blocks)
 @interface NSTimer (Blocks)
 
 
 + (instancetype)fireSecondsFromNow:(NSTimeInterval)delay block:(VoidBlock)block;
 + (instancetype)fireSecondsFromNow:(NSTimeInterval)delay block:(VoidBlock)block;

+ 1 - 1
Classes/Utility/Categories/NSTimer+Blocks.m

@@ -5,7 +5,7 @@
 //  Created by Tanner on 3/23/17.
 //  Created by Tanner on 3/23/17.
 //
 //
 
 
-#import "NSTimer+Blocks.h"
+#import "NSTimer+FLEX.h"
 
 
 @interface Block : NSObject
 @interface Block : NSObject
 - (void)invoke;
 - (void)invoke;

+ 1 - 1
Classes/Utility/FLEXUtility.h

@@ -13,7 +13,7 @@
 #import <objc/runtime.h>
 #import <objc/runtime.h>
 #import "FLEXTypeEncodingParser.h"
 #import "FLEXTypeEncodingParser.h"
 #import "FLEXAlert.h"
 #import "FLEXAlert.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIFont+FLEX.h"
 #import "UIFont+FLEX.h"
 #import "NSMapTable+FLEX_Subscripting.h"
 #import "NSMapTable+FLEX_Subscripting.h"
 #import "FLEXMacros.h"
 #import "FLEXMacros.h"

+ 1 - 1
Classes/Utility/Runtime/Objc/Reflection/FLEXProtocol.m

@@ -10,7 +10,7 @@
 #import "FLEXProtocol.h"
 #import "FLEXProtocol.h"
 #import "FLEXProperty.h"
 #import "FLEXProperty.h"
 #import "FLEXRuntimeUtility.h"
 #import "FLEXRuntimeUtility.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #include <dlfcn.h>
 #include <dlfcn.h>
 
 
 @implementation FLEXProtocol
 @implementation FLEXProtocol

+ 1 - 1
Classes/ViewHierarchy/SnapshotExplorer/FHSView.m

@@ -7,7 +7,7 @@
 
 
 #import "FHSView.h"
 #import "FHSView.h"
 #import "FLEXUtility.h"
 #import "FLEXUtility.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 
 @interface FHSView (Snapshotting)
 @interface FHSView (Snapshotting)
 + (UIImage *)_snapshotView:(UIView *)view;
 + (UIImage *)_snapshotView:(UIView *)view;

+ 1 - 1
Classes/ViewHierarchy/SnapshotExplorer/FHSViewController.m

@@ -13,7 +13,7 @@
 #import "FLEXAlert.h"
 #import "FLEXAlert.h"
 #import "FLEXWindow.h"
 #import "FLEXWindow.h"
 #import "FLEXResources.h"
 #import "FLEXResources.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIBarButtonItem+FLEX.h"
 #import "UIBarButtonItem+FLEX.h"
 
 
 BOOL const kFHSViewControllerExcludeFLEXWindows = YES;
 BOOL const kFHSViewControllerExcludeFLEXWindows = YES;

+ 1 - 1
Classes/ViewHierarchy/SnapshotExplorer/FHSViewSnapshot.m

@@ -7,7 +7,7 @@
 //
 //
 
 
 #import "FHSViewSnapshot.h"
 #import "FHSViewSnapshot.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 
 @implementation FHSViewSnapshot
 @implementation FHSViewSnapshot
 
 

+ 24 - 24
FLEX.xcodeproj/project.pbxproj

@@ -226,8 +226,8 @@
 		C383C3BA23B6A62A007A321B /* FLEXRuntimeSafety.m in Sources */ = {isa = PBXBuildFile; fileRef = C383C3B823B6A62A007A321B /* FLEXRuntimeSafety.m */; };
 		C383C3BA23B6A62A007A321B /* FLEXRuntimeSafety.m in Sources */ = {isa = PBXBuildFile; fileRef = C383C3B823B6A62A007A321B /* FLEXRuntimeSafety.m */; };
 		C383C3BD23B6B398007A321B /* UITextField+Range.m in Sources */ = {isa = PBXBuildFile; fileRef = C383C3BB23B6B398007A321B /* UITextField+Range.m */; };
 		C383C3BD23B6B398007A321B /* UITextField+Range.m in Sources */ = {isa = PBXBuildFile; fileRef = C383C3BB23B6B398007A321B /* UITextField+Range.m */; };
 		C383C3BE23B6B398007A321B /* UITextField+Range.h in Headers */ = {isa = PBXBuildFile; fileRef = C383C3BC23B6B398007A321B /* UITextField+Range.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C383C3BE23B6B398007A321B /* UITextField+Range.h in Headers */ = {isa = PBXBuildFile; fileRef = C383C3BC23B6B398007A321B /* UITextField+Range.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C383C3C123B6B429007A321B /* NSTimer+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = C383C3BF23B6B429007A321B /* NSTimer+Blocks.m */; };
-		C383C3C223B6B429007A321B /* NSTimer+Blocks.h in Headers */ = {isa = PBXBuildFile; fileRef = C383C3C023B6B429007A321B /* NSTimer+Blocks.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C383C3C123B6B429007A321B /* NSTimer+FLEX.m in Sources */ = {isa = PBXBuildFile; fileRef = C383C3BF23B6B429007A321B /* NSTimer+FLEX.m */; };
+		C383C3C223B6B429007A321B /* NSTimer+FLEX.h in Headers */ = {isa = PBXBuildFile; fileRef = C383C3C023B6B429007A321B /* NSTimer+FLEX.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C383C3C523B6BB81007A321B /* FLEXCodeFontCell.h in Headers */ = {isa = PBXBuildFile; fileRef = C383C3C323B6BB81007A321B /* FLEXCodeFontCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C383C3C523B6BB81007A321B /* FLEXCodeFontCell.h in Headers */ = {isa = PBXBuildFile; fileRef = C383C3C323B6BB81007A321B /* FLEXCodeFontCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C383C3C623B6BB81007A321B /* FLEXCodeFontCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C383C3C423B6BB81007A321B /* FLEXCodeFontCell.m */; };
 		C383C3C623B6BB81007A321B /* FLEXCodeFontCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C383C3C423B6BB81007A321B /* FLEXCodeFontCell.m */; };
 		C3854DF023F36C1700FCD1E2 /* FLEXTypeEncodingParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C3854DEF23F36C1700FCD1E2 /* FLEXTypeEncodingParserTests.m */; };
 		C3854DF023F36C1700FCD1E2 /* FLEXTypeEncodingParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C3854DEF23F36C1700FCD1E2 /* FLEXTypeEncodingParserTests.m */; };
@@ -304,8 +304,8 @@
 		C3A9424A23C78878006871A3 /* FLEXHierarchyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3A9424823C78878006871A3 /* FLEXHierarchyViewController.m */; };
 		C3A9424A23C78878006871A3 /* FLEXHierarchyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3A9424823C78878006871A3 /* FLEXHierarchyViewController.m */; };
 		C3A9424D23C78CFF006871A3 /* FHSViewSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = C3A9424B23C78CFF006871A3 /* FHSViewSnapshot.h */; };
 		C3A9424D23C78CFF006871A3 /* FHSViewSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = C3A9424B23C78CFF006871A3 /* FHSViewSnapshot.h */; };
 		C3A9424E23C78CFF006871A3 /* FHSViewSnapshot.m in Sources */ = {isa = PBXBuildFile; fileRef = C3A9424C23C78CFF006871A3 /* FHSViewSnapshot.m */; };
 		C3A9424E23C78CFF006871A3 /* FHSViewSnapshot.m in Sources */ = {isa = PBXBuildFile; fileRef = C3A9424C23C78CFF006871A3 /* FHSViewSnapshot.m */; };
-		C3BFD070233C23ED0015FB82 /* NSArray+Functional.h in Headers */ = {isa = PBXBuildFile; fileRef = C3BFD06E233C23ED0015FB82 /* NSArray+Functional.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C3BFD071233C23ED0015FB82 /* NSArray+Functional.m in Sources */ = {isa = PBXBuildFile; fileRef = C3BFD06F233C23ED0015FB82 /* NSArray+Functional.m */; };
+		C3BFD070233C23ED0015FB82 /* NSArray+FLEX.h in Headers */ = {isa = PBXBuildFile; fileRef = C3BFD06E233C23ED0015FB82 /* NSArray+FLEX.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C3BFD071233C23ED0015FB82 /* NSArray+FLEX.m in Sources */ = {isa = PBXBuildFile; fileRef = C3BFD06F233C23ED0015FB82 /* NSArray+FLEX.m */; };
 		C3DB9F642107FC9600B46809 /* FLEXObjectRef.h in Headers */ = {isa = PBXBuildFile; fileRef = C3DB9F622107FC9600B46809 /* FLEXObjectRef.h */; };
 		C3DB9F642107FC9600B46809 /* FLEXObjectRef.h in Headers */ = {isa = PBXBuildFile; fileRef = C3DB9F622107FC9600B46809 /* FLEXObjectRef.h */; };
 		C3DB9F652107FC9600B46809 /* FLEXObjectRef.m in Sources */ = {isa = PBXBuildFile; fileRef = C3DB9F632107FC9600B46809 /* FLEXObjectRef.m */; };
 		C3DB9F652107FC9600B46809 /* FLEXObjectRef.m in Sources */ = {isa = PBXBuildFile; fileRef = C3DB9F632107FC9600B46809 /* FLEXObjectRef.m */; };
 		C3DC287C223ED5F200F48AA6 /* FLEXOSLogController.m in Sources */ = {isa = PBXBuildFile; fileRef = C34EE30721CB23CC00BD3A7C /* FLEXOSLogController.m */; };
 		C3DC287C223ED5F200F48AA6 /* FLEXOSLogController.m in Sources */ = {isa = PBXBuildFile; fileRef = C34EE30721CB23CC00BD3A7C /* FLEXOSLogController.m */; };
@@ -344,8 +344,8 @@
 		C3F977842311B38F0032776D /* NSDictionary+ObjcRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F9777E2311B38E0032776D /* NSDictionary+ObjcRuntime.m */; };
 		C3F977842311B38F0032776D /* NSDictionary+ObjcRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F9777E2311B38E0032776D /* NSDictionary+ObjcRuntime.m */; };
 		C3F977852311B38F0032776D /* NSDictionary+ObjcRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = C3F9777F2311B38F0032776D /* NSDictionary+ObjcRuntime.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C3F977852311B38F0032776D /* NSDictionary+ObjcRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = C3F9777F2311B38F0032776D /* NSDictionary+ObjcRuntime.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C3F977862311B38F0032776D /* NSString+ObjcRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F977802311B38F0032776D /* NSString+ObjcRuntime.m */; };
 		C3F977862311B38F0032776D /* NSString+ObjcRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F977802311B38F0032776D /* NSString+ObjcRuntime.m */; };
-		C3F977872311B38F0032776D /* NSObject+Reflection.h in Headers */ = {isa = PBXBuildFile; fileRef = C3F977812311B38F0032776D /* NSObject+Reflection.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C3F977882311B38F0032776D /* NSObject+Reflection.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F977822311B38F0032776D /* NSObject+Reflection.m */; };
+		C3F977872311B38F0032776D /* NSObject+FLEX_Reflection.h in Headers */ = {isa = PBXBuildFile; fileRef = C3F977812311B38F0032776D /* NSObject+FLEX_Reflection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C3F977882311B38F0032776D /* NSObject+FLEX_Reflection.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F977822311B38F0032776D /* NSObject+FLEX_Reflection.m */; };
 /* End PBXBuildFile section */
 /* End PBXBuildFile section */
 
 
 /* Begin PBXContainerItemProxy section */
 /* Begin PBXContainerItemProxy section */
@@ -587,8 +587,8 @@
 		C383C3B823B6A62A007A321B /* FLEXRuntimeSafety.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXRuntimeSafety.m; sourceTree = "<group>"; };
 		C383C3B823B6A62A007A321B /* FLEXRuntimeSafety.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXRuntimeSafety.m; sourceTree = "<group>"; };
 		C383C3BB23B6B398007A321B /* UITextField+Range.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextField+Range.m"; sourceTree = "<group>"; };
 		C383C3BB23B6B398007A321B /* UITextField+Range.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextField+Range.m"; sourceTree = "<group>"; };
 		C383C3BC23B6B398007A321B /* UITextField+Range.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITextField+Range.h"; sourceTree = "<group>"; };
 		C383C3BC23B6B398007A321B /* UITextField+Range.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITextField+Range.h"; sourceTree = "<group>"; };
-		C383C3BF23B6B429007A321B /* NSTimer+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTimer+Blocks.m"; sourceTree = "<group>"; };
-		C383C3C023B6B429007A321B /* NSTimer+Blocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTimer+Blocks.h"; sourceTree = "<group>"; };
+		C383C3BF23B6B429007A321B /* NSTimer+FLEX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTimer+FLEX.m"; sourceTree = "<group>"; };
+		C383C3C023B6B429007A321B /* NSTimer+FLEX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTimer+FLEX.h"; sourceTree = "<group>"; };
 		C383C3C323B6BB81007A321B /* FLEXCodeFontCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FLEXCodeFontCell.h; sourceTree = "<group>"; };
 		C383C3C323B6BB81007A321B /* FLEXCodeFontCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FLEXCodeFontCell.h; sourceTree = "<group>"; };
 		C383C3C423B6BB81007A321B /* FLEXCodeFontCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLEXCodeFontCell.m; sourceTree = "<group>"; };
 		C383C3C423B6BB81007A321B /* FLEXCodeFontCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLEXCodeFontCell.m; sourceTree = "<group>"; };
 		C3854DEF23F36C1700FCD1E2 /* FLEXTypeEncodingParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXTypeEncodingParserTests.m; sourceTree = "<group>"; };
 		C3854DEF23F36C1700FCD1E2 /* FLEXTypeEncodingParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXTypeEncodingParserTests.m; sourceTree = "<group>"; };
@@ -661,8 +661,8 @@
 		C3A9424823C78878006871A3 /* FLEXHierarchyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLEXHierarchyViewController.m; sourceTree = "<group>"; };
 		C3A9424823C78878006871A3 /* FLEXHierarchyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLEXHierarchyViewController.m; sourceTree = "<group>"; };
 		C3A9424B23C78CFF006871A3 /* FHSViewSnapshot.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FHSViewSnapshot.h; sourceTree = "<group>"; };
 		C3A9424B23C78CFF006871A3 /* FHSViewSnapshot.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FHSViewSnapshot.h; sourceTree = "<group>"; };
 		C3A9424C23C78CFF006871A3 /* FHSViewSnapshot.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FHSViewSnapshot.m; sourceTree = "<group>"; };
 		C3A9424C23C78CFF006871A3 /* FHSViewSnapshot.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FHSViewSnapshot.m; sourceTree = "<group>"; };
-		C3BFD06E233C23ED0015FB82 /* NSArray+Functional.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray+Functional.h"; sourceTree = "<group>"; };
-		C3BFD06F233C23ED0015FB82 /* NSArray+Functional.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Functional.m"; sourceTree = "<group>"; };
+		C3BFD06E233C23ED0015FB82 /* NSArray+FLEX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray+FLEX.h"; sourceTree = "<group>"; };
+		C3BFD06F233C23ED0015FB82 /* NSArray+FLEX.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+FLEX.m"; sourceTree = "<group>"; };
 		C3DB9F622107FC9600B46809 /* FLEXObjectRef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FLEXObjectRef.h; sourceTree = "<group>"; };
 		C3DB9F622107FC9600B46809 /* FLEXObjectRef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FLEXObjectRef.h; sourceTree = "<group>"; };
 		C3DB9F632107FC9600B46809 /* FLEXObjectRef.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLEXObjectRef.m; sourceTree = "<group>"; };
 		C3DB9F632107FC9600B46809 /* FLEXObjectRef.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLEXObjectRef.m; sourceTree = "<group>"; };
 		C3DFCD922416BC6500BB7084 /* FLEXFilteringTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FLEXFilteringTableViewController.h; sourceTree = "<group>"; };
 		C3DFCD922416BC6500BB7084 /* FLEXFilteringTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FLEXFilteringTableViewController.h; sourceTree = "<group>"; };
@@ -702,8 +702,8 @@
 		C3F9777E2311B38E0032776D /* NSDictionary+ObjcRuntime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+ObjcRuntime.m"; sourceTree = "<group>"; };
 		C3F9777E2311B38E0032776D /* NSDictionary+ObjcRuntime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+ObjcRuntime.m"; sourceTree = "<group>"; };
 		C3F9777F2311B38F0032776D /* NSDictionary+ObjcRuntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+ObjcRuntime.h"; sourceTree = "<group>"; };
 		C3F9777F2311B38F0032776D /* NSDictionary+ObjcRuntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+ObjcRuntime.h"; sourceTree = "<group>"; };
 		C3F977802311B38F0032776D /* NSString+ObjcRuntime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+ObjcRuntime.m"; sourceTree = "<group>"; };
 		C3F977802311B38F0032776D /* NSString+ObjcRuntime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+ObjcRuntime.m"; sourceTree = "<group>"; };
-		C3F977812311B38F0032776D /* NSObject+Reflection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+Reflection.h"; sourceTree = "<group>"; };
-		C3F977822311B38F0032776D /* NSObject+Reflection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Reflection.m"; sourceTree = "<group>"; };
+		C3F977812311B38F0032776D /* NSObject+FLEX_Reflection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+FLEX_Reflection.h"; sourceTree = "<group>"; };
+		C3F977822311B38F0032776D /* NSObject+FLEX_Reflection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+FLEX_Reflection.m"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* End PBXFileReference section */
 
 
 /* Begin PBXFrameworksBuildPhase section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -1224,12 +1224,12 @@
 				C398625C23AD6E90007E6793 /* UIFont+FLEX.m */,
 				C398625C23AD6E90007E6793 /* UIFont+FLEX.m */,
 				C383C3BC23B6B398007A321B /* UITextField+Range.h */,
 				C383C3BC23B6B398007A321B /* UITextField+Range.h */,
 				C383C3BB23B6B398007A321B /* UITextField+Range.m */,
 				C383C3BB23B6B398007A321B /* UITextField+Range.m */,
-				C383C3C023B6B429007A321B /* NSTimer+Blocks.h */,
-				C383C3BF23B6B429007A321B /* NSTimer+Blocks.m */,
-				C3BFD06E233C23ED0015FB82 /* NSArray+Functional.h */,
-				C3BFD06F233C23ED0015FB82 /* NSArray+Functional.m */,
-				C3F977812311B38F0032776D /* NSObject+Reflection.h */,
-				C3F977822311B38F0032776D /* NSObject+Reflection.m */,
+				C383C3C023B6B429007A321B /* NSTimer+FLEX.h */,
+				C383C3BF23B6B429007A321B /* NSTimer+FLEX.m */,
+				C3BFD06E233C23ED0015FB82 /* NSArray+FLEX.h */,
+				C3BFD06F233C23ED0015FB82 /* NSArray+FLEX.m */,
+				C3F977812311B38F0032776D /* NSObject+FLEX_Reflection.h */,
+				C3F977822311B38F0032776D /* NSObject+FLEX_Reflection.m */,
 				C3F9777F2311B38F0032776D /* NSDictionary+ObjcRuntime.h */,
 				C3F9777F2311B38F0032776D /* NSDictionary+ObjcRuntime.h */,
 				C3F9777E2311B38E0032776D /* NSDictionary+ObjcRuntime.m */,
 				C3F9777E2311B38E0032776D /* NSDictionary+ObjcRuntime.m */,
 				C3F9777D2311B38E0032776D /* NSString+ObjcRuntime.h */,
 				C3F9777D2311B38E0032776D /* NSString+ObjcRuntime.h */,
@@ -1486,7 +1486,7 @@
 				C3A9424923C78878006871A3 /* FLEXHierarchyViewController.h in Headers */,
 				C3A9424923C78878006871A3 /* FLEXHierarchyViewController.h in Headers */,
 				C3DFCD942416BC6500BB7084 /* FLEXFilteringTableViewController.h in Headers */,
 				C3DFCD942416BC6500BB7084 /* FLEXFilteringTableViewController.h in Headers */,
 				3A4C94F11B5B21410088C3F2 /* FLEXArgumentInputFontsPickerView.h in Headers */,
 				3A4C94F11B5B21410088C3F2 /* FLEXArgumentInputFontsPickerView.h in Headers */,
-				C3BFD070233C23ED0015FB82 /* NSArray+Functional.h in Headers */,
+				C3BFD070233C23ED0015FB82 /* NSArray+FLEX.h in Headers */,
 				C398682923AC370100E9E391 /* FLEXViewShortcuts.h in Headers */,
 				C398682923AC370100E9E391 /* FLEXViewShortcuts.h in Headers */,
 				C3474C4023DA496400466532 /* FLEXKeyValueTableViewCell.h in Headers */,
 				C3474C4023DA496400466532 /* FLEXKeyValueTableViewCell.h in Headers */,
 				779B1ED61C0C4D7C001F5E49 /* FLEXTableContentViewController.h in Headers */,
 				779B1ED61C0C4D7C001F5E49 /* FLEXTableContentViewController.h in Headers */,
@@ -1536,7 +1536,7 @@
 				94A515251C4CA2080063292F /* FLEXExplorerToolbar.h in Headers */,
 				94A515251C4CA2080063292F /* FLEXExplorerToolbar.h in Headers */,
 				C387C88322E0D24A00750E58 /* UIView+FLEX_Layout.h in Headers */,
 				C387C88322E0D24A00750E58 /* UIView+FLEX_Layout.h in Headers */,
 				3A4C953C1B5B21410088C3F2 /* FLEXNetworkTransaction.h in Headers */,
 				3A4C953C1B5B21410088C3F2 /* FLEXNetworkTransaction.h in Headers */,
-				C383C3C223B6B429007A321B /* NSTimer+Blocks.h in Headers */,
+				C383C3C223B6B429007A321B /* NSTimer+FLEX.h in Headers */,
 				3A4C952E1B5B21410088C3F2 /* FLEXWebViewController.h in Headers */,
 				3A4C952E1B5B21410088C3F2 /* FLEXWebViewController.h in Headers */,
 				C3A9424D23C78CFF006871A3 /* FHSViewSnapshot.h in Headers */,
 				C3A9424D23C78CFF006871A3 /* FHSViewSnapshot.h in Headers */,
 				C3EE76BF22DFC63600EC0AA0 /* FLEXScopeCarousel.h in Headers */,
 				C3EE76BF22DFC63600EC0AA0 /* FLEXScopeCarousel.h in Headers */,
@@ -1562,7 +1562,7 @@
 				3A4C95421B5B21410088C3F2 /* FLEXNetworkObserver.h in Headers */,
 				3A4C95421B5B21410088C3F2 /* FLEXNetworkObserver.h in Headers */,
 				C386D6EB24199E9600699085 /* FLEX-ObjectExploring.h in Headers */,
 				C386D6EB24199E9600699085 /* FLEX-ObjectExploring.h in Headers */,
 				679F64861BD53B7B00A8C94C /* FLEXCookiesTableViewController.h in Headers */,
 				679F64861BD53B7B00A8C94C /* FLEXCookiesTableViewController.h in Headers */,
-				C3F977872311B38F0032776D /* NSObject+Reflection.h in Headers */,
+				C3F977872311B38F0032776D /* NSObject+FLEX_Reflection.h in Headers */,
 				C3DB9F642107FC9600B46809 /* FLEXObjectRef.h in Headers */,
 				C3DB9F642107FC9600B46809 /* FLEXObjectRef.h in Headers */,
 				3A4C95401B5B21410088C3F2 /* FLEXNetworkTransactionTableViewCell.h in Headers */,
 				3A4C95401B5B21410088C3F2 /* FLEXNetworkTransactionTableViewCell.h in Headers */,
 				C398626523AD70F5007E6793 /* FLEXKBToolbarButton.h in Headers */,
 				C398626523AD70F5007E6793 /* FLEXKBToolbarButton.h in Headers */,
@@ -1725,7 +1725,7 @@
 				3A4C94EC1B5B21410088C3F2 /* FLEXImagePreviewViewController.m in Sources */,
 				3A4C94EC1B5B21410088C3F2 /* FLEXImagePreviewViewController.m in Sources */,
 				C383C3BA23B6A62A007A321B /* FLEXRuntimeSafety.m in Sources */,
 				C383C3BA23B6A62A007A321B /* FLEXRuntimeSafety.m in Sources */,
 				3A4C94F21B5B21410088C3F2 /* FLEXArgumentInputFontsPickerView.m in Sources */,
 				3A4C94F21B5B21410088C3F2 /* FLEXArgumentInputFontsPickerView.m in Sources */,
-				C3BFD071233C23ED0015FB82 /* NSArray+Functional.m in Sources */,
+				C3BFD071233C23ED0015FB82 /* NSArray+FLEX.m in Sources */,
 				7349FD6B22B93CDF00051810 /* FLEXColor.m in Sources */,
 				7349FD6B22B93CDF00051810 /* FLEXColor.m in Sources */,
 				C3878DBA23A749960038FDBE /* FLEXVariableEditorViewController.m in Sources */,
 				C3878DBA23A749960038FDBE /* FLEXVariableEditorViewController.m in Sources */,
 				94AAF0391BAF2E1F00DE8760 /* FLEXKeyboardHelpViewController.m in Sources */,
 				94AAF0391BAF2E1F00DE8760 /* FLEXKeyboardHelpViewController.m in Sources */,
@@ -1818,11 +1818,11 @@
 				3A4C95021B5B21410088C3F2 /* FLEXArgumentInputTextView.m in Sources */,
 				3A4C95021B5B21410088C3F2 /* FLEXArgumentInputTextView.m in Sources */,
 				C3531B9E23E69BB200A184AD /* FLEXManager+Networking.m in Sources */,
 				C3531B9E23E69BB200A184AD /* FLEXManager+Networking.m in Sources */,
 				C39EADC923F37B89005618BE /* FLEXTypeEncodingParser.m in Sources */,
 				C39EADC923F37B89005618BE /* FLEXTypeEncodingParser.m in Sources */,
-				C3F977882311B38F0032776D /* NSObject+Reflection.m in Sources */,
+				C3F977882311B38F0032776D /* NSObject+FLEX_Reflection.m in Sources */,
 				C36B096623E0D4A1008F5D47 /* UIMenu+FLEX.m in Sources */,
 				C36B096623E0D4A1008F5D47 /* UIMenu+FLEX.m in Sources */,
 				94A515261C4CA2080063292F /* FLEXExplorerToolbar.m in Sources */,
 				94A515261C4CA2080063292F /* FLEXExplorerToolbar.m in Sources */,
 				C33C825F2316DC8600DD2451 /* FLEXObjectExplorer.m in Sources */,
 				C33C825F2316DC8600DD2451 /* FLEXObjectExplorer.m in Sources */,
-				C383C3C123B6B429007A321B /* NSTimer+Blocks.m in Sources */,
+				C383C3C123B6B429007A321B /* NSTimer+FLEX.m in Sources */,
 				3A4C94FA1B5B21410088C3F2 /* FLEXArgumentInputNumberView.m in Sources */,
 				3A4C94FA1B5B21410088C3F2 /* FLEXArgumentInputNumberView.m in Sources */,
 				C3474C4123DA496400466532 /* FLEXKeyValueTableViewCell.m in Sources */,
 				C3474C4123DA496400466532 /* FLEXKeyValueTableViewCell.m in Sources */,
 				779B1ED71C0C4D7C001F5E49 /* FLEXTableContentViewController.m in Sources */,
 				779B1ED71C0C4D7C001F5E49 /* FLEXTableContentViewController.m in Sources */,

+ 2 - 2
FLEXTests/FLEXTests.m

@@ -8,8 +8,8 @@
 
 
 #import <XCTest/XCTest.h>
 #import <XCTest/XCTest.h>
 #import <objc/runtime.h>
 #import <objc/runtime.h>
-#import "NSObject+Reflection.h"
-#import "NSArray+Functional.h"
+#import "NSObject+FLEX_Reflection.h"
+#import "NSArray+FLEX.h"
 #import "FLEXPropertyAttributes.h"
 #import "FLEXPropertyAttributes.h"
 #import "FLEXProperty.h"
 #import "FLEXProperty.h"
 #import "FLEXUtility.h"
 #import "FLEXUtility.h"