Transform CoordCache::check/checkDim in ASSERT_DIM/POS macros

This makes it more obvious to the reader that these are actually
assertions, and should help Coverity scan too.

src/BranchList.cpp

@@ -32,6 +32,11 @@ docstring const & Branch::branch() const
 	return branch_;
 }
 
+static int list_id_generator = 0;
+
+BranchList::BranchList()
+	: separator_(from_ascii("|")), id_(++list_id_generator) {}
+
 
 void Branch::setBranch(docstring const & s)
 {

src/BranchList.h

@@ -14,7 +14,6 @@
 
 #include "support/docstring.h"
 
-#include <cstdlib> // rand()
 #include <list>
 
 
@@ -104,7 +103,7 @@ public:
 	typedef List::const_iterator const_iterator;
 
 	///
-	BranchList() : separator_(from_ascii("|")), id_(rand()) {}
+	BranchList();
 
 	///
 	docstring separator() const { return separator_; }

src/BufferParams.cpp

@@ -2752,7 +2752,7 @@ DocumentClassConstPtr BufferParams::documentClassPtr() const
 }
 
 
-void BufferParams::setDocumentClass(DocumentClassConstPtr tc)
+void BufferParams::setDocumentClass(DocumentClassConstPtr const & tc)
 {
 	// evil, but this function is evil
 	doc_class_ = const_pointer_cast<DocumentClass>(tc);

src/BufferParams.h

@@ -165,7 +165,7 @@ public:
 	/// This bypasses the baseClass and sets the textClass directly.
 	/// Should be called with care and would be better not being here,
 	/// but it seems to be needed by CutAndPaste::putClipboard().
-	void setDocumentClass(DocumentClassConstPtr);
+	void setDocumentClass(DocumentClassConstPtr const &);
 	/// List of modules in use
 	LayoutModuleList const & getModules() const { return layout_modules_; }
 	/// List of default modules the user has removed

src/BufferView.cpp

@@ -1162,7 +1162,7 @@ void BufferView::makeDocumentClass()
 }
 
 
-void BufferView::updateDocumentClass(DocumentClassConstPtr olddc)
+void BufferView::updateDocumentClass(DocumentClassConstPtr const & olddc)
 {
 	StableDocIterator backcur(d->cursor_);
 	ErrorList & el = buffer_.errorList("Class Switch");

src/BufferView.h

@@ -456,7 +456,7 @@ private:
 	void updateHoveredInset() const;
 
 	///
-	void updateDocumentClass(DocumentClassConstPtr olddc);
+	void updateDocumentClass(DocumentClassConstPtr const & olddc);
 	///
 	int width_;
 	///

src/CoordCache.cpp

@@ -11,9 +11,7 @@
 
 #include "CoordCache.h"
 
-
 #include "support/debug.h"
-
 #include "support/lassert.h"
 
 

src/CoordCache.h

@@ -11,9 +11,6 @@
 #ifndef COORDCACHE_H
 #define COORDCACHE_H
 
-// It seems that MacOSX define the check macro.
-#undef check
-
 #include "Dimension.h"
 
 #include <unordered_map>
@@ -23,6 +20,24 @@ namespace lyx {
 class Inset;
 class MathData;
 
+#ifdef ENABLE_ASSERTIONS
+#define ASSERT_HAS_DIM(thing, hint)			  \
+	if (data_.find(thing) != data_.end()) \
+	{} \
+	else \
+		lyxbreaker(thing, hint, data_.size());
+
+#define ASSERT_HAS_POS(thing, hint) \
+	auto it = data_.find(thing); \
+	if (it != data_.end() && it->second.pos.x != -10000) \
+	{} \
+	else \
+		lyxbreaker(thing, hint, data_.size());
+#else
+#define ASSERT_HAS_DIM(thing, hint)
+#define ASSERT_HAS_POS(thing, hint)
+#endif
+
 void lyxbreaker(void const * data, const char * hint, int size);
 
 struct Geometry {
@@ -94,37 +109,37 @@ public:
 
 	Geometry & geometry(T const * thing)
 	{
-		checkDim(thing, "geometry");
+		ASSERT_HAS_DIM(thing, "geometry");
 		return data_.find(thing)->second;
 	}
 
 	Geometry const & geometry(T const * thing) const
 	{
-		checkDim(thing, "geometry");
+		ASSERT_HAS_DIM(thing, "geometry");
 		return data_.find(thing)->second;
 	}
 
 	Dimension const & dim(T const * thing) const
 	{
-		checkDim(thing, "dim");
+		ASSERT_HAS_DIM(thing, "dim");
 		return data_.find(thing)->second.dim;
 	}
 
 	int x(T const * thing) const
 	{
-		check(thing, "x");
+		ASSERT_HAS_POS(thing, "x");
 		return data_.find(thing)->second.pos.x;
 	}
 
 	int y(T const * thing) const
 	{
-		check(thing, "y");
+		ASSERT_HAS_POS(thing, "y");
 		return data_.find(thing)->second.pos.y;
 	}
 
 	Point xy(T const * thing) const
 	{
-		check(thing, "xy");
+		ASSERT_HAS_POS(thing, "xy");
 		return data_.find(thing)->second.pos;
 	}
 
@@ -159,24 +174,6 @@ public:
 private:
 	friend class CoordCache;
 
-#ifdef ENABLE_ASSERTIONS
-	void checkDim(T const * thing, char const * hint) const
-	{
-		if (!hasDim(thing))
-			lyxbreaker(thing, hint, data_.size());
-	}
-
-	void check(T const * thing, char const * hint) const
-	{
-		if (!has(thing))
-			lyxbreaker(thing, hint, data_.size());
-	}
-#else
-	void checkDim(T const *, char const * const ) const {}
-
-	void check(T const *, char const *) const {}
-#endif
-
 	typedef std::unordered_map<T const *, Geometry> cache_type;
 	cache_type data_;
 };
@@ -213,12 +210,16 @@ public:
 	/// Dump the contents of the cache to lyxerr in debugging form
 	void dump() const;
 private:
+
 	/// MathDatas
 	Arrays arrays_;
 	// All insets
 	Insets insets_;
 };
 
+#undef ASSERT_HAS_DIM
+#undef ASSERT_HAS_POS
+
 } // namespace lyx
 
 #endif

