Remove redundant semicolons reported by GCC with -Wextra-semi option

This commit is contained in:
Yuriy Skalko 2021-09-28 11:21:45 +03:00
parent 05dd6614c4
commit 325c405541
11 changed files with 28 additions and 28 deletions

View File

@ -195,7 +195,7 @@ public:
/// ///
LyXRC() : user_name(support::user_name()), LyXRC() : user_name(support::user_name()),
user_email(support::user_email()) // always empty user_email(support::user_email()) // always empty
{}; {}
/// \param check_format: whether to try to convert the file format, /// \param check_format: whether to try to convert the file format,
/// if it is not current. this should only be true, really, for the /// if it is not current. this should only be true, really, for the

View File

@ -361,7 +361,7 @@ class ShellEscapeSection : SessionSection
{ {
public: public:
/// ///
explicit ShellEscapeSection() {}; explicit ShellEscapeSection() {}
/// ///
void read(std::istream & is) override; void read(std::istream & is) override;

View File

@ -154,7 +154,7 @@ public:
/// get file from repo, the caller must ensure that it does not exist locally /// get file from repo, the caller must ensure that it does not exist locally
static bool retrieve(support::FileName const & file); static bool retrieve(support::FileName const & file);
std::string vcname() const override { return "RCS"; }; std::string vcname() const override { return "RCS"; }
void registrer(std::string const & msg) override; void registrer(std::string const & msg) override;
@ -247,7 +247,7 @@ public:
/// get file from repo, the caller must ensure that it does not exist locally /// get file from repo, the caller must ensure that it does not exist locally
static bool retrieve(support::FileName const & file); static bool retrieve(support::FileName const & file);
std::string vcname() const override { return "CVS"; }; std::string vcname() const override { return "CVS"; }
void registrer(std::string const & msg) override; void registrer(std::string const & msg) override;
@ -393,7 +393,7 @@ public:
/// get file from repo, the caller must ensure that it does not exist locally /// get file from repo, the caller must ensure that it does not exist locally
static bool retrieve(support::FileName const & file); static bool retrieve(support::FileName const & file);
std::string vcname() const override { return "SVN"; }; std::string vcname() const override { return "SVN"; }
void registrer(std::string const & msg) override; void registrer(std::string const & msg) override;
@ -504,7 +504,7 @@ public:
/// get file from repo, the caller must ensure that it does not exist locally /// get file from repo, the caller must ensure that it does not exist locally
static bool retrieve(support::FileName const & file); static bool retrieve(support::FileName const & file);
std::string vcname() const override { return "GIT"; }; std::string vcname() const override { return "GIT"; }
void registrer(std::string const & msg) override; void registrer(std::string const & msg) override;

View File

@ -47,7 +47,7 @@ protected:
void hideEvent(QHideEvent * ev) override; void hideEvent(QHideEvent * ev) override;
protected Q_SLOTS: protected Q_SLOTS:
void onBufferViewChanged() override {}; void onBufferViewChanged() override {}
}; };
} // namespace frontend } // namespace frontend

View File

@ -69,7 +69,7 @@ public:
void edit(Cursor & cur, bool front, EntryDirection entry_from) override; void edit(Cursor & cur, bool front, EntryDirection entry_from) override;
bool canPaintChange(BufferView const &) const override { return true; }; bool canPaintChange(BufferView const &) const override { return true; }
//@} //@}
protected: protected:

View File

