Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused code #1765

Merged
merged 1 commit into from
Jul 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Vienna/Sources/Application/AppController.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
-(IBAction)restoreMessage:(id)sender;
-(IBAction)skipFolder:(id)sender;
-(IBAction)showDownloadsWindow:(id)sender;
-(IBAction)conditionalShowDownloadsWindow:(id)sender;
-(IBAction)openWebLocation:(id)sender;
-(IBAction)getInfo:(id)sender;
-(IBAction)unsubscribeFeed:(id)sender;
Expand Down
13 changes: 0 additions & 13 deletions Vienna/Sources/Application/AppController.m
Original file line number Diff line number Diff line change
Expand Up @@ -2228,19 +2228,6 @@ -(IBAction)showDownloadsWindow:(id)sender
[downloadWindow.window makeKeyAndOrderFront:sender];
}

/* conditionalShowDownloadsWindow
* Make the Downloads window visible only if it hasn't been shown.
*/
-(IBAction)conditionalShowDownloadsWindow:(id)sender
{
if (downloadWindow == nil) {
downloadWindow = [[DownloadWindow alloc] init];
}
if (!downloadWindow.window.visible) {
[downloadWindow.window makeKeyAndOrderFront:sender];
}
}

/* viewFirstUnread
* Moves the selection to the first unread article.
*/
Expand Down
1 change: 0 additions & 1 deletion Vienna/Sources/Main window/ArticleListView.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@
-(void)updateVisibleColumns;
-(void)saveTableSettings;
-(void)loadArticleLink:(NSString *) articleLink;
@property (readonly, nonatomic) NSURL *url;

@end
37 changes: 0 additions & 37 deletions Vienna/Sources/Main window/ArticleListView.m
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ @implementation ArticleListView {
NSMutableDictionary *unreadTopLineDict;
NSMutableDictionary *unreadTopLineSelectionDict;

NSURL *currentURL;
BOOL isLoadingHTMLArticle;
}

Expand All @@ -109,7 +108,6 @@ -(instancetype)initWithFrame:(NSRect)frame
markReadTimer = nil;
_currentPageFullHTML = NO;
isLoadingHTMLArticle = NO;
currentURL = nil;
self.imbricatedSplitViewResizes = NO;
_layoutManager = [NSLayoutManager new];
}
Expand Down Expand Up @@ -1044,17 +1042,6 @@ - (void)handleArticleViewEnded:(NSNotification *)nc
}
}

/* clearCurrentURL
* Clears the current URL.
*/
-(void)clearCurrentURL
{
// If we already have an URL release it.
if (currentURL) {
currentURL = nil;
}
}

/* loadArticleLink
* Loads the specified link into the article text view. NOTE: This is done
* via this selector method so that this is called via the event queue in
Expand All @@ -1070,29 +1057,11 @@ -(void)loadArticleLink:(NSString *) articleLink
// Load the actual link.
articleText.tabUrl = cleanedUpUrlFromString(articleLink);
[articleText loadTab];

// Clear the current URL.
[self clearCurrentURL];

// Remember the new URL.
currentURL = [[NSURL alloc] initWithString:articleLink];

// We need to redraw the article list so the progress indicator is shown.
articleList.needsDisplay = YES;
}

/* url
* Return the URL of current article.
*/
-(NSURL *)url
{
if (self.isCurrentPageFullHTML) {
return currentURL;
} else {
return nil;
}
}

/* refreshArticlePane
* Updates the article pane for the current selected articles.
*/
Expand All @@ -1101,9 +1070,6 @@ -(void)refreshArticlePane
NSArray * msgArray = self.markedArticleRange;

if (msgArray.count == 0) {
// Clear the current URL.
[self clearCurrentURL];

// We are not a FULL HTML page.
self.currentPageFullHTML = NO;

Expand All @@ -1129,9 +1095,6 @@ -(void)refreshArticlePane
// clearing of the HTML before this new link gets loaded.
[self performSelector: @selector(loadArticleLink:) withObject:firstArticle.link afterDelay:0.0];
} else {
// Clear the current URL.
[self clearCurrentURL];

// Remember we do NOT have a full HTML page so we can setup the context menus
// appropriately.
self.currentPageFullHTML = NO;
Expand Down