src/frontends/qt/GuiApplication.cpp

@@ -2326,7 +2326,7 @@ QRectF GuiApplication::baseInputItemRectangle()
 }
 
 
-void GuiApplication::setBaseInputItemRectangle(QRectF const & rect)
+void GuiApplication::setBaseInputItemRectangle(QRectF rect)
 {
 	d->item_rect_base_ = rect;
 }
@@ -2338,7 +2338,7 @@ QTransform GuiApplication::baseInputItemTransform()
 }
 
 
-void GuiApplication::setBaseInputItemTransform(QTransform const & trans)
+void GuiApplication::setBaseInputItemTransform(QTransform trans)
 {
 	d->item_trans_base_ = trans;
 }

src/frontends/qt/GuiApplication.h

@@ -192,11 +192,11 @@ public:
 	/// input item rectangle of the base view
 	QRectF baseInputItemRectangle();
 	/// set input item rectangle of the base view
-	void setBaseInputItemRectangle(QRectF const & rect);
+	void setBaseInputItemRectangle(QRectF rect);
 	/// input item transform of the base view
 	QTransform baseInputItemTransform();
 	/// set input item transform of the base view
-	void setBaseInputItemTransform(QTransform const & trans);
+	void setBaseInputItemTransform(QTransform trans);
 
 	/// \name Methods to process FuncRequests
 	//@{

src/output_latex.cpp

@@ -501,10 +501,13 @@ void TeXEnvironment(Buffer const & buf, Text const & text,
 }
 
 
+// FIXME: pass the \c required vector by reference and add the stuff
+// from \c latexargs to a different vector. This avoids a copy and
+// (more importantly?) a coverity defect.
 void getArgInsets(otexstream & os, OutputParams const & runparams,
                   Layout::LaTeXArgMap const & latexargs,
                   map<size_t, lyx::InsetArgument const *> const & ilist,
-                  vector<string> const & required, string const & prefix)
+                  vector<string> required, string const & prefix)
 {
 	size_t const argnr = latexargs.size();
 	if (argnr == 0)
@@ -512,24 +515,24 @@ void getArgInsets(otexstream & os, OutputParams const & runparams,
 
 	// Default and preset args are always output, so if they require
 	// other arguments, consider this.
-	vector<string> required_args;
 	for (auto const & larg : latexargs) {
 		Layout::latexarg const & arg = larg.second;
 		if ((!arg.presetarg.empty() || !arg.defaultarg.empty()) && !arg.required.empty()) {
-			vector<string> const req = getVectorFromString(arg.required);
+				vector<string> req = getVectorFromString(arg.required);
-			required_args.insert(required_args.end(), req.begin(), req.end());
+				required.insert(required.end(), req.begin(), req.end());
-		}
+			}
 	}
 
 	for (size_t i = 1; i <= argnr; ++i) {
-		auto const lit = ilist.find(i);
+		map<size_t, InsetArgument const *>::const_iterator lit = ilist.find(i);
 		bool inserted = false;
 		if (lit != ilist.end()) {
 			InsetArgument const * ins = lit->second;
 			if (ins) {
-				auto const lait = latexargs.find(ins->name());
+				Layout::LaTeXArgMap::const_iterator const lait =
+						latexargs.find(ins->name());
 				if (lait != latexargs.end()) {
-					Layout::latexarg const arg = lait->second;
+					Layout::latexarg arg = lait->second;
 					docstring ldelim;
 					docstring rdelim;
 					if (!arg.nodelims) {
@@ -550,10 +553,12 @@ void getArgInsets(otexstream & os, OutputParams const & runparams,
 			}
 		}
 		if (!inserted) {
-			for (auto const & la_p : latexargs) {
+			Layout::LaTeXArgMap::const_iterator lait = latexargs.begin();
+			Layout::LaTeXArgMap::const_iterator const laend = latexargs.end();
+			for (; lait != laend; ++lait) {
 				string const name = prefix + convert<string>(i);
-				if (la_p.first == name) {
+				if ((*lait).first == name) {
-					Layout::latexarg const arg = la_p.second;
+					Layout::latexarg arg = (*lait).second;
 					docstring preset = arg.presetarg;
 					if (!arg.defaultarg.empty()) {
 						if (!preset.empty())
@@ -573,9 +578,7 @@ void getArgInsets(otexstream & os, OutputParams const & runparams,
 								from_ascii("]") : arg.rdelim;
 						os << ldelim << preset << rdelim;
 					} else if (find(required.begin(), required.end(),
-						            la_p.first) != required.end()
+						   (*lait).first) != required.end()) {
-						       || find(required_args.begin(), required_args.end(),
-						               la_p.first) != required_args.end()) {
 						docstring ldelim = arg.ldelim.empty() ?
 								from_ascii("[") : arg.ldelim;
 						docstring rdelim = arg.rdelim.empty() ?