From c6a2983b8c2348e02d0ac1b12436602ffe9ab3d8 Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Sat, 29 Feb 2020 00:06:30 -0500 Subject: [PATCH] Fix a bunch of warnings --- src/DocIterator.cpp | 34 +++++++++++++++++----------------- src/Encoding.cpp | 10 +++++----- src/factory.cpp | 23 +++++++++++------------ 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp index 13886c32dd..bdad90f4fc 100644 --- a/src/DocIterator.cpp +++ b/src/DocIterator.cpp @@ -45,14 +45,14 @@ namespace lyx { DocIterator::DocIterator() - : boundary_(false), inset_(0), buffer_(0) + : boundary_(false), inset_(nullptr), buffer_(nullptr) {} // We could be able to get rid of this if only every BufferView were // associated to a buffer on construction. DocIterator::DocIterator(Buffer * buf) - : boundary_(false), inset_(0), buffer_(buf) + : boundary_(false), inset_(nullptr), buffer_(buf) {} @@ -115,13 +115,13 @@ LyXErr & operator<<(LyXErr & os, DocIterator const & it) Inset * DocIterator::nextInset() const { - LASSERT(!empty(), return 0); + LASSERT(!empty(), return nullptr); if (pos() == lastpos()) - return 0; + return nullptr; if (pos() > lastpos()) { LYXERR0("Should not happen, but it does: pos() = " << pos() << ", lastpos() = " << lastpos()); - return 0; + return nullptr; } if (inMathed()) return nextAtom().nucleus(); @@ -131,15 +131,15 @@ Inset * DocIterator::nextInset() const Inset * DocIterator::prevInset() const { - LASSERT(!empty(), return 0); + LASSERT(!empty(), return nullptr); if (pos() == 0) - return 0; + return nullptr; if (inMathed()) { if (cell().empty()) // FIXME: this should not happen but it does. // See bug 3189 // http://www.lyx.org/trac/ticket/3189 - return 0; + return nullptr; else return prevAtom().nucleus(); } @@ -149,7 +149,7 @@ Inset * DocIterator::prevInset() const Inset * DocIterator::realInset() const { - LASSERT(inTexted(), return 0); + LASSERT(inTexted(), return nullptr); // if we are in a tabular, we need the cell if (inset().lyxCode() == TABULAR_CODE) { InsetTabular * tabular = inset().asInsetTabular(); @@ -190,7 +190,7 @@ MathAtom & DocIterator::nextAtom() const Text * DocIterator::text() const { - LASSERT(!empty(), return 0); + LASSERT(!empty(), return nullptr); return top().text(); } @@ -319,7 +319,7 @@ MathData & DocIterator::cell() const Text * DocIterator::innerText() const { - LASSERT(!empty(), return 0); + LASSERT(!empty(), return nullptr); return innerTextSlice().text(); } @@ -329,7 +329,7 @@ Inset * DocIterator::innerInsetOfType(int code) const for (int i = depth() - 1; i >= 0; --i) if (slices_[i].inset_->lyxCode() == code) return slices_[i].inset_; - return 0; + return nullptr; } @@ -367,7 +367,7 @@ void DocIterator::forwardPos() // not at cell/paragraph end? if (tip.pos() != tip.lastpos()) { // move into an inset to the right if possible - Inset * n = 0; + Inset * n = nullptr; if (inMathed()) n = (tip.cell().begin() + tip.pos())->nucleus(); else @@ -486,7 +486,7 @@ void DocIterator::backwardPos() return; // move into an inset to the left if possible - Inset * n = 0; + Inset * n = nullptr; if (inMathed()) n = (top().cell().begin() + top().pos())->nucleus(); else @@ -631,7 +631,7 @@ void DocIterator::sanitize() Inset * inset = inset_; // re-add the slices one by one, and adjust the inset pointer. for (size_t i = 0, n = sl.size(); i != n; ++i) { - if (inset == 0) { + if (inset == nullptr) { // FIXME LYXERR0(" Should not happen, but does e.g. after " "C-n C-l C-z S-C-z\n" @@ -732,7 +732,7 @@ docstring DocIterator::getPossibleLabel() const Encoding const * DocIterator::getEncoding() const { if (empty()) - return 0; + return nullptr; BufferParams const & bp = buffer()->params(); if (bp.useNonTeXFonts) @@ -804,7 +804,7 @@ StableDocIterator::StableDocIterator(DocIterator const & dit) : data_(dit.internalData()) { for (size_t i = 0, n = data_.size(); i != n; ++i) - data_[i].inset_ = 0; + data_[i].inset_ = nullptr; } diff --git a/src/Encoding.cpp b/src/Encoding.cpp index 2379209d27..47e27eb97d 100644 --- a/src/Encoding.cpp +++ b/src/Encoding.cpp @@ -274,7 +274,7 @@ vector Encoding::symbolsList() const // add all encodable characters copy(encodable_.begin(), encodable_.end(), back_inserter(symbols)); // now the ones from the unicodesymbols file that are not already there - for (pair const & elem : unicodesymbols) { + for (auto const & elem : unicodesymbols) { if (find(symbols.begin(), symbols.end(), elem.first) == symbols.end()) symbols.push_back(elem.first); } @@ -636,9 +636,9 @@ Encodings::fromLyXName(string const & name, bool allowUnsafe) const { EncodingList::const_iterator const it = encodinglist.find(name); if (it == encodinglist.end()) - return 0; + return nullptr; if (!allowUnsafe && it->second.unsafe()) - return 0; + return nullptr; return &it->second; } @@ -662,7 +662,7 @@ Encodings::fromLaTeXName(string const & n, int const & p, bool allowUnsafe) cons if ((it->second.latexName() == name) && (it->second.package() & p) && (!it->second.unsafe() || allowUnsafe)) return &it->second; - return 0; + return nullptr; } @@ -674,7 +674,7 @@ Encodings::fromIconvName(string const & n, int const & p, bool allowUnsafe) cons if ((it->second.iconvName() == n) && (it->second.package() & p) && (!it->second.unsafe() || allowUnsafe)) return &it->second; - return 0; + return nullptr; } diff --git a/src/factory.cpp b/src/factory.cpp index 1b773c50e9..653a128761 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -155,7 +155,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) string const arg2 = cmd.getArg(1); if (arg1 != "deco") { LYXERR0("LFUN_IPAMACRO_INSERT: wrong argument"); - return 0; + return nullptr; } return new InsetIPADeco(buf, arg2); } @@ -176,7 +176,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) string arg = cmd.getArg(0); if (arg.empty()) { LYXERR0("argument-insert needs an argument!"); - return 0; + return nullptr; } return new InsetArgument(buf, arg); } @@ -212,7 +212,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) if (argument == "figure" || argument == "table") return new InsetWrap(buf, argument); lyxerr << "Non-existent wrapfig type: " << argument << endl; - return 0; + return nullptr; } case LFUN_INDEX_INSERT: { @@ -231,7 +231,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) case LFUN_TABULAR_INSERT: { if (cmd.argument().empty()) - return 0; + return nullptr; istringstream ss(to_utf8(cmd.argument())); int r = 0, c = 0; ss >> r >> c; @@ -281,7 +281,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) switch (code) { case NO_CODE: lyxerr << "No such inset '" << name << "'."; - return 0; + return nullptr; case BIBITEM_CODE: { InsetCommandParams icp(code); @@ -406,7 +406,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) default: lyxerr << "Inset '" << name << "' not permitted with LFUN_INSET_INSERT." << endl; - return 0; + return nullptr; } } //end LFUN_INSET_INSERT @@ -478,7 +478,6 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) } return new InsetSpace(isp); } - break; default: break; @@ -491,11 +490,11 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) lyx_exit(1); } else if (message.type_ == WarningException) { Alert::warning(message.title_, message.details_); - return 0; + return nullptr; } } - return 0; + return nullptr; } @@ -575,7 +574,7 @@ Inset * readInset(Lexer & lex, Buffer * buf) break; case REF_CODE: if (inscmd["name"].empty() && inscmd["reference"].empty()) - return 0; + return nullptr; inset.reset(new InsetRef(buf, inscmd)); break; case TOC_CODE: @@ -587,7 +586,7 @@ Inset * readInset(Lexer & lex, Buffer * buf) << "'" << endl; while (lex.isOK() && lex.getString() != "\\end_inset") lex.next(); - return 0; + return nullptr; } inset->setBuffer(*buf); } else { @@ -675,7 +674,7 @@ Inset * readInset(Lexer & lex, Buffer * buf) << "'" << endl; while (lex.isOK() && lex.getString() != "\\end_inset") lex.next(); - return 0; + return nullptr; } // Set the buffer reference for proper parsing of some insets -- 2.39.5