@ -935,7 +935,7 @@ public:
int pos_len; int pos_len;
int searched_size; int searched_size;
vector <string> result = vector <string>(); vector <string> result = vector <string>();
MatchResult(int len = 0): match_len(len),match_prefix(0),match2end(0), pos(0),leadsize(0),pos_len(-1),searched_size(0) {}; MatchResult(int len = 0): match_len(len),match_prefix(0),match2end(0), pos(0),leadsize(0),pos_len(-1),searched_size(0) {}
}; };
static MatchResult::range interpretMatch(MatchResult &oldres, MatchResult &newres) static MatchResult::range interpretMatch(MatchResult &oldres, MatchResult &newres)
@ -1248,7 +1248,7 @@ class KeyInfo {
class Border { class Border {
public: public:
Border(int l=0, int u=0) : low(l), upper(u) {}; Border(int l=0, int u=0) : low(l), upper(u) {}
int low; int low;
int upper; int upper;
}; };
@ -1920,7 +1920,7 @@ class LatexInfo {
buildKeys(isPatternString); buildKeys(isPatternString);
entries_ = vector<KeyInfo>(); entries_ = vector<KeyInfo>();
buildEntries(isPatternString); buildEntries(isPatternString);
}; }
int getFirstKey() { int getFirstKey() {
entidx_ = 0; entidx_ = 0;
if (entries_.empty()) { if (entries_.empty()) {
@ -1941,7 +1941,7 @@ class LatexInfo {
return -1; return -1;
} }
return 0; return 0;
}; }
int getNextKey() { int getNextKey() {
entidx_++; entidx_++;
if (int(entries_.size()) > entidx_) { if (int(entries_.size()) > entidx_) {
@ -1950,7 +1950,7 @@ class LatexInfo {
else { else {
return -1; return -1;
} }
}; }
bool setNextKey(int idx) { bool setNextKey(int idx) {
if ((idx == entidx_) && (entidx_ >= 0)) { if ((idx == entidx_) && (entidx_ >= 0)) {
entidx_--; entidx_--;
@ -1958,7 +1958,7 @@ class LatexInfo {
} }
else else
return false; return false;
}; }
int find(int start, KeyInfo::KeyType keytype) const { int find(int start, KeyInfo::KeyType keytype) const {
if (start < 0) if (start < 0)
return -1; return -1;
@ -1969,20 +1969,20 @@ class LatexInfo {
tmpIdx++; tmpIdx++;
} }
return -1; return -1;
}; }
int process(ostringstream & os, KeyInfo const & actual); int process(ostringstream & os, KeyInfo const & actual);
int dispatch(ostringstream & os, int previousStart, KeyInfo & actual); int dispatch(ostringstream & os, int previousStart, KeyInfo & actual);
// string show(int lastpos) { return interval.show(lastpos);}; // string show(int lastpos) { return interval.show(lastpos);}
int nextNotIgnored(int start) { return interval_.nextNotIgnored(start);}; int nextNotIgnored(int start) { return interval_.nextNotIgnored(start);}
KeyInfo &getKeyInfo(int keyinfo) { KeyInfo &getKeyInfo(int keyinfo) {
static KeyInfo invalidInfo = KeyInfo(); static KeyInfo invalidInfo = KeyInfo();
if ((keyinfo < 0) || ( keyinfo >= int(entries_.size()))) if ((keyinfo < 0) || ( keyinfo >= int(entries_.size())))
return invalidInfo; return invalidInfo;
else else
return entries_[keyinfo]; return entries_[keyinfo];
}; }
void setForDefaultLang(KeyInfo const & defLang) {interval_.setForDefaultLang(defLang);}; void setForDefaultLang(KeyInfo const & defLang) {interval_.setForDefaultLang(defLang);}
void addIntervall(int low, int up) { interval_.addIntervall(low, up); }; void addIntervall(int low, int up) { interval_.addIntervall(low, up); }
}; };
@ -2036,7 +2036,7 @@ class MathInfo {
m.mathSize = m.mathEnd - m.mathStart; m.mathSize = m.mathEnd - m.mathStart;
entries_.push_back(m); entries_.push_back(m);
} }
bool empty() const { return entries_.empty(); }; bool empty() const { return entries_.empty(); }
size_t getEndPos() const { size_t getEndPos() const {
if (entries_.empty() || (actualIdx_ >= entries_.size())) { if (entries_.empty() || (actualIdx_ >= entries_.size())) {
return 0; return 0;
@ -2071,7 +2071,7 @@ class MathInfo {
} }
return entries_[actualIdx_].mathSize; return entries_[actualIdx_].mathSize;
} }
void incrEntry() { actualIdx_++; }; void incrEntry() { actualIdx_++; }
}; };
void LatexInfo::buildEntries(bool isPatternString) void LatexInfo::buildEntries(bool isPatternString)

View File

@ -94,7 +94,7 @@ public:
InsetMathGrid(Buffer * buf, col_type m, row_type n, char valign, InsetMathGrid(Buffer * buf, col_type m, row_type n, char valign,
docstring const & halign); docstring const & halign);
/// ///
marker_type marker(BufferView const *) const override { return marker_type::MARKER2; }; marker_type marker(BufferView const *) const override { return marker_type::MARKER2; }
/// ///
void metrics(MetricsInfo & mi, Dimension &) const override; void metrics(MetricsInfo & mi, Dimension &) const override;
/// ///

View File

@ -24,7 +24,7 @@ namespace lyx {
// A # that failed to parse // A # that failed to parse
class InsetMathHash : public InsetMath { class InsetMathHash : public InsetMath {
public: public:
explicit InsetMathHash(docstring const & str = docstring()) : str_('#' + str) {}; explicit InsetMathHash(docstring const & str = docstring()) : str_('#' + str) {}
/// ///
void metrics(MetricsInfo & mi, Dimension & dim) const override; void metrics(MetricsInfo & mi, Dimension & dim) const override;
/// ///

View File

@ -107,7 +107,7 @@ public:
/// tell whether to use only ascii chars when producing latex code /// tell whether to use only ascii chars when producing latex code
bool asciiOnly() const { return ascii_; } bool asciiOnly() const { return ascii_; }
/// tell whether we are in a MathClass inset /// tell whether we are in a MathClass inset
void inMathClass(bool mathclass) { mathclass_ = mathclass; }; void inMathClass(bool mathclass) { mathclass_ = mathclass; }
/// tell whether we are in a MathClass inset /// tell whether we are in a MathClass inset
bool inMathClass() const { return mathclass_; } bool inMathClass() const { return mathclass_; }
/// LaTeX encoding /// LaTeX encoding

View File

@ -69,9 +69,9 @@ public:
explicit Length(std::string const & data); explicit Length(std::string const & data);
/// ///
double value() const { return val_; }; double value() const { return val_; }
/// ///
Length::UNIT unit() const { return unit_; }; Length::UNIT unit() const { return unit_; }
/// ///
void value(double val) { val_ = val; } void value(double val) { val_ = val; }
/// ///

View File

@ -101,7 +101,7 @@ public:
/// Is the last tag that was added to the stream a new line (CR)? This is mostly to known /// Is the last tag that was added to the stream a new line (CR)? This is mostly to known
/// whether a new line must be added. Therefore, consider that an empty stream just had a CR, /// whether a new line must be added. Therefore, consider that an empty stream just had a CR,
/// that simplifies the logic using this code. /// that simplifies the logic using this code.
bool isLastTagCR() const { return is_last_tag_cr_; }; bool isLastTagCR() const { return is_last_tag_cr_; }
/// ///
void writeError(std::string const &); void writeError(std::string const &);
/// ///