[email protected] wrote:
> Author: vfr
> Date: Fri Apr 16 14:15:27 2010
> New Revision: 34161
> URL: http://www.lyx.org/trac/changeset/34161
>
> Log:
> Remove the unclear FuncStatus::operator|=. Without knowing the internals of
> FuncStatus it is unsafe to use this operator, so let's not use it.
...
> -void FuncStatus::operator|=(FuncStatus const & f)
> -{
> - v_ |= f.v_;
> - if (!f.message_.empty())
> - message_ = f.message_;
> -}
> -
> -
> void FuncStatus::setUnknown(bool b)
> {
> if (b)
>
> Modified: lyx-devel/trunk/src/FuncStatus.h
> ==============================================================================
> --- lyx-devel/trunk/src/FuncStatus.h Fri Apr 16 12:51:20 2010 (r34160)
> +++ lyx-devel/trunk/src/FuncStatus.h Fri Apr 16 14:15:27 2010 (r34161)
> @@ -52,8 +52,6 @@
> ///
> void clear();
> ///
> - void operator|=(FuncStatus const & f);
> - ///
> void setUnknown(bool b);
> ///
> bool unknown() const;
>
> Modified: lyx-devel/trunk/src/frontends/qt4/GuiView.cpp
> ==============================================================================
> --- lyx-devel/trunk/src/frontends/qt4/GuiView.cpp Fri Apr 16 12:51:20
> 2010 (r34160)
> +++ lyx-devel/trunk/src/frontends/qt4/GuiView.cpp Fri Apr 16 14:15:27
> 2010 (r34161)
> @@ -1401,7 +1401,7 @@
> GuiToc * toc = static_cast<GuiToc*>(findOrBuild("toc", false));
> FuncStatus fs;
> if (toc->getStatus(documentBufferView()->cursor(), cmd, fs))
> - flag |= fs;
> + flag = fs;
> else
> flag.setEnabled(false);
> return true;
but this code is not equivalent. you will destroy messages prepared somewhere
else, no?
pavel
