From 3417702346ee70e9f09bd472f3f826d41b37f6ef Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Fri, 16 Apr 2010 10:51:20 +0000
Subject: [PATCH] * FuncStatus: unify naming of functions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34160 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/FuncStatus.cpp                   | 4 ++--
 src/FuncStatus.h                     | 4 ++--
 src/Text3.cpp                        | 2 +-
 src/frontends/qt4/Action.cpp         | 4 ++--
 src/frontends/qt4/GuiApplication.cpp | 2 +-
 src/frontends/qt4/GuiView.cpp        | 2 +-
 src/insets/InsetTabular.cpp          | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/FuncStatus.cpp b/src/FuncStatus.cpp
index d56df61aa0..36af548180 100644
--- a/src/FuncStatus.cpp
+++ b/src/FuncStatus.cpp
@@ -36,7 +36,7 @@ void FuncStatus::operator|=(FuncStatus const & f)
 }
 
 
-void FuncStatus::unknown(bool b)
+void FuncStatus::setUnknown(bool b)
 {
 	if (b)
 		v_ |= UNKNOWN;
@@ -73,7 +73,7 @@ void FuncStatus::setOnOff(bool b)
 }
 
 
-bool FuncStatus::onoff(bool b) const
+bool FuncStatus::onOff(bool b) const
 {
 	if (b)
 		return (v_ & ON);
diff --git a/src/FuncStatus.h b/src/FuncStatus.h
index af2801389e..1433f5c665 100644
--- a/src/FuncStatus.h
+++ b/src/FuncStatus.h
@@ -54,7 +54,7 @@ public:
 	///
 	void operator|=(FuncStatus const & f);
 	///
-	void unknown(bool b);
+	void setUnknown(bool b);
 	///
 	bool unknown() const;
 
@@ -67,7 +67,7 @@ public:
 	void setOnOff(bool b);
 	/// tells whether the menu item should have a check mark
 	/// (or the toolbar icon should be pushed).
-	bool onoff(bool b) const;
+	bool onOff(bool b) const;
 
 	///
 	void message(docstring const & m);
diff --git a/src/Text3.cpp b/src/Text3.cpp
index 69015cac62..0dd3b6492c 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -2288,7 +2288,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 			if (cit == floats.end() ||
 					// and that we know how to generate a list of them
 			    (!cit->second.needsFloatPkg() && cit->second.listCommand().empty())) {
-				flag.unknown(true);
+				flag.setUnknown(true);
 				// probably not necessary, but...
 				enable = false;
 			}
diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index b58e853dd4..3014e9a82f 100644
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -45,10 +45,10 @@ void Action::update()
 {
 	FuncStatus const status = getStatus(func_);
 
-	if (status.onoff(true)) {
+	if (status.onOff(true)) {
 		setCheckable(true);
 		setChecked(true);
-	} else if (status.onoff(false)) {
+	} else if (status.onOff(false)) {
 		setCheckable(true);
 		setChecked(false);
 	} else {
diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index aef110d6a6..770ef2fe19 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -863,7 +863,7 @@ FuncStatus GuiApplication::getStatus(FuncRequest const & cmd) const
 	}
 
 	if (cmd.action() == LFUN_UNKNOWN_ACTION) {
-		flag.unknown(true);
+		flag.setUnknown(true);
 		flag.setEnabled(false);
 		flag.message(from_utf8(N_("Unknown action")));
 		return flag;
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 011d0b9d91..921f5595fe 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1200,7 +1200,7 @@ void GuiView::updateToolbars()
 			lyx::getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
 		bool const review =
 			lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).enabled() &&
-			lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).onoff(true);
+			lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).onOff(true);
 		bool const mathmacrotemplate =
 			lyx::getStatus(FuncRequest(LFUN_IN_MATHMACROTEMPLATE)).enabled();
 
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 55476b4c5b..ad0d6f37b1 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4001,7 +4001,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 		}
 		if (action == Tabular::LAST_ACTION) {
 			status.clear();
-			status.unknown(true);
+			status.setUnknown(true);
 			return true;
 		}
 
-- 
2.39.2