From 5a77a063c1f47c2cb8f34806176c238d2f5b56f1 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Fri, 16 Apr 2010 12:15:27 +0000
Subject: [PATCH] Remove the unclear FuncStatus::operator|=. Without knowing
 the internals of FuncStatus it is unsafe to use this operator, so let's not
 use it.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34161 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/BufferView.cpp            | 6 ++----
 src/FuncStatus.cpp            | 8 --------
 src/FuncStatus.h              | 2 --
 src/frontends/qt4/GuiView.cpp | 2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index d237e6d416..440c8a5ff5 100644
--- 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 36af548180..576376a4ee 100644
--- 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 1433f5c665..4a632dc870 100644
--- 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 921f5595fe..c729936105 100644
--- 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;
-- 
2.39.2