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.

Sign up for GitHub

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

Jump to bottom

Use std::string_view for NodeTreeBase::create_node_img() part2 #922

Merged
merged 1 commit into from Feb 20, 2022
Merged

Use std::string_view for NodeTreeBase::create_node_img() part2 #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/dbtree/nodetreebase.cpp
View file
Open in desktop
Expand Up @@ -937,10 +937,10 @@ NODE* NodeTreeBase::create_node_sssp( std::string_view link )
//
// 画像ノード作成
//
NODE* NodeTreeBase::create_node_img( std::string_view text, const char* link, const int n_link, const int color_text,
NODE* NodeTreeBase::create_node_img( std::string_view text, std::string_view link, const int color_text,
const bool bold, const char fontid )
{
NODE* tmpnode = create_node_link( text, link, n_link, color_text, bold, fontid );
NODE* tmpnode = create_node_link( text, link.data(), link.size(), color_text, bold, fontid );
if( tmpnode ){
tmpnode->linkinfo->image = true;
tmpnode->linkinfo->imglink = tmpnode->linkinfo->link;
Expand Down Expand Up @@ -2379,7 +2379,7 @@ void NodeTreeBase::parse_html( const char* str, const int lng, const int color_t

// 画像リンク
else if( DBIMG::get_type_ext( tmpreplace ) != DBIMG::T_UNKNOWN ){
node = create_node_img( tmp_view, tmpreplace.c_str(), tmpreplace.size(), COLOR_IMG_NOCACHE, bold );
node = create_node_img( tmp_view, tmpreplace, COLOR_IMG_NOCACHE, bold );
if ( fontid != FONT_MAIN ) node->fontid = fontid;
}

Expand Down
2 changes: 1 addition & 1 deletion src/dbtree/nodetreebase.h
View file
Open in desktop
Expand Up @@ -310,7 +310,7 @@ namespace DBTREE
const int color_text, const bool bold,
const ANCINFO* ancinfo, const int lng_ancinfo, const char fontid = FONT_MAIN );
NODE* create_node_sssp( std::string_view link );
NODE* create_node_img( std::string_view text, const char* link, const int n_link, const int color_text,
NODE* create_node_img( std::string_view text, std::string_view link, const int color_text,
const bool bold, const char fontid = FONT_MAIN );
NODE* create_node_text( const char* text, const int color_text, const bool bold = false, const char fontid = FONT_MAIN );
NODE* create_node_ntext( const char* text, const int n, const int color_text, const bool bold = false, const char fontid = FONT_MAIN );
Expand Down