anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

producesOutput() should not be redeclared as producesOutput(bool).

Browse Source
This commit is contained in:
Richard Heck 2016-08-28 00:02:43 -04:00
parent 76d0c6759f
commit 5018e1077b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/insets/InsetBranch.cpp
View File

@ -77,8 +77,9 @@ docstring InsetBranch::toolTip(BufferView const & bv, int, int) const
docstring const masteron = producesOutput() ?
_("on") : _("off");
docstring const childon = producesOutput(true) ?
_("on") : _("off");
docstring const childon =
(isBranchSelected(true) != params_.inverted) ?
_("on") : _("off");
docstring const onoff = (masteron == childon) ?
masteron :
support::bformat(_("master %1$s, child %2$s"),
@ -105,7 +106,7 @@ docstring const InsetBranch::buttonLabel(BufferView const &) const
bool const inchild = buffer().params().branchlist().find(params_.branch);
bool const master_selected = producesOutput();
bool const child_selected = producesOutput(true);
bool const child_selected = isBranchSelected(true) != params_.inverted;
docstring symb = docstring(1, master_selected ? tick : cross);
if (inchild && master_selected != child_selected)
@ -284,9 +285,9 @@ bool InsetBranch::isBranchSelected(bool const child) const
}
bool InsetBranch::producesOutput(bool const child) const
bool InsetBranch::producesOutput() const
{
return isBranchSelected(child) != params_.inverted;
return isBranchSelected() != params_.inverted;
}

2
src/insets/InsetBranch.h
View File

@ -103,7 +103,7 @@ private:
* Note that Branch insets are considered part of the
* document when they are selected XOR inverted.
*/
bool producesOutput(bool const child = false) const;
bool producesOutput() const;
///
bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
///