From 38f885867178406083ded5b9c7f0a6ddf1b656ec Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 27 Nov 2014 18:51:26 +0100
Subject: [PATCH] Fix warnings reported by clang

All these problems have the same root: the address of a reference can never be 0, and it does not make sense to test it.
---
 src/Text3.cpp                        | 7 ++-----
 src/frontends/qt4/GuiApplication.cpp | 2 +-
 src/insets/InsetArgument.cpp         | 4 ++--
 src/insets/InsetCaption.cpp          | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 20885ddc66..2092ac6ac0 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -2629,11 +2629,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_CAPTION_INSERT: {
 		code = CAPTION_CODE;
 		string arg = cmd.getArg(0);
-		bool varia = arg != "LongTableNoNumber";
-		if (cur.depth() > 0) {
-			if (&cur[cur.depth() - 1].inset())
-				varia = cur[cur.depth() - 1].inset().allowsCaptionVariation(arg);
-		}
+		bool varia = arg != "LongTableNoNumber"
+			&& cur.inset().allowsCaptionVariation(arg);
 		// not allowed in description items,
 		// and in specific insets
 		enable = !inDescriptionItem(cur)
diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 9229f155ef..0fbba746e4 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1809,7 +1809,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		Buffer * const last = theBufferList().last();
 		foreach (GuiView * view, allViews) {
 			// all of the buffers might be locally hidden. That is, there is no active buffer.
-			if (!view || !view->currentBufferView() || !&view->currentBufferView()->buffer())
+			if (!view || !view->currentBufferView())
 				activeBuffers[view] = 0;
 			else
 				activeBuffers[view] = &view->currentBufferView()->buffer();
diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 2e4285e7fe..804be7adc6 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -59,7 +59,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
 {
 	Layout::LaTeXArgMap args = it.paragraph().layout().args();
 	pass_thru_ = it.paragraph().layout().pass_thru;
-	bool const insetlayout = &it.inset() && args.empty();
+	bool const insetlayout = args.empty();
 	if (insetlayout) {
 		args = it.inset().getLayout().args();
 		pass_thru_ = it.inset().getLayout().isPassThru();
@@ -190,7 +190,7 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd,
 				return true;
 			}
 			Layout::LaTeXArgMap args;
-			bool const insetlayout = &cur.inset() && cur.paragraph().layout().latexargs().empty();
+			bool const insetlayout = cur.paragraph().layout().latexargs().empty();
 			if (insetlayout)
 				args = cur.inset().getLayout().latexargs();
 			else
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 14baf86c5f..65cddc2971 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -227,8 +227,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
 			bool varia = type != "LongTableNoNumber";
 			// check if the immediate parent inset allows caption variation
 			if (cur.depth() > 1) {
-				if (&cur[cur.depth() - 2].inset())
-					varia = cur[cur.depth() - 2].inset().allowsCaptionVariation(type);
+				varia = cur[cur.depth() - 2].inset().allowsCaptionVariation(type);
 			}
 			status.setEnabled(varia
 					  && buffer().params().documentClass().hasInsetLayout(