Namespace some category filenames

ymsying · Apr 6, 2020 · fbeb1be · fbeb1be
1 parent 059bde9
commit fbeb1be
Show file tree

Hide file tree

Showing 33 changed files with 65 additions and 65 deletions.
diff --git a/Classes/Core/Controllers/FLEXFilteringTableViewController.m b/Classes/Core/Controllers/FLEXFilteringTableViewController.m
@@ -8,7 +8,7 @@
 
 #import "FLEXFilteringTableViewController.h"
 #import "FLEXTableViewSection.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 @interface FLEXFilteringTableViewController ()
 

diff --git a/Classes/Core/FLEXTableViewSection.h b/Classes/Core/FLEXTableViewSection.h
@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import "FLEXMacros.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 @class FLEXTableView;
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/Classes/FLEX-Categories.h b/Classes/FLEX-Categories.h
@@ -17,11 +17,11 @@
 #import <FLEX/UIMenu+FLEX.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/NSString+ObjcRuntime.h>
 #import <FLEX/NSString+FLEX.h>
 #import <FLEX/NSUserDefaults+FLEX.h>
 #import <FLEX/NSMapTable+FLEX_Subscripting.h>
-#import <FLEX/NSTimer+Blocks.h>
+#import <FLEX/NSTimer+FLEX.h>
diff --git a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.m b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.m
@@ -8,7 +8,7 @@
 
 #import "FLEXDBQueryRowCell.h"
 #import "FLEXMultiColumnTableView.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIFont+FLEX.h"
 #import "FLEXColor.h"
 

diff --git a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.m b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.m
@@ -7,7 +7,7 @@
 //
 
 #import "FLEXRealmDatabaseManager.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXSQLResult.h"
 
 #if __has_include(<Realm/Realm.h>)

diff --git a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.m b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.m
@@ -7,7 +7,7 @@
 //
 
 #import "FLEXSQLResult.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 @implementation FLEXSQLResult
 @synthesize keyedRows = _keyedRows;

diff --git a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m
@@ -8,7 +8,7 @@
 
 #import "FLEXSQLiteDatabaseManager.h"
 #import "FLEXManager.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXRuntimeConstants.h"
 #import <sqlite3.h>
 

diff --git a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m
@@ -12,7 +12,7 @@
 #import "FLEXRealmDatabaseManager.h"
 #import "FLEXTableContentViewController.h"
 #import "FLEXMutableListSection.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXAlert.h"
 
 @interface FLEXTableListViewController ()

diff --git a/Classes/GlobalStateExplorers/FLEXObjectListViewController.m b/Classes/GlobalStateExplorers/FLEXObjectListViewController.m
@@ -15,7 +15,7 @@
 #import "FLEXHeapEnumerator.h"
 #import "FLEXObjectRef.h"
 #import "NSString+FLEX.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXTableViewCell.h"
 #import <malloc/malloc.h>
 

diff --git a/Classes/GlobalStateExplorers/FLEXObjectRef.m b/Classes/GlobalStateExplorers/FLEXObjectRef.m
@@ -8,7 +8,7 @@
 
 #import "FLEXObjectRef.h"
 #import "FLEXRuntimeUtility.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 @interface FLEXObjectRef ()
 @property (nonatomic, readonly) BOOL wantsSummary;

diff --git a/Classes/GlobalStateExplorers/Globals/FLEXGlobalsSection.m b/Classes/GlobalStateExplorers/Globals/FLEXGlobalsSection.m
@@ -7,7 +7,7 @@
 //
 
 #import "FLEXGlobalsSection.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIFont+FLEX.h"
 
 @interface FLEXGlobalsSection ()

diff --git a/Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeClient.m b/Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeClient.m
@@ -7,9 +7,9 @@
 //
 
 #import "FLEXRuntimeClient.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXMethod.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXRuntimeSafety.h"
 #include <dlfcn.h>
 

diff --git a/Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeExporter.m b/Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeExporter.m
@@ -8,10 +8,10 @@
 
 #import "FLEXRuntimeExporter.h"
 #import "FLEXSQLiteDatabaseManager.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXRuntimeController.h"
 #import "FLEXRuntimeClient.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXTypeEncodingParser.h"
 #import <sqlite3.h>
 

