anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use explicit default syntax (C++11).

Browse Source 
Thanks to Jos'e for noticing this option.
This commit is contained in:
Richard Kimberly Heck 2020-10-06 20:31:11 -04:00
parent 0f417f2a06
commit 3d46cc302b
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/InsetTabular.cpp
View File

@ -4205,14 +4205,6 @@ InsetTableCell::InsetTableCell(Buffer * buf)
isMultiColumn(false), isMultiRow(false), contentAlign(LYX_ALIGN_CENTER) isMultiColumn(false), isMultiRow(false), contentAlign(LYX_ALIGN_CENTER)
{} {}
InsetTableCell::InsetTableCell(InsetTableCell const & in) : InsetText(in)
{
isFixedWidth = in.isFixedWidth;
isMultiColumn = in.isMultiColumn;
isMultiRow = in.isMultiRow;
contentAlign = in.contentAlign;
}
bool InsetTableCell::forcePlainLayout(idx_type) const bool InsetTableCell::forcePlainLayout(idx_type) const
{ {
return isMultiRow || (isMultiColumn && !isFixedWidth); return isMultiRow || (isMultiColumn && !isFixedWidth);

8
src/insets/InsetTabular.h
View File

@ -55,9 +55,8 @@ public:
/// ///
explicit InsetTableCell(Buffer * buf); explicit InsetTableCell(Buffer * buf);
/// We need this since generation of the default is deprecated /// We need this since generation of the default is deprecated
/// (since we declare the assignment constucture below). /// (since we declare the assignment constuctor below).
/// Please make sure to adjust it if you add members! InsetTableCell(InsetTableCell const & in) = default;
InsetTableCell(InsetTableCell const &);
/// ///
InsetCode lyxCode() const override { return CELL_CODE; } InsetCode lyxCode() const override { return CELL_CODE; }
/// ///
@ -118,9 +117,6 @@ private:
// be quite slow. // be quite slow.
// So, well, if someone can do better, please do! // So, well, if someone can do better, please do!
// --rkh // --rkh
//
// NOTE: Make sure to adapt the construcors (especially the copy
// constructor) if you add members!
/// ///
bool isFixedWidth; bool isFixedWidth;
/// ///