From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 22 Apr 2016 13:50:51 +0000 (+0200)
Subject: Rename InsetMathHull::isTable to allowsTabularFeatures
X-Git-Tag: 2.2.1~124
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9a4309b104a5a1d7516c2e7f9046b11ec435ec02;p=features.git

Rename InsetMathHull::isTable to allowsTabularFeatures

The old name conflicted with the newly introduced Inset::isTable.

Now the meaning is as follows.
* Inset::isTable() is true when the inset is composed of lines and columns
* InsetMathHull::allowsTabularFeatures is true when the current type of hull allows for tabular-like functions.

(cherry picked from commit db39dc7ccd4c2dd14ef20547e6e3c056ba030d83)
---

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index c2699f6db8..efdeb8b056 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -1095,7 +1095,7 @@ void InsetMathHull::footer_write(WriteStream & os) const
 }
 
 
-bool InsetMathHull::isTable() const
+bool InsetMathHull::allowsTabularFeatures() const
 {
 	switch (type_) {
 	case hullEqnArray:
@@ -1857,7 +1857,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_TABULAR_FEATURE:
-		if (!isTable())
+		if (!allowsTabularFeatures())
 			cur.undispatched();
 		else
 			InsetMathGrid::doDispatch(cur, cmd);
@@ -1978,7 +1978,7 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
 		return InsetMathGrid::getStatus(cur, cmd, status);
 
 	case LFUN_TABULAR_FEATURE: {
-		if (!isTable())
+		if (!allowsTabularFeatures())
 			return false;
 		string s = cmd.getArg(0);
 		if (!rowChangeOK()
diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index b79b515ac2..c12fcc7593 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -241,7 +241,7 @@ private:
 	/// consistency check
 	void check() const;
 	/// does it understand tabular-feature commands?
-	bool isTable() const;
+	bool allowsTabularFeatures() const;
 	/// can this change its number of rows?
 	bool rowChangeOK() const;
 	/// can this change its number of cols?