X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncStatus.C;h=530b8e893a04c0bd35710b699ca7e88d755890b9;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=9c83203b66e4192a2cc9fd5952ac5890478d3f99;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/FuncStatus.C b/src/FuncStatus.C
index 9c83203b66..530b8e893a 100644
--- a/src/FuncStatus.C
+++ b/src/FuncStatus.C
@@ -12,64 +12,86 @@
 
 #include "FuncStatus.h"
 
-FuncStatus::FuncStatus() : v_(OK)
+
+namespace lyx {
+
+FuncStatus::FuncStatus()
+	: v_(OK)
 {
 }
 
 
-FuncStatus & FuncStatus::clear ()
+void FuncStatus::clear()
 {
 	v_ = OK;
-	return *this;
+	message_.erase();
 }
 
-void FuncStatus::operator |= (FuncStatus const & f)
+
+void FuncStatus::operator|=(FuncStatus const & f)
 {
 	v_ |= f.v_;
+	if (!f.message_.empty())
+		message_ = f.message_;
 }
 
-FuncStatus & FuncStatus::unknown (bool b)
+
+void FuncStatus::unknown(bool b)
 {
 	if (b)
 		v_ |= UNKNOWN;
 	else
 		v_ &= !UNKNOWN;
-	return *this;
 }
 
 
-bool FuncStatus::unknown () const
+
+bool FuncStatus::unknown() const
 {
 	return (v_ & UNKNOWN);
 }
 
 
-FuncStatus & FuncStatus::disabled (bool b)
+void FuncStatus::enabled(bool b)
 {
 	if (b)
-		v_ |= DISABLED;
-	else
 		v_ &= !DISABLED;
-	return *this;
+	else
+		v_ |= DISABLED;
 }
 
 
-bool FuncStatus::disabled () const
+bool FuncStatus::enabled() const
 {
-	return (v_ & DISABLED);
+	return !(v_ & DISABLED);
 }
 
 
-void FuncStatus::setOnOff (bool b)
+void FuncStatus::setOnOff(bool b)
 {
 	v_ |= (b ? ON : OFF);
 }
 
 
-bool FuncStatus::onoff (bool b) const
+bool FuncStatus::onoff(bool b) const
 {
 	if (b)
 		return (v_ & ON);
 	else
 		return (v_ & OFF);
 }
+
+
+void FuncStatus::message(docstring const & m)
+{
+	message_ = m;
+}
+
+
+docstring const & FuncStatus::message() const
+{
+	return message_;
+}
+
+
+} // namespace lyx