Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-24 13:41:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

get rid of make_pair

Browse Source 
pair is the same with C++17

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2022-04-11 22:46:43 -07:00 committed by Jonathan White
parent b1d96cd1ee
commit e1fbed0e25
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/tag/TagsEdit.cpp
View File

@ -238,11 +238,11 @@ struct TagsEdit::Impl
auto const e = std::end(tags); auto const e = std::end(tags);
if (cursorVisible()) { if (cursorVisible()) {
auto const m = b + static_cast<std::ptrdiff_t>(editing_index); auto const m = b + static_cast<std::ptrdiff_t>(editing_index);
calcRects(lt, row, r, fm, std::make_pair(b, m)); calcRects(lt, row, r, fm, std::pair(b, m));
calcEditorRect(lt, row, r, fm, m); calcEditorRect(lt, row, r, fm, m);
calcRects(lt, row, r, fm, std::make_pair(m + 1, e)); calcRects(lt, row, r, fm, std::pair(m + 1, e));
} else { } else {
calcRects(lt, row, r, fm, std::make_pair(b, e)); calcRects(lt, row, r, fm, std::pair(b, e));
} }
r.setBottom(lt.y() + fm.height() + fm.leading() + tag_inner.top() + tag_inner.bottom() - 1); r.setBottom(lt.y() + fm.height() + fm.leading() + tag_inner.top() + tag_inner.bottom() - 1);
@ -667,8 +667,7 @@ void TagsEdit::paintEvent(QPaintEvent*)
// tags // tags
impl->drawTags( impl->drawTags(
p, p, std::pair(impl->tags.cbegin(), std::next(impl->tags.cbegin(), std::ptrdiff_t(impl->editing_index))));
std::make_pair(impl->tags.cbegin(), std::next(impl->tags.cbegin(), std::ptrdiff_t(impl->editing_index))));
// draw not terminated tag // draw not terminated tag
auto const formatting = impl->formatting(); auto const formatting = impl->formatting();
@ -683,12 +682,10 @@ void TagsEdit::paintEvent(QPaintEvent*)
// tags // tags
impl->drawTags( impl->drawTags(
p, p, std::pair(std::next(impl->tags.cbegin(), std::ptrdiff_t(impl->editing_index + 1)), impl->tags.cend()));
std::make_pair(std::next(impl->tags.cbegin(), std::ptrdiff_t(impl->editing_index + 1)), impl->tags.cend()));
} else { } else {
impl->drawTags(p, impl->drawTags(
std::make_pair(EmptySkipIterator(impl->tags.begin(), impl->tags.end()), p, std::pair(EmptySkipIterator(impl->tags.begin(), impl->tags.end()), EmptySkipIterator(impl->tags.end())));
EmptySkipIterator(impl->tags.end())));
} }
} }