From 8cb728c2d7a6b70dccb7651f300d9812f645d2ea Mon Sep 17 00:00:00 2001 From: Yuriy Skalko Date: Thu, 26 Nov 2020 01:11:07 +0200 Subject: [PATCH] Constify --- src/Counters.cpp | 2 +- src/Counters.h | 2 +- src/Server.cpp | 2 +- src/Server.h | 4 ++-- src/graphics/PreviewImage.cpp | 4 ++-- src/lyxfind.cpp | 28 ++++++++++++++-------------- src/tex2lyx/Parser.cpp | 2 +- src/tex2lyx/Parser.h | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Counters.cpp b/src/Counters.cpp index 8477d5283a..139dc9bcd7 100644 --- a/src/Counters.cpp +++ b/src/Counters.cpp @@ -413,7 +413,7 @@ bool Counters::remove(docstring const & cnt) } -void Counters::copy(Counters const & from, Counters & to, docstring const & match) +void Counters::copy(Counters const & from, Counters & to, docstring const & match) const { for (auto const & ctr : counterList_) { if (ctr.first.find(match) != string::npos || match == "") { diff --git a/src/Counters.h b/src/Counters.h index 4708f5a331..e6554a284f 100644 --- a/src/Counters.h +++ b/src/Counters.h @@ -163,7 +163,7 @@ public: /// Copy counters whose name matches match from the &from to /// the &to array of counters. Empty string matches all. void copy(Counters const & from, Counters & to, - docstring const & match = docstring()); + docstring const & match = docstring()) const; /** returns the expanded string representation of counter \c * c. The \c lang code is used to translate the string. */ diff --git a/src/Server.cpp b/src/Server.cpp index fe503926de..79340492c6 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -1003,7 +1003,7 @@ struct Sleep : QThread } // namespace -bool LyXComm::loadFilesInOtherInstance() +bool LyXComm::loadFilesInOtherInstance() const { int pipefd; FileName const pipe(inPipeName()); diff --git a/src/Server.h b/src/Server.h index 9257704b43..b277284ace 100644 --- a/src/Server.h +++ b/src/Server.h @@ -120,7 +120,7 @@ private: void closeConnection(); /// Load files in another running instance of LyX - bool loadFilesInOtherInstance(); + bool loadFilesInOtherInstance() const; #ifndef _WIN32 /// start a pipe @@ -212,7 +212,7 @@ public: /// void notifyClient(std::string const &); /// - bool deferredLoadingToOtherInstance() { return pipes_.deferredLoading(); } + bool deferredLoadingToOtherInstance() const { return pipes_.deferredLoading(); } /// whilst crashing etc. void emergencyCleanup() { pipes_.emergencyCleanup(); } diff --git a/src/graphics/PreviewImage.cpp b/src/graphics/PreviewImage.cpp index b80bf9415b..062dd6e7bc 100644 --- a/src/graphics/PreviewImage.cpp +++ b/src/graphics/PreviewImage.cpp @@ -35,7 +35,7 @@ public: /// ~Impl(); /// - Image const * image(); + Image const * image() const; /// void statusChanged(); @@ -125,7 +125,7 @@ PreviewImage::Impl::~Impl() } -Image const * PreviewImage::Impl::image() +Image const * PreviewImage::Impl::image() const { if (iloader_.status() == WaitingToLoad) iloader_.startLoading(); diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index c438052d2e..fc7b0b737a 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -1101,20 +1101,20 @@ public: int depts[MAXOPENED]; int closes[MAXOPENED]; int actualdeptindex; - int previousNotIgnored(int); - int nextNotIgnored(int); + int previousNotIgnored(int) const; + int nextNotIgnored(int) const; void handleOpenP(int i); void handleCloseP(int i, bool closingAllowed); void resetOpenedP(int openPos); void addIntervall(int upper); void addIntervall(int low, int upper); /* if explicit */ void removeAccents(); - void setForDefaultLang(KeyInfo const & defLang); + void setForDefaultLang(KeyInfo const & defLang) const; int findclosing(int start, int end, char up, char down, int repeat); void handleParentheses(int lastpos, bool closingAllowed); bool hasTitle; int langcount; // Number of disabled language specs up to current position in actual interval - int isOpeningPar(int pos); + int isOpeningPar(int pos) const; string titleValue; void output(ostringstream &os, int lastpos); // string show(int lastpos); @@ -1122,7 +1122,7 @@ public: vector Intervall::borders = vector(30); -int Intervall::isOpeningPar(int pos) +int Intervall::isOpeningPar(int pos) const { if ((pos < 0) || (size_t(pos) >= par.size())) return 0; @@ -1137,7 +1137,7 @@ int Intervall::isOpeningPar(int pos) return 1; } -void Intervall::setForDefaultLang(KeyInfo const & defLang) +void Intervall::setForDefaultLang(KeyInfo const & defLang) const { // Enable the use of first token again if (ignoreidx >= 0) { @@ -1418,7 +1418,7 @@ void Intervall::resetOpenedP(int openPos) closes[1] = -1; } -int Intervall::previousNotIgnored(int start) +int Intervall::previousNotIgnored(int start) const { int idx = 0; /* int intervalls */ for (idx = ignoreidx; idx >= 0; --idx) { @@ -1430,7 +1430,7 @@ int Intervall::previousNotIgnored(int start) return start; } -int Intervall::nextNotIgnored(int start) +int Intervall::nextNotIgnored(int start) const { int idx = 0; /* int intervalls */ for (idx = 0; idx <= ignoreidx; idx++) { @@ -1504,7 +1504,7 @@ class LatexInfo { else return false; }; - int find(int start, KeyInfo::KeyType keytype) { + int find(int start, KeyInfo::KeyType keytype) const { if (start < 0) return -1; int tmpIdx = start; @@ -1526,7 +1526,7 @@ class LatexInfo { else return entries_[keyinfo]; }; - void setForDefaultLang(KeyInfo &defLang) {interval_.setForDefaultLang(defLang);}; + void setForDefaultLang(KeyInfo const & defLang) {interval_.setForDefaultLang(defLang);}; void addIntervall(int low, int up) { interval_.addIntervall(low, up); }; }; @@ -1577,14 +1577,14 @@ class MathInfo { m.mathSize = end - start; entries_.push_back(m); } - bool empty() { return entries_.empty(); }; - size_t getEndPos() { + bool empty() const { return entries_.empty(); }; + size_t getEndPos() const { if (entries_.empty() || (actualIdx_ >= entries_.size())) { return 0; } return entries_[actualIdx_].mathEnd; } - size_t getStartPos() { + size_t getStartPos() const { if (entries_.empty() || (actualIdx_ >= entries_.size())) { return 100000; /* definitely enough? */ } @@ -1594,7 +1594,7 @@ class MathInfo { actualIdx_ = 0; return getStartPos(); } - size_t getSize() { + size_t getSize() const { if (entries_.empty() || (actualIdx_ >= entries_.size())) { return size_t(0); } diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp index ee25db246d..67e0323c96 100644 --- a/src/tex2lyx/Parser.cpp +++ b/src/tex2lyx/Parser.cpp @@ -877,7 +877,7 @@ void Parser::dump() const } -void Parser::error(string const & msg) +void Parser::error(string const & msg) const { cerr << "Line ~" << lineno_ << ": parse error: " << msg << endl; dump(); diff --git a/src/tex2lyx/Parser.h b/src/tex2lyx/Parser.h index 9f174c8a0b..d28036710e 100644 --- a/src/tex2lyx/Parser.h +++ b/src/tex2lyx/Parser.h @@ -310,7 +310,7 @@ public: /// std::string verbatimOption(); /// - void error(std::string const & msg); + void error(std::string const & msg) const; /// The previous token. Token const prev_token() const; /// The current token. -- 2.39.2