Skip to content

Commit 7c7e831

Browse files
authored
Translate a few simple Core Data model types into Swift (#24983)
* Translate MenuLocation to Swift * Translate PostCategory to Swift * Translate PostTag to Swift * Translate PostType to Swift * Translate SourcePostAttribution to Swift * Translate ReaderGapMarker to Swift * Remove unused constants * Rename PostCateogyr.uncategorizedId to uncategorized
1 parent ac93eab commit 7c7e831

39 files changed

+137
-262
lines changed

Sources/WordPressData/Objective-C/Menu.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#import "Menu.h"
22
#import "MenuItem.h"
3-
#import "MenuLocation.h"
43
#import "Blog.h"
54

65
NSInteger const MenuDefaultID = -1;

Sources/WordPressData/Objective-C/MenuItem.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "MenuItem.h"
22
#import "Menu.h"
3-
#import "PostType.h"
43
#import "Blog.h"
4+
#import "WordPressData-Swift.h"
55

66
NSString * const MenuItemTypePage = @"page";
77
NSString * const MenuItemTypeCustom = @"custom";

Sources/WordPressData/Objective-C/MenuLocation.m

Lines changed: 0 additions & 17 deletions
This file was deleted.

Sources/WordPressData/Objective-C/PostCategory.m

Lines changed: 0 additions & 20 deletions
This file was deleted.

Sources/WordPressData/Objective-C/PostService.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#import "Blog.h"
22
#import "PostService.h"
33
#import "PostServiceOptions.h"
4-
#import "PostCategory.h"
54
#import "Media.h"
65
#import "WordPressData-Swift.h"
76
#import "PostHelper.h"

Sources/WordPressData/Objective-C/PostTag.m

Lines changed: 0 additions & 17 deletions
This file was deleted.

Sources/WordPressData/Objective-C/PostType.m

Lines changed: 0 additions & 10 deletions
This file was deleted.

Sources/WordPressData/Objective-C/ReaderGapMarker.m

Lines changed: 0 additions & 5 deletions
This file was deleted.

Sources/WordPressData/Objective-C/ReaderPost.m

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#import "ReaderPost.h"
2-
#import "SourcePostAttribution.h"
32
#import "WPAccount.h"
43
#import "WordPressData-Swift.h"
54

@@ -223,13 +222,13 @@ + (SourcePostAttribution *)createOrReplaceFromRemoteDiscoverAttribution:(RemoteS
223222
+ (NSString *)attributionTypeFromTaxonomies:(NSArray *)taxonomies
224223
{
225224
if ([taxonomies containsObject:SourceAttributionSiteTaxonomy]) {
226-
return SourcePostAttributionTypeSite;
225+
return SourcePostAttribution.site;
227226
}
228227

229228
if ([taxonomies containsObject:SourceAttributionImageTaxonomy] ||
230229
[taxonomies containsObject:SourceAttributionQuoteTaxonomy] ||
231230
[taxonomies containsObject:SourceAttributionStandardTaxonomy] ) {
232-
return SourcePostAttributionTypePost;
231+
return SourcePostAttribution.post;
233232
}
234233

235234
return nil;
@@ -358,9 +357,9 @@ - (NSString *)likeCountForDisplay
358357

359358
- (SourceAttributionStyle)sourceAttributionStyle
360359
{
361-
if ([self.sourceAttribution.attributionType isEqualToString:SourcePostAttributionTypePost]) {
360+
if ([self.sourceAttribution.attributionType isEqualToString:SourcePostAttribution.post]) {
362361
return SourceAttributionStylePost;
363-
} else if ([self.sourceAttribution.attributionType isEqualToString:SourcePostAttributionTypeSite]) {
362+
} else if ([self.sourceAttribution.attributionType isEqualToString:SourcePostAttribution.site]) {
364363
return SourceAttributionStyleSite;
365364
} else {
366365
return SourceAttributionStyleNone;

Sources/WordPressData/Objective-C/SourcePostAttribution.m

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)