diff --git a/Classes/GlobalStateExplorers/RuntimeBrowser/FLEXKeyPathSearchController.m b/Classes/GlobalStateExplorers/RuntimeBrowser/FLEXKeyPathSearchController.m
@@ -10,9 +10,9 @@
 #import "FLEXRuntimeKeyPathTokenizer.h"
 #import "FLEXRuntimeController.h"
 #import "NSString+FLEX.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UITextField+Range.h"
-#import "NSTimer+Blocks.h"
+#import "NSTimer+FLEX.h"
 #import "FLEXTableView.h"
 #import "FLEXUtility.h"
 #import "FLEXObjectExplorerFactory.h"

diff --git a/Classes/Network/PonyDebugger/FLEXNetworkObserver.m b/Classes/Network/PonyDebugger/FLEXNetworkObserver.m
@@ -15,7 +15,7 @@
 #import "FLEXNetworkObserver.h"
 #import "FLEXNetworkRecorder.h"
 #import "FLEXUtility.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXMethod.h"
 
 #import <objc/runtime.h>

diff --git a/Classes/ObjectExplorers/FLEXObjectExplorer.m b/Classes/ObjectExplorers/FLEXObjectExplorer.m
@@ -9,11 +9,10 @@
 #import "FLEXObjectExplorer.h"
 #import "FLEXUtility.h"
 #import "FLEXRuntimeUtility.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXRuntime+Compare.h"
 #import "FLEXRuntime+UIKitHelpers.h"
 #import "FLEXPropertyAttributes.h"
-#import "NSObject+Reflection.h"
 #import "FLEXMetadataSection.h"
 #import "NSUserDefaults+FLEX.h"
 

diff --git a/Classes/ObjectExplorers/Sections/FLEXMetadataSection.m b/Classes/ObjectExplorers/Sections/FLEXMetadataSection.m
@@ -13,7 +13,7 @@
 #import "FLEXFieldEditorViewController.h"
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXIvar.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXRuntime+UIKitHelpers.h"
 
 @interface FLEXMetadataSection ()

diff --git a/Classes/ObjectExplorers/Sections/Shortcuts/FLEXClassShortcuts.m b/Classes/ObjectExplorers/Sections/Shortcuts/FLEXClassShortcuts.m
@@ -10,7 +10,7 @@
 #import "FLEXShortcut.h"
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXObjectListViewController.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 
 @interface FLEXClassShortcuts ()
 @property (nonatomic, readonly) Class cls;

diff --git a/Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsFactory+Defaults.m b/Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsFactory+Defaults.m
@@ -9,7 +9,7 @@
 #import "FLEXShortcutsFactory+Defaults.h"
 #import "FLEXShortcut.h"
 #import "FLEXRuntimeUtility.h"
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 
 #pragma mark - Views
 

diff --git a/Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m b/Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m
@@ -15,7 +15,7 @@
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXTableView.h"
 #import "FLEXUtility.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "NSString+FLEX.h"
 
 #define FLEXObjectExplorerDefaultsImpl \

diff --git a/...s/Utility/Categories/NSArray+Functional.h → Classes/Utility/Categories/NSArray+FLEX.h b/...s/Utility/Categories/NSArray+Functional.h → Classes/Utility/Categories/NSArray+FLEX.h
@@ -1,5 +1,5 @@
 //
-//  NSArray+Functional.h
+//  NSArray+FLEX.h
 //  FLEX
 //
 //  Created by Tanner Bennett on 9/25/19.

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

diff --git a/.../Utility/Categories/NSObject+Reflection.h → ...ity/Categories/NSObject+FLEX_Reflection.h b/.../Utility/Categories/NSObject+Reflection.h → ...ity/Categories/NSObject+FLEX_Reflection.h
@@ -1,5 +1,5 @@
 //
-//  NSObject+Reflection.h
+//  NSObject+FLEX_Reflection.h
 //  FLEX
 //
 //  Derived from MirrorKit.

