hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 23:34:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

fix: code smells

Browse source
This commit is contained in:
YiFang Xiao 2023-09-02 11:45:47 +08:00
parent 74a21e7e26
commit 1285cbf68f
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ui/articleview.cc
View file

@ -584,11 +584,6 @@ void ArticleView::isFramedArticle( QString const & ca, const std::function< void
} );
}
bool ArticleView::isExternalLink( QUrl const & url )
{
return Utils::isExternalLink( url );
}
void ArticleView::tryMangleWebsiteClickedUrl( QUrl & url, Contexts & contexts )
{
// Don't try mangling audio urls, even if they are from the framed websites
@ -796,7 +791,7 @@ QString ArticleView::getMutedForGroup( unsigned group )
else
mutedDictionaries = grp ? ( popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries ) : nullptr;
if ( !mutedDictionaries )
return QString();
return {};
QStringList mutedDicts;
@ -813,7 +808,7 @@ QString ArticleView::getMutedForGroup( unsigned group )
return mutedDicts.join( "," );
}
return QString();
return {};
}
QStringList ArticleView::getMutedDictionaries( unsigned group )
@ -830,7 +825,7 @@ QStringList ArticleView::getMutedDictionaries( unsigned group )
else
mutedDictionaries = grp ? ( popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries ) : nullptr;
if ( !mutedDictionaries )
return QStringList();
return {};
QStringList mutedDicts;
@ -846,7 +841,7 @@ QStringList ArticleView::getMutedDictionaries( unsigned group )
return mutedDicts;
}
return QStringList();
return {};
}
void ArticleView::linkHovered( const QString & link )
@ -1062,7 +1057,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
std::vector< sptr< Dictionary::Class > > const * activeDicts = nullptr;
if ( groups.size() ) {
if ( !groups.empty() ) {
for ( const auto & group : groups )
if ( group.id == currentGroup ) {
activeDicts = &( group.dictionaries );
@ -1211,7 +1206,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
}
}
}
else if ( isExternalLink( url ) ) {
else if ( Utils::isExternalLink( url ) ) {
// Use the system handler for the conventional external links
QDesktopServices::openUrl( url );
}
@ -1526,7 +1521,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
tryMangleWebsiteClickedUrl( targetUrl, contexts );
if ( !targetUrl.isEmpty() ) {
if ( !isExternalLink( targetUrl ) ) {
if ( !Utils::isExternalLink( targetUrl ) ) {
followLink = new QAction( tr( "Op&en Link" ), &menu );
menu.addAction( followLink );
@ -1536,7 +1531,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
}
}
if ( isExternalLink( targetUrl ) ) {
if ( Utils::isExternalLink( targetUrl ) ) {
followLinkExternal = new QAction( tr( "Open Link in &External Browser" ), &menu );
menu.addAction( followLinkExternal );
menu.addAction( webview->pageAction( QWebEnginePage::CopyLinkToClipboard ) );

4
src/ui/articleview.hh
View file

@ -401,10 +401,6 @@ private:
/// frame.
void isFramedArticle( QString const & article, const std::function< void( bool framed ) > & callback );
/// Checks if the given link is to be opened externally, as opposed to opening
/// it in-place.
bool isExternalLink( QUrl const & url );
/// Sees if the last clicked link is from a website frame. If so, changes url
/// to point to url text translation instead, and saves the original
/// url to the appropriate "contexts" entry.