commit 10b8421ed6803381ab87a044d7407f48bcbc82ae
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Oct 19 17:51:32 2016 +0200
Remove unused methods in anononymous namespace
These have been flagged by gcc 6.
(cherry picked from commit 4065f596ada672c58787a0f9faa2278621545ab9)
---
src/frontends/qt4/Menus.cpp | 8 --------
src/mathed/MathAutoCorrect.cpp | 14 +++++++-------
src/mathed/MathParser.cpp | 18 ------------------
status.22x | 2 +-
4 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 7403055..3dcdb3a 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -323,8 +323,6 @@ public:
///
size_t size() const { return items_.size(); }
///
- MenuItem const & operator[](size_t) const;
- ///
const_iterator begin() const { return items_.begin(); }
///
const_iterator end() const { return items_.end(); }
@@ -686,12 +684,6 @@ void MenuDefinition::read(Lexer & lex)
}
-MenuItem const & MenuDefinition::operator[](size_type i) const
-{
- return items_[i];
-}
-
-
bool MenuDefinition::hasFunc(FuncRequest const & func) const
{
for (const_iterator it = begin(), et = end(); it != et; ++it)
diff --git a/src/mathed/MathAutoCorrect.cpp b/src/mathed/MathAutoCorrect.cpp
index 3e1405b..484d5f0 100644
--- a/src/mathed/MathAutoCorrect.cpp
+++ b/src/mathed/MathAutoCorrect.cpp
@@ -72,13 +72,6 @@ bool Correction::read(idocstream & is)
}
-void Correction::write(odocstream & os) const
-{
- os << "from: '" << from1_ << "' and '" << from2_
- << "' to '" << to_ << '\'' << endl;
-}
-
-
bool Correction::correct(MathAtom & at, char_type c) const
{
//LYXERR(Debug::MATHED,
@@ -95,6 +88,13 @@ bool Correction::correct(MathAtom & at, char_type c) const
#if 0
+void Correction::write(odocstream & os) const
+{
+ os << "from: '" << from1_ << "' and '" << from2_
+ << "' to '" << to_ << '\'' << endl;
+}
+
+
idocstream & operator>>(idocstream & is, Correction & corr)
{
corr.read(is);
diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index 2849b0f..f05af64 100644
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -400,8 +400,6 @@ public:
bool parse1(InsetMathGrid & grid, unsigned flags, mode_type mode,
bool numbered);
///
- MathData parse(unsigned flags, mode_type mode);
- ///
int lineno() const { return lineno_; }
///
void putback();
@@ -434,8 +432,6 @@ private:
///
void push_back(Token const & t);
///
- void pop_back();
- ///
Token const & prevToken() const;
///
Token const & nextToken() const;
@@ -500,12 +496,6 @@ void Parser::push_back(Token const & t)
}
-void Parser::pop_back()
-{
- tokens_.pop_back();
-}
-
-
Token const & Parser::prevToken() const
{
static const Token dummy;
@@ -785,14 +775,6 @@ docstring Parser::parse_verbatim_item()
}
-MathData Parser::parse(unsigned flags, mode_type mode)
-{
- MathData ar(buffer_);
- parse(ar, flags, mode);
- return ar;
-}
-
-
bool Parser::parse(MathData & array, unsigned flags, mode_type mode)
{
InsetMathGrid grid(buffer_, 1, 1);
diff --git a/status.22x b/status.22x
index 7dd223e..4eff954 100644
--- a/status.22x
+++ b/status.22x
@@ -119,4 +119,4 @@ What's new
- Update boost source to 1.62.
-- fix compiler warnings from clang 3.9
+- fix compiler warnings from clang 3.9 and gcc 6.