From a0fdc0b0cff7c4ebe1cea8ff0c59dbbf53f0f996 Mon Sep 17 00:00:00 2001 From: Pavlo Shkrabliuk Date: Fri, 16 Feb 2024 23:34:00 +0200 Subject: [PATCH] rename HelpPager file to S7HelpPage for consistency --- system7.xcodeproj/project.pbxproj | 16 ++++++++-------- system7/Commands/S7AddCommand.m | 2 +- system7/Commands/S7BootstrapCommand.m | 2 +- system7/Commands/S7CheckoutCommand.m | 2 +- system7/Commands/S7Command.m | 2 +- system7/Commands/S7DeinitCommand.m | 2 +- system7/Commands/S7InitCommand.m | 2 +- system7/Commands/S7RebindCommand.m | 2 +- system7/Commands/S7RemoveCommand.m | 2 +- system7/Commands/S7ResetCommand.m | 2 +- system7/Commands/S7StatusCommand.m | 2 +- system7/Commands/S7VersionCommand.m | 2 +- system7/Utils/{HelpPager.h => S7HelpPager.h} | 2 +- system7/Utils/{HelpPager.m => S7HelpPager.m} | 4 ++-- system7/main.m | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) rename system7/Utils/{HelpPager.h => S7HelpPager.h} (94%) rename system7/Utils/{HelpPager.m => S7HelpPager.m} (94%) diff --git a/system7.xcodeproj/project.pbxproj b/system7.xcodeproj/project.pbxproj index ed292fe..39ef79b 100644 --- a/system7.xcodeproj/project.pbxproj +++ b/system7.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 2465939C24CA336700EFC5A0 /* HelpPager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2465939B24CA336700EFC5A0 /* HelpPager.m */; }; - 24689D5D24D1C914004DDB91 /* HelpPager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2465939B24CA336700EFC5A0 /* HelpPager.m */; }; + 2465939C24CA336700EFC5A0 /* S7HelpPager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2465939B24CA336700EFC5A0 /* S7HelpPager.m */; }; + 24689D5D24D1C914004DDB91 /* S7HelpPager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2465939B24CA336700EFC5A0 /* S7HelpPager.m */; }; 40183E542915558200009EFD /* GitFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 40183E532915558200009EFD /* GitFilter.m */; }; 40183E552915558200009EFD /* GitFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 40183E532915558200009EFD /* GitFilter.m */; }; 6D73D3B1270702D0009AE0B9 /* S7IniConfigOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D73D3B0270702D0009AE0B9 /* S7IniConfigOptions.m */; }; @@ -112,8 +112,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2465939A24CA336700EFC5A0 /* HelpPager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HelpPager.h; sourceTree = ""; }; - 2465939B24CA336700EFC5A0 /* HelpPager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HelpPager.m; sourceTree = ""; }; + 2465939A24CA336700EFC5A0 /* S7HelpPager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = S7HelpPager.h; sourceTree = ""; }; + 2465939B24CA336700EFC5A0 /* S7HelpPager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = S7HelpPager.m; sourceTree = ""; }; 2493CEE029EE88C500B9ECD8 /* Git+Tests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Git+Tests.h"; sourceTree = ""; }; 40183E522915551100009EFD /* GitFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GitFilter.h; sourceTree = ""; }; 40183E532915558200009EFD /* GitFilter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GitFilter.m; sourceTree = ""; }; @@ -374,8 +374,8 @@ BED60E152458811A008EA752 /* S7Utils.m */, BE172CD424657CE900B57557 /* S7Diff.h */, BE172CD124657CA700B57557 /* S7Diff.m */, - 2465939A24CA336700EFC5A0 /* HelpPager.h */, - 2465939B24CA336700EFC5A0 /* HelpPager.m */, + 2465939A24CA336700EFC5A0 /* S7HelpPager.h */, + 2465939B24CA336700EFC5A0 /* S7HelpPager.m */, BEBC62E12AC57662005979E8 /* S7Logging.h */, BEBC62E22AC57662005979E8 /* S7Logging.m */, ); @@ -570,7 +570,7 @@ 6DD4A82D2750DAB00050F3FD /* S7DefaultOptions.m in Sources */, BED36BE6246E809000D6EB1C /* S7PostCommitHook.m in Sources */, 6DD4A8332750E3070050F3FD /* S7Options.m in Sources */, - 2465939C24CA336700EFC5A0 /* HelpPager.m in Sources */, + 2465939C24CA336700EFC5A0 /* S7HelpPager.m in Sources */, BE394D3C2486ADB500ED6E05 /* S7CheckoutCommand.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -627,7 +627,7 @@ 6DD4A8392750E8A40050F3FD /* S7IniConfigOptions.m in Sources */, BE8218892452C1DE00E878A8 /* configParserTests.m in Sources */, BE84F1F82B6A4352002D440A /* S7KeepTargetBranchMergeStrategy.m in Sources */, - 24689D5D24D1C914004DDB91 /* HelpPager.m in Sources */, + 24689D5D24D1C914004DDB91 /* S7HelpPager.m in Sources */, BEBE40CA2576D0B900E39755 /* S7DeinitCommand.m in Sources */, BE3A29F02460712F004A2B31 /* S7InitCommand.m in Sources */, BED60E172458811A008EA752 /* S7Utils.m in Sources */, diff --git a/system7/Commands/S7AddCommand.m b/system7/Commands/S7AddCommand.m index bde134f..34b038c 100644 --- a/system7/Commands/S7AddCommand.m +++ b/system7/Commands/S7AddCommand.m @@ -13,7 +13,7 @@ #import "S7Utils.h" #import "S7InitCommand.h" #import "S7PostCheckoutHook.h" -#import "HelpPager.h" +#import "S7HelpPager.h" NS_ASSUME_NONNULL_BEGIN diff --git a/system7/Commands/S7BootstrapCommand.m b/system7/Commands/S7BootstrapCommand.m index 9403530..59e1907 100644 --- a/system7/Commands/S7BootstrapCommand.m +++ b/system7/Commands/S7BootstrapCommand.m @@ -9,7 +9,7 @@ #import "S7BootstrapCommand.h" #import "S7Utils.h" -#import "HelpPager.h" +#import "S7HelpPager.h" NS_ASSUME_NONNULL_BEGIN diff --git a/system7/Commands/S7CheckoutCommand.m b/system7/Commands/S7CheckoutCommand.m index 04d823b..3e581ab 100644 --- a/system7/Commands/S7CheckoutCommand.m +++ b/system7/Commands/S7CheckoutCommand.m @@ -9,7 +9,7 @@ #import "S7CheckoutCommand.h" #import "S7PostCheckoutHook.h" -#import "HelpPager.h" +#import "S7HelpPager.h" @implementation S7CheckoutCommand diff --git a/system7/Commands/S7Command.m b/system7/Commands/S7Command.m index 60b0d23..610a225 100644 --- a/system7/Commands/S7Command.m +++ b/system7/Commands/S7Command.m @@ -7,7 +7,7 @@ // #import "S7Command.h" -#import "HelpPager.h" +#import "S7HelpPager.h" void printCommandAliases(Class commandClass) { NSArray *aliases = [commandClass aliases]; diff --git a/system7/Commands/S7DeinitCommand.m b/system7/Commands/S7DeinitCommand.m index 669c654..edb8120 100644 --- a/system7/Commands/S7DeinitCommand.m +++ b/system7/Commands/S7DeinitCommand.m @@ -8,7 +8,7 @@ #import "S7DeinitCommand.h" -#import "HelpPager.h" +#import "S7HelpPager.h" // I considered if deinit should remove all actual subrepo directories // and decided not to do that. I don't know what will the user do next: diff --git a/system7/Commands/S7InitCommand.m b/system7/Commands/S7InitCommand.m index 8698cb6..be1444b 100644 --- a/system7/Commands/S7InitCommand.m +++ b/system7/Commands/S7InitCommand.m @@ -9,7 +9,7 @@ #import "S7InitCommand.h" #import "S7Utils.h" -#import "HelpPager.h" +#import "S7HelpPager.h" #import "S7PrePushHook.h" #import "S7PostCheckoutHook.h" diff --git a/system7/Commands/S7RebindCommand.m b/system7/Commands/S7RebindCommand.m index 3bd5d8c..2d59f04 100644 --- a/system7/Commands/S7RebindCommand.m +++ b/system7/Commands/S7RebindCommand.m @@ -9,7 +9,7 @@ #import "S7RebindCommand.h" #import "S7Config.h" #import "Git.h" -#import "HelpPager.h" +#import "S7HelpPager.h" @implementation S7RebindCommand diff --git a/system7/Commands/S7RemoveCommand.m b/system7/Commands/S7RemoveCommand.m index 9da1f11..1fca7f3 100644 --- a/system7/Commands/S7RemoveCommand.m +++ b/system7/Commands/S7RemoveCommand.m @@ -7,7 +7,7 @@ // #import "S7RemoveCommand.h" -#import "HelpPager.h" +#import "S7HelpPager.h" @implementation S7RemoveCommand diff --git a/system7/Commands/S7ResetCommand.m b/system7/Commands/S7ResetCommand.m index 38c6a16..adb90be 100644 --- a/system7/Commands/S7ResetCommand.m +++ b/system7/Commands/S7ResetCommand.m @@ -10,7 +10,7 @@ #import "S7Utils.h" #import "S7PostCheckoutHook.h" -#import "HelpPager.h" +#import "S7HelpPager.h" @implementation S7ResetCommand diff --git a/system7/Commands/S7StatusCommand.m b/system7/Commands/S7StatusCommand.m index 4a5b43a..cad6dd9 100644 --- a/system7/Commands/S7StatusCommand.m +++ b/system7/Commands/S7StatusCommand.m @@ -10,7 +10,7 @@ #import "S7Utils.h" #import "S7Diff.h" -#import "HelpPager.h" +#import "S7HelpPager.h" @implementation S7StatusCommand diff --git a/system7/Commands/S7VersionCommand.m b/system7/Commands/S7VersionCommand.m index 55bdce7..cc0e2e4 100644 --- a/system7/Commands/S7VersionCommand.m +++ b/system7/Commands/S7VersionCommand.m @@ -8,7 +8,7 @@ #import "S7VersionCommand.h" -#import "HelpPager.h" +#import "S7HelpPager.h" #ifndef VERSION_NUMBER static const char VERSION_NUMBER[] = "1.0"; diff --git a/system7/Utils/HelpPager.h b/system7/Utils/S7HelpPager.h similarity index 94% rename from system7/Utils/HelpPager.h rename to system7/Utils/S7HelpPager.h index 76dadb5..ce73d45 100644 --- a/system7/Utils/HelpPager.h +++ b/system7/Utils/S7HelpPager.h @@ -1,5 +1,5 @@ // -// HelpPager.h +// S7HelpPager.h // system7 // // Created by Nik on 24.07.2020. diff --git a/system7/Utils/HelpPager.m b/system7/Utils/S7HelpPager.m similarity index 94% rename from system7/Utils/HelpPager.m rename to system7/Utils/S7HelpPager.m index ac3abf7..3feef7b 100644 --- a/system7/Utils/HelpPager.m +++ b/system7/Utils/S7HelpPager.m @@ -1,12 +1,12 @@ // -// HelpPager.m +// S7HelpPager.m // system7 // // Created by Nik on 24.07.2020. // Copyright © 2020 Readdle. All rights reserved. // -#import "HelpPager.h" +#import "S7HelpPager.h" static FILE *_s7helpFile = NULL; diff --git a/system7/main.m b/system7/main.m index 0bddd76..09e7c99 100644 --- a/system7/main.m +++ b/system7/main.m @@ -29,7 +29,7 @@ #import "S7ConfigMergeDriver.h" -#import "HelpPager.h" +#import "S7HelpPager.h" void printHelp(void) { help_puts("");