anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/lyxfind.cpp: use make_pair

Browse Source 
Use make_pair(...) instead of pair<T, U>(...).
This commit is contained in:
Lars Gullik Bjønnes 2012-10-23 23:00:13 +02:00
parent cf193344d0
commit 48bba7fb74
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lyxfind.cpp
View File

@ -240,12 +240,12 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
// no selection, non-empty search string: find it
if (!searchstr.empty()) {
findOne(bv, searchstr, case_sens, whole, forward);
return pair<bool, int>(true, 0);
return make_pair(true, 0);
}
// empty search string
if (!cur.inTexted())
// bail in math
return pair<bool, int>(false, 0);
return make_pair(false, 0);
// select current word and treat it as the search string
cur.innerText()->selectWord(cur, WHOLE_WORD);
searchstr = cur.selectionAsString(false);
@ -254,7 +254,7 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
// if we still don't have a search string, report the error
// and abort.
if (!searchAllowed(searchstr))
return pair<bool, int>(false, 0);
return make_pair(false, 0);
bool have_selection = cur.selection();
docstring const selected = cur.selectionAsString(false);
@ -267,13 +267,13 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
// just find the search word
if (!have_selection || !match) {
findOne(bv, searchstr, case_sens, whole, forward);
return pair<bool, int>(true, 0);
return make_pair(true, 0);
}
// we're now actually ready to replace. if the buffer is
// read-only, we can't, though.
if (bv->buffer().isReadonly())
return pair<bool, int>(false, 0);
return make_pair(false, 0);
cap::replaceSelectionWithString(cur, replacestr);
if (forward) {
@ -283,7 +283,7 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
if (findnext)
findOne(bv, searchstr, case_sens, whole, forward, false);
return pair<bool, int>(true, 1);
return make_pair(true, 1);
}
} // namespace anon