From: Jean-Marc Lasgouttes Date: Fri, 22 Apr 2016 13:50:51 +0000 (+0200) Subject: Rename InsetMathHull::isTable to allowsTabularFeatures X-Git-Tag: 2.3.0alpha1~1643^2~73 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d48d426c72add4a6adf80876b13fa454d2a82ee4;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. --- diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index e684d237f5..6fa50e44b9 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -1097,7 +1097,7 @@ void InsetMathHull::footer_write(WriteStream & os) const } -bool InsetMathHull::isTable() const +bool InsetMathHull::allowsTabularFeatures() const { switch (type_) { case hullEqnArray: @@ -1859,7 +1859,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd) } case LFUN_TABULAR_FEATURE: - if (!isTable()) + if (!allowsTabularFeatures()) cur.undispatched(); else InsetMathGrid::doDispatch(cur, cmd); @@ -1980,7 +1980,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?