Prepare QS to include Swift #3023
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
n8henrie
commented
Jan 26, 2025
n8henrie
commented
- macos-12 runner is deprecated
- Remove complex macros, which break compilation with Swift
- Remove complex macros, which are incompatible with Swift
- Add missing imports
- Add blank swift file
- Use Swift 6.0
- Fix minimum version message and https URL
- Remove outdated version target
- Add bare minimum to run swift from objc
- Swift 6.0 not avail in GHA runners at this point (xcode 15), stick to swift 5 for now
- Remove dummy Swift code
Follow `macos-latest`; if issues come up, can always temporarily pin to the latest working version
https://developer.apple.com/documentation/swift/using-imported-c-macros-in-swift#Use-Functions-and-Generics-Instead-of-Complex-Macros > C macros that are more complex than simple constant definitions have > no counterpart in Swift. You use complex macros in C and Objective-C > to avoid type-checking constraints or to avoid retyping large amounts > of boilerplate code. However, macros can make debugging and refactoring > difficult. In Swift, you can use functions and generics to achieve the > same results without any compromises.
|
Probably should squash when / if these are merged. @pjrobertson looking forward to your review! |
skurfer
approved these changes
Feb 4, 2025
pjrobertson
reviewed
Feb 9, 2025
| NSString *minimumVersionString = @"macOS 10.9+"; | ||
| NSString *oldVersionsString = @"10.3–10.8"; | ||
| NSString *minimumVersionString = @"macOS 10.14+"; | ||
| NSString *oldVersionsString = @"10.14"; |
There was a problem hiding this comment.
Is this change correct? The text will now read "Recent versions of Quicksilver require macOS 10.14+. Older 10.14 compatible versions are availa..."
Maybe just remove it all together and make it "Versions for older macOS are available..."
| id header = nil; | ||
| NSString *key = nil; | ||
| NSEnumerator *kEnum = [[QSReg tableNamed:@"QSRegistryHeaders"] keyEnumerator]; | ||
| while((key = [kEnum nextObject]) && (header = [[QSReg tableNamed:@"QSRegistryHeaders"] objectForKey:key]) ) { |
There was a problem hiding this comment.
You could use this for slightly tidier code:
[[QSReg tableNamed:@"QSRegistryHeaders"] enumerateKeysAndObjectsUsingBlock:^(NSString *key, id header, BOOL * _Nonnull stop) {
if ([[header objectForKey:@"type"] isEqual:@"mediator"]) {
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:header forKey:INFO];
NSMenu *menu = [self menuForTable:key includeDefault:[[header objectForKey:@"allowDefault"] boolValue]];
if (!menu) continue;
if (menu)
[dict setObject:menu forKey:MENU];
[dict setObject:key forKey:IDENT];
[helpers addObject:dict];
}
}];
| id plugin = nil; | ||
| NSString *pluginId = nil; | ||
| NSEnumerator *kEnum = [[[QSPlugInManager sharedInstance] loadedPlugIns] keyEnumerator]; | ||
| while((pluginId = [kEnum nextObject]) && (plugin = [[[QSPlugInManager sharedInstance] loadedPlugIns] objectForKey:pluginId]) ) { |
There was a problem hiding this comment.
Same here about using enumerateKeysAndObjectsUsingBlock
| id handlerClass = nil; | ||
| NSString *key = nil; | ||
| NSEnumerator *kEnum = [[QSReg tableNamed:kQSPlugInInfoHandlers] keyEnumerator]; | ||
| while((key = [kEnum nextObject]) && (handlerClass = [[QSReg tableNamed:kQSPlugInInfoHandlers] objectForKey:key]) ) { |
There was a problem hiding this comment.
Another enumerateKeysAndObjectsUsingBlock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.