diff --git a/.../Utility/Categories/NSObject+Reflection.m → ...ity/Categories/NSObject+FLEX_Reflection.m b/.../Utility/Categories/NSObject+Reflection.m → ...ity/Categories/NSObject+FLEX_Reflection.m
@@ -1,21 +1,21 @@
 //
-//  NSObject+Reflection.m
+//  NSObject+FLEX_Reflection.m
 //  FLEX
 //
 //  Derived from MirrorKit.
 //  Created by Tanner on 6/30/15.
 //  Copyright (c) 2015 Tanner Bennett. All rights reserved.
 //
 
-#import "NSObject+Reflection.h"
+#import "NSObject+FLEX_Reflection.h"
 #import "FLEXClassBuilder.h"
 #import "FLEXMirror.h"
 #import "FLEXProperty.h"
 #import "FLEXMethod.h"
 #import "FLEXIvar.h"
 #import "FLEXProtocol.h"
 #import "FLEXPropertyAttributes.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXUtility.h"
 
 

diff --git a/Classes/Utility/Categories/NSTimer+Blocks.h → Classes/Utility/Categories/NSTimer+FLEX.h b/Classes/Utility/Categories/NSTimer+Blocks.h → Classes/Utility/Categories/NSTimer+FLEX.h
@@ -8,6 +8,7 @@
 #import <Foundation/Foundation.h>
 
 typedef void (^VoidBlock)(void);
+
 @interface NSTimer (Blocks)
 
 + (instancetype)fireSecondsFromNow:(NSTimeInterval)delay block:(VoidBlock)block;

diff --git a/Classes/Utility/Categories/NSTimer+Blocks.m → Classes/Utility/Categories/NSTimer+FLEX.m b/Classes/Utility/Categories/NSTimer+Blocks.m → Classes/Utility/Categories/NSTimer+FLEX.m
@@ -5,7 +5,7 @@
 //  Created by Tanner on 3/23/17.
 //
 
-#import "NSTimer+Blocks.h"
+#import "NSTimer+FLEX.h"
 
 @interface Block : NSObject
 - (void)invoke;

diff --git a/Classes/Utility/FLEXUtility.h b/Classes/Utility/FLEXUtility.h
@@ -13,7 +13,7 @@
 #import <objc/runtime.h>
 #import "FLEXTypeEncodingParser.h"
 #import "FLEXAlert.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIFont+FLEX.h"
 #import "NSMapTable+FLEX_Subscripting.h"
 #import "FLEXMacros.h"

diff --git a/Classes/Utility/Runtime/Objc/Reflection/FLEXProtocol.m b/Classes/Utility/Runtime/Objc/Reflection/FLEXProtocol.m
@@ -10,7 +10,7 @@
 #import "FLEXProtocol.h"
 #import "FLEXProperty.h"
 #import "FLEXRuntimeUtility.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #include <dlfcn.h>
 
 @implementation FLEXProtocol

diff --git a/Classes/ViewHierarchy/SnapshotExplorer/FHSView.m b/Classes/ViewHierarchy/SnapshotExplorer/FHSView.m
@@ -7,7 +7,7 @@
 
 #import "FHSView.h"
 #import "FLEXUtility.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 @interface FHSView (Snapshotting)
 + (UIImage *)_snapshotView:(UIView *)view;

diff --git a/Classes/ViewHierarchy/SnapshotExplorer/FHSViewController.m b/Classes/ViewHierarchy/SnapshotExplorer/FHSViewController.m
@@ -13,7 +13,7 @@
 #import "FLEXAlert.h"
 #import "FLEXWindow.h"
 #import "FLEXResources.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIBarButtonItem+FLEX.h"
 
 BOOL const kFHSViewControllerExcludeFLEXWindows = YES;

diff --git a/Classes/ViewHierarchy/SnapshotExplorer/FHSViewSnapshot.m b/Classes/ViewHierarchy/SnapshotExplorer/FHSViewSnapshot.m
@@ -7,7 +7,7 @@
 //
 
 #import "FHSViewSnapshot.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 
 @implementation FHSViewSnapshot