[LyX/master] Fix #10884 compiler warnings.

[Richard Heck]

commit 8a1377f6ff0e2064eb59bc1ec26a5793b2778320
Author: Richard Heck <rgh...@lyx.org>
Date:   Sat Dec 16 00:48:34 2017 -0500

    Fix #10884 compiler warnings.
---
 src/frontends/qt4/GuiSpellchecker.cpp |    6 +++---
 src/frontends/qt4/GuiSpellchecker.h   |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp 
b/src/frontends/qt4/GuiSpellchecker.cpp
index 537d9d7..f210013 100644
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -388,10 +388,10 @@ bool SpellcheckerWidget::initialiseParams(std::string 
const &)
        BufferView * bv = d->gv_->documentBufferView();
        if (bv == 0)
                return false;
-       std::set<Language const *> languages =
+       std::set<Language const *> langs =
                bv->buffer().masterBuffer()->getLanguages();
-       if (!languages.empty())
-               d->setLanguage(*languages.begin());
+       if (!langs.empty())
+               d->setLanguage(*langs.begin());
        d->start_ = DocIterator();
        d->wrapAround(false);
        d->canCheck();
diff --git a/src/frontends/qt4/GuiSpellchecker.h 
b/src/frontends/qt4/GuiSpellchecker.h
index 5851e8c..4198969 100644
--- a/src/frontends/qt4/GuiSpellchecker.h
+++ b/src/frontends/qt4/GuiSpellchecker.h
@@ -71,7 +71,8 @@ public:
 private:
        ///{
        void updateView();
-       bool initialiseParams(std::string const & data) { return 
widget_->initialiseParams(data); }
+       bool initialiseParams(std::string const & sdata)
+               { return widget_->initialiseParams(sdata); }
        void clearParams() {}
        void dispatchParams() {}
        bool isBufferDependent() const { return false; }