Remove the unclear FuncStatus::operator|=. Without knowing the internals of FuncStatu...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34161 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index d237e6d416fd780afbdc469ad26f1e78a0ae8352..440c8a5ff5f60e01990fd1df1f914ed2fa1b056f 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1121,15 +1121,13 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                Inset * inset = editedInset(name);
                if (inset) {
                        FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
-                       FuncStatus fs;
-                       if (!inset->getStatus(cur, fr, fs)) {
+                       if (!inset->getStatus(cur, fr, flag)) {
                                // Every inset is supposed to handle this
                                LASSERT(false, break);
                        }
-                       flag |= fs;
                } else {
                        FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
-                       flag |= lyx::getStatus(fr);
+                       flag = lyx::getStatus(fr);
                }
                break;
        }

diff --git a/src/FuncStatus.cpp b/src/FuncStatus.cpp
index 36af548180037666aac100d03f94348ca4bc3f88..576376a4eec20ad5d4196d4410c188ece136541f 100644 (file)
--- a/src/FuncStatus.cpp
+++ b/src/FuncStatus.cpp
@@ -28,14 +28,6 @@ void FuncStatus::clear()
 }
 
 
-void FuncStatus::operator|=(FuncStatus const & f)
-{
-       v_ |= f.v_;
-       if (!f.message_.empty())
-               message_ = f.message_;
-}
-
-
 void FuncStatus::setUnknown(bool b)
 {
        if (b)

diff --git a/src/FuncStatus.h b/src/FuncStatus.h
index 1433f5c665b59c471c68a9a5739a002033c5a846..4a632dc870fa2345717a5deeac67d5807a4d77c1 100644 (file)
--- a/src/FuncStatus.h
+++ b/src/FuncStatus.h
@@ -52,8 +52,6 @@ public:
        ///
        void clear();
        ///
-       void operator|=(FuncStatus const & f);
-       ///
        void setUnknown(bool b);
        ///
        bool unknown() const;

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 921f5595febdc7a85bbf91ec7daf79d703bfb1cf..c729936105493cefbb14cc86d7999d8ae7c78a44 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1401,7 +1401,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                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;