FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed project and framework projects to default to using tabs per the coding guidelines. Also corrected previously committed files with spaces used incorrectly.

Browse Source
This commit is contained in:
Maurice Parker 2018-09-07 13:46:00 -05:00
parent 5af831dc4c
commit 808715892f
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Frameworks/Account/Account.xcodeproj/project.pbxproj
View File

@ -214,6 +214,7 @@
D511EEB4202422BB00712EC3 /* xcconfig */, D511EEB4202422BB00712EC3 /* xcconfig */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
usesTabs = 1;
}; };
848934F71F62484F00CEBD24 /* Products */ = { 848934F71F62484F00CEBD24 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;

1
Frameworks/Articles/Articles.xcodeproj/project.pbxproj
View File

@ -104,6 +104,7 @@
D511EEE520242DFB00712EC3 /* xcconfig */, D511EEE520242DFB00712EC3 /* xcconfig */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
usesTabs = 1;
}; };
844BEE5C1F0AB3C8004AB7CD /* Products */ = { 844BEE5C1F0AB3C8004AB7CD /* Products */ = {
isa = PBXGroup; isa = PBXGroup;

5
Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj
View File

@ -193,6 +193,7 @@
D511EEE620242E0800712EC3 /* xcconfig */, D511EEE620242E0800712EC3 /* xcconfig */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
usesTabs = 1;
}; };
844BEE381F0AB3AA004AB7CD /* Products */ = { 844BEE381F0AB3AA004AB7CD /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
@ -353,13 +354,13 @@
TargetAttributes = { TargetAttributes = {
844BEE361F0AB3AA004AB7CD = { 844BEE361F0AB3AA004AB7CD = {
CreatedOnToolsVersion = 8.3.2; CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = 9C84TZ7Q6Z; DevelopmentTeam = SHJK2V3AJG;
LastSwiftMigration = 0830; LastSwiftMigration = 0830;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
}; };
844BEE3F1F0AB3AB004AB7CD = { 844BEE3F1F0AB3AB004AB7CD = {
CreatedOnToolsVersion = 8.3.2; CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = 9C84TZ7Q6Z; DevelopmentTeam = SHJK2V3AJG;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
}; };
}; };

1
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -1140,6 +1140,7 @@
84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */, 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
usesTabs = 1;
}; };
849C64611ED37A5D003D8FC0 /* Products */ = { 849C64611ED37A5D003D8FC0 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;

2
NetNewsWire/FeedFinder/HTMLFeedFinder.swift
View File

@ -34,7 +34,7 @@ class HTMLFeedFinder {
for oneBodyLink in bodyLinks { for oneBodyLink in bodyLinks {
if linkMightBeFeed(oneBodyLink) { if linkMightBeFeed(oneBodyLink) {
let normalizedURL = oneBodyLink.urlString.rs_normalizedURL() let normalizedURL = oneBodyLink.urlString.rs_normalizedURL()
let oneFeedSpecifier = FeedSpecifier(title: oneBodyLink.text, urlString: normalizedURL, source: .HTMLLink) let oneFeedSpecifier = FeedSpecifier(title: oneBodyLink.text, urlString: normalizedURL, source: .HTMLLink)
addFeedSpecifier(oneFeedSpecifier) addFeedSpecifier(oneFeedSpecifier)
} }

20
NetNewsWire/MainWindow/Detail/ArticleRenderer.swift
View File

@ -400,16 +400,16 @@ class ArticleRenderer {
return "" return ""
} }
// If the author's name is the same as the feed, then we don't want to display it. // If the author's name is the same as the feed, then we don't want to display it.
// This code assumes that multiple authors would never match the feed name so that // This code assumes that multiple authors would never match the feed name so that
// if there feed owner has an article co-author all authors are given the byline. // if there feed owner has an article co-author all authors are given the byline.
if authors.count == 1, let author = authors.first { if authors.count == 1, let author = authors.first {
if author.name == article.feed?.nameForDisplay { if author.name == article.feed?.nameForDisplay {
return "" return ""
} }
} }
var byline = "" var byline = ""
var isFirstAuthor = true var isFirstAuthor = true
for author in authors { for author in authors {