From e0672b36f38f6936afd7b70d1bbf03819cb5a086 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@lyx.org>
Date: Sat, 16 Dec 2017 00:46:16 -0500
Subject: [PATCH] Fix #10874 compiler warnings.

---
 src/frontends/qt4/GuiInclude.cpp | 14 +++++++-------
 src/frontends/qt4/GuiInclude.h   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index aa2fc65725..3e184cd352 100644
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -160,9 +160,9 @@ void GuiInclude::typeChanged(int v)
 }
 
 
-void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
+void GuiInclude::paramsToDialog(InsetCommandParams const & icp)
 {
-	filenameED->setText(toqstr(params_["filename"]));
+	filenameED->setText(toqstr(icp["filename"]));
 
 	visiblespaceCB->setChecked(false);
 	visiblespaceCB->setEnabled(false);
@@ -175,7 +175,7 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 	listingsTB->setPlainText(
 		qt_("Input listing parameters on the right. Enter ? for a list of parameters."));
 
-	string cmdname = params_.getCmdName();
+	string cmdname = icp.getCmdName();
 	if (cmdname != "include" &&
 	    cmdname != "verbatiminput" &&
 	    cmdname != "verbatiminput*" &&
@@ -189,7 +189,7 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 	} else if (cmdname == "input") {
 		typeCO->setCurrentIndex(1);
 		previewCB->setEnabled(true);
-		previewCB->setChecked(params_.preview());
+		previewCB->setChecked(icp.preview());
 
 	} else if (cmdname == "verbatiminput*") {
 		typeCO->setCurrentIndex(2);
@@ -204,7 +204,7 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 		typeCO->setCurrentIndex(3);
 		listingsGB->setEnabled(true);
 		listingsED->setEnabled(true);
-		InsetListingsParams par(to_utf8(params_["lstparams"]));
+		InsetListingsParams par(to_utf8(icp["lstparams"]));
 		// extract caption and label and put them into their respective editboxes
 		vector<string> pars = getVectorFromString(par.separatedParams(), "\n");
 		for (vector<string>::iterator it = pars.begin();
@@ -331,9 +331,9 @@ QString GuiInclude::browse(QString const & in_name, Type in_type) const
 }
 
 
-bool GuiInclude::initialiseParams(std::string const & data)
+bool GuiInclude::initialiseParams(std::string const & sdata)
 {
-	InsetCommand::string2params(data, params_);
+	InsetCommand::string2params(sdata, params_);
 	paramsToDialog(params_);
 	return true;
 }
diff --git a/src/frontends/qt4/GuiInclude.h b/src/frontends/qt4/GuiInclude.h
index 1e65812f91..1106c3e02e 100644
--- a/src/frontends/qt4/GuiInclude.h
+++ b/src/frontends/qt4/GuiInclude.h
@@ -47,9 +47,9 @@ private Q_SLOTS:
 
 private:
 	///
-	bool initialiseParams(std::string const & data);
+	bool initialiseParams(std::string const & sdata);
 	///
-	void paramsToDialog(InsetCommandParams const & params_);
+	void paramsToDialog(InsetCommandParams const & icp);
 	/// clean-up on hide.
 	void clearParams() { params_.clear(); }
 	/// clean-up on hide.