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

Fix some warnings

Browse Source
This commit is contained in:
Richard Kimberly Heck 2020-10-06 12:27:28 -04:00
parent bff97ba76d
commit 0f417f2a06
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/insets/InsetTabular.cpp
View File

@ -619,7 +619,7 @@ InsetTableCell splitCell(InsetTableCell & head, docstring const & align_d, bool
{ {
InsetTableCell tail = InsetTableCell(head); InsetTableCell tail = InsetTableCell(head);
DocIterator const dit = separatorPos(&head, align_d); DocIterator const dit = separatorPos(&head, align_d);
hassep = (bool)dit; hassep = static_cast<bool>(dit);
if (hassep) { if (hassep) {
pos_type const psize = head.paragraphs().front().size(); pos_type const psize = head.paragraphs().front().size();
head.paragraphs().front().eraseChars(dit.pos(), psize, false); head.paragraphs().front().eraseChars(dit.pos(), psize, false);
@ -1176,7 +1176,7 @@ bool Tabular::updateColumnWidths(MetricsInfo & mi)
if (!tab_width.zero()) { if (!tab_width.zero()) {
restwidth = mi.base.inPixels(tab_width); restwidth = mi.base.inPixels(tab_width);
// Subtract the fixed widths from the table width // Subtract the fixed widths from the table width
for (auto const w : max_pwidth) for (auto const & w : max_pwidth)
restwidth -= w.second; restwidth -= w.second;
} }
@ -1190,7 +1190,7 @@ bool Tabular::updateColumnWidths(MetricsInfo & mi)
// Now consider that some variable width columns exceed the vcolwidth // Now consider that some variable width columns exceed the vcolwidth
if (vcolwidth > 0) { if (vcolwidth > 0) {
bool changed = false; bool changed = false;
for (auto const w : max_width) { for (auto const & w : max_width) {
if (tabularx || w.second > vcolwidth) { if (tabularx || w.second > vcolwidth) {
--restcols; --restcols;
restwidth -= w.second; restwidth -= w.second;
@ -5760,8 +5760,8 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
case Tabular::SET_LONGTABULAR: case Tabular::SET_LONGTABULAR:
case Tabular::TOGGLE_LONGTABULAR: case Tabular::TOGGLE_LONGTABULAR:
// setting as longtable is not allowed when table is inside a float // setting as longtable is not allowed when table is inside a float
if (cur.innerInsetOfType(FLOAT_CODE) != 0 if (cur.innerInsetOfType(FLOAT_CODE) != nullptr
|| cur.innerInsetOfType(WRAP_CODE) != 0) || cur.innerInsetOfType(WRAP_CODE) != nullptr)
status.setEnabled(false); status.setEnabled(false);
else else
status.setEnabled(true); status.setEnabled(true);
@ -7196,7 +7196,7 @@ bool InsetTabular::copySelection(Cursor & cur)
paste_tabular->setBuffer(tabular.buffer()); paste_tabular->setBuffer(tabular.buffer());
odocstringstream os; odocstringstream os;
OutputParams const runparams(0); OutputParams const runparams(nullptr);
paste_tabular->plaintext(os, runparams, 0, true, '\t', INT_MAX); paste_tabular->plaintext(os, runparams, 0, true, '\t', INT_MAX);
// Needed for the "Edit->Paste recent" menu and the system clipboard. // Needed for the "Edit->Paste recent" menu and the system clipboard.
cap::copySelection(cur, os.str()); cap::copySelection(cur, os.str());
@ -7363,7 +7363,7 @@ void InsetTabular::getSelection(Cursor & cur,
Text * InsetTabular::getText(int idx) const Text * InsetTabular::getText(int idx) const
{ {
return size_t(idx) < nargs() ? cell(idx)->getText(0) : 0; return size_t(idx) < nargs() ? cell(idx)->getText(0) : nullptr;
} }
@ -7599,7 +7599,7 @@ bool InsetTabular::showCompletionCursor() const
CompletionList const * InsetTabular::createCompletionList(Cursor const & cur) const CompletionList const * InsetTabular::createCompletionList(Cursor const & cur) const
{ {
return completionSupported(cur) ? cur.text()->createCompletionList(cur) : 0; return completionSupported(cur) ? cur.text()->createCompletionList(cur) : nullptr;
} }