src/CutAndPaste.cpp

@@ -600,7 +600,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 }
 
 
-Buffer * copyToTempBuffer(ParagraphList const & paragraphs, DocumentClassConstPtr docclass)
+Buffer * copyToTempBuffer(ParagraphList const & paragraphs, DocumentClassConstPtr const & docclass)
 {
 	// This used to need to be static to avoid a memory leak. It no longer needs
 	// to be so, but the alternative is to construct a new one of these (with a
@@ -828,15 +828,15 @@ bool multipleCellsSelected(CursorData const & cur)
 }
 
 
-void switchBetweenClasses(DocumentClassConstPtr oldone,
-		DocumentClassConstPtr newone, InsetText & in) {
+void switchBetweenClasses(DocumentClassConstPtr const & oldone,
+		DocumentClassConstPtr const & newone, InsetText & in) {
 	ErrorList el = {};
 	switchBetweenClasses(oldone, newone, in, el);
 }
 
 
-void switchBetweenClasses(DocumentClassConstPtr oldone,
-		DocumentClassConstPtr newone, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(DocumentClassConstPtr const & oldone,
+		DocumentClassConstPtr const & newone, InsetText & in, ErrorList & errorlist)
 {
 	errorlist.clear();
 

src/CutAndPaste.h

@@ -138,11 +138,11 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
  *  It changes layouts and character styles. Errors are reported
  *  in the passed ErrorList.
  */
-void switchBetweenClasses(DocumentClassConstPtr oldone,
-            DocumentClassConstPtr newone, InsetText & in, ErrorList & el);
+void switchBetweenClasses(DocumentClassConstPtr const & oldone,
+            DocumentClassConstPtr const & newone, InsetText & in, ErrorList & el);
 /// Same but without error reporting.
-void switchBetweenClasses(DocumentClassConstPtr oldone,
-            DocumentClassConstPtr newone, InsetText & in);
+void switchBetweenClasses(DocumentClassConstPtr const & oldone,
+            DocumentClassConstPtr const & newone, InsetText & in);
 
 /// Get the current selection as a string. Does not change the selection.
 /// Does only work if the whole selection is in mathed.

src/TocBuilder.cpp

@@ -24,7 +24,7 @@ namespace lyx {
 
 
 
-TocBuilder::TocBuilder(shared_ptr<Toc> toc)
+TocBuilder::TocBuilder(shared_ptr<Toc> const & toc)
 	: toc_(toc ? toc : make_shared<Toc>()),
 	  stack_()
 {

src/TocBuilder.h

@@ -27,7 +27,7 @@ class DocIterator;
 class TocBuilder
 {
 public:
-	TocBuilder(std::shared_ptr<Toc> toc);
+	TocBuilder(std::shared_ptr<Toc> const & toc);
 	/// Open a level.
 	/// When entering a float or flex or paragraph (with AddToToc)
 	void pushItem(DocIterator const & dit, docstring const & s,

src/frontends/qt/Action.cpp

@@ -40,7 +40,7 @@ Action::Action(FuncRequest func, QIcon const & icon, QString const & text,
 }
 
 
-Action::Action(shared_ptr<FuncRequest const> func,
+Action::Action(shared_ptr<FuncRequest const> const & func,
                QIcon const & icon, QString const & text,
                QString const & tooltip, QObject * parent)
 	: QAction(parent), func_(func), icon_(icon)

src/frontends/qt/Action.h

@@ -39,7 +39,7 @@ public:
 
 	// Takes shared ownership of func.
 	// Use for perf-sensitive code such as populating menus.
-	Action(std::shared_ptr<FuncRequest const> func,
+	Action(std::shared_ptr<FuncRequest const> const & func,
 	       QIcon const & icon, QString const & text,
 	       QString const & tooltip, QObject * parent);
 

src/frontends/qt/GuiDelimiter.cpp

@@ -82,7 +82,7 @@ static docstring fix_name(string const & str, bool big)
 }
 
 struct MathSymbol {
-	MathSymbol(char_type uc = '?', string icon = string())
+	MathSymbol(char_type uc = '?', string const & icon = string())
 		: unicode(uc), icon(icon)
 	{}
 	char_type unicode;

src/frontends/qt/GuiWorkArea.cpp

@@ -1184,7 +1184,7 @@ void GuiWorkArea::Private::paintPreeditText(GuiPainter & pain)
 		im_lang_ = lang;
 	}
 #endif
-		
+
 	// Chinese IM may want cursor position even when preedit string is empty
 	// such a case is handled below
 	if (preedit_string_.empty() && im_->locale().language() != QLocale::Chinese)

src/frontends/qt/GuiWorkArea_Private.h

@@ -149,7 +149,7 @@ struct GuiWorkArea::Private
 	QTransform item_trans_;
 	bool item_trans_needs_reset_ = false;
 	/// for debug
-	QLocale::Language im_lang_;
+	QLocale::Language im_lang_ = QLocale::AnyLanguage;
 
 	/// Ratio between physical pixels and device-independent pixels
 	/// We save the last used value to detect changes of the

src/frontends/qt/TocModel.cpp

@@ -160,7 +160,7 @@ void TocModel::updateItem(DocIterator const & dit)
 }
 
 
-void TocModel::reset(shared_ptr<Toc const> toc)
+void TocModel::reset(shared_ptr<Toc const> const & toc)
 {
 	toc_ = toc;
 	if (toc_->empty()) {

src/frontends/qt/TocModel.h

@@ -39,7 +39,7 @@ public:
 	///
 	TocModel(QObject * parent);
 	///
-	void reset(std::shared_ptr<Toc const>);
+	void reset(std::shared_ptr<Toc const> const &);
 	///
 	void reset();
 	///

src/insets/InsetIndexMacro.cpp

@@ -258,7 +258,7 @@ bool InsetIndexMacro::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 
 void InsetIndexMacro::processLatexSorting(otexstream & os, OutputParams const & runparams,
-				docstring const latex, docstring const plain) const
+				docstring const & latex, docstring const & plain) const
 {
 	if (contains(latex, '\\') && !contains(latex, '@')) {
 		// Plaintext might return nothing (e.g. for ERTs).

src/insets/InsetIndexMacro.h

@@ -101,7 +101,7 @@ private:
 	docstring toolTip(BufferView const & bv, int x, int y) const override;
 	///
 	void processLatexSorting(otexstream &, OutputParams const &,
-			    docstring const, docstring const) const;
+			    docstring const &, docstring const &) const;
 	///
 	bool hasSortKey() const;
 	///

src/support/FileMonitor.cpp

@@ -158,7 +158,7 @@ void FileMonitorGuard::notifyChange(QString const & path)
 }
 
 
-FileMonitor::FileMonitor(std::shared_ptr<FileMonitorGuard> monitor)
+FileMonitor::FileMonitor(std::shared_ptr<FileMonitorGuard> const & monitor)
 	: monitor_(monitor)
 {
 	connectToFileMonitorGuard();
@@ -193,7 +193,7 @@ void FileMonitor::changed(bool const exists)
 }
 
 
-ActiveFileMonitor::ActiveFileMonitor(std::shared_ptr<FileMonitorGuard> monitor,
+ActiveFileMonitor::ActiveFileMonitor(std::shared_ptr<FileMonitorGuard> const & monitor,
                                      FileName const & filename, int interval)
 	: FileMonitor(monitor), filename_(filename), interval_(interval),
 	  timestamp_(0), checksum_(0), cooldown_(true)

src/support/FileMonitor.h

@@ -128,7 +128,7 @@ class FileMonitor : public QObject
 	Q_OBJECT
 
 public:
-	FileMonitor(std::shared_ptr<FileMonitorGuard> monitor);
+	FileMonitor(std::shared_ptr<FileMonitorGuard> const & monitor);
 
 	typedef signal<void(bool)> sig;
 	typedef sig::slot_type slot;
@@ -166,7 +166,7 @@ class ActiveFileMonitor : public FileMonitor
 {
 	Q_OBJECT
 public:
-	ActiveFileMonitor(std::shared_ptr<FileMonitorGuard> monitor,
+	ActiveFileMonitor(std::shared_ptr<FileMonitorGuard> const & monitor,
 	                  FileName const & filename, int interval);
 	/// call checkModified asynchronously
 	void checkModifiedAsync();