From 1da756723a3e0a7906bddbe0807be563896c4233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Wed, 13 Aug 2008 21:39:59 +0000
Subject: [PATCH] fix merged build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26152 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/graphics/Previews.cpp  |  8 ++++----
 src/insets/InsetVSpace.cpp | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/graphics/Previews.cpp b/src/graphics/Previews.cpp
index b1d40baf0a..b31292fc30 100644
--- a/src/graphics/Previews.cpp
+++ b/src/graphics/Previews.cpp
@@ -34,15 +34,15 @@ LyXRC_PreviewStatus Previews::status()
 namespace {
 typedef boost::shared_ptr<PreviewLoader> PreviewLoaderPtr;
 ///
-typedef map<Buffer const *, PreviewLoaderPtr> CacheType;
+typedef map<Buffer const *, PreviewLoaderPtr> LyxCacheType;
 ///
-static CacheType preview_cache_;
+static LyxCacheType preview_cache_;
 }
 
 
 PreviewLoader & Previews::loader(Buffer const & buffer) const
 {
-	CacheType::iterator it = preview_cache_.find(&buffer);
+	LyxCacheType::iterator it = preview_cache_.find(&buffer);
 
 	if (it == preview_cache_.end()) {
 		PreviewLoaderPtr ptr(new PreviewLoader(buffer));
@@ -56,7 +56,7 @@ PreviewLoader & Previews::loader(Buffer const & buffer) const
 
 void Previews::removeLoader(Buffer const & buffer) const
 {
-	CacheType::iterator it = preview_cache_.find(&buffer);
+	LyxCacheType::iterator it = preview_cache_.find(&buffer);
 
 	if (it != preview_cache_.end())
 		preview_cache_.erase(it);
diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 0b782f00b8..c0d95d6e80 100644
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -130,13 +130,13 @@ docstring const InsetVSpace::label() const
 
 
 namespace {
-int const arrow_size = 4;
+int const vspace_arrow_size = 4;
 }
 
 
 void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	int height = 3 * arrow_size;
+	int height = 3 * vspace_arrow_size;
 	if (space_.length().len().value() >= 0.0)
 		height = max(height, space_.inPixels(*mi.base.bv));
 
@@ -153,7 +153,7 @@ void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 
 	dim.asc = height / 2 + (a - d) / 2; // align cursor with the
 	dim.des = height - dim.asc;         // label text
-	dim.wid = ADD_TO_VSPACE_WIDTH + 2 * arrow_size + 5 + w;
+	dim.wid = ADD_TO_VSPACE_WIDTH + 2 * vspace_arrow_size + 5 + w;
 	// Cache the inset dimension. 
 	setDimCache(mi, dim);
 }
@@ -178,14 +178,14 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
 		// adding or removing space
 		bool const added = space_.kind() != VSpace::LENGTH ||
 				   space_.length().len().value() >= 0.0;
-		ty1 = added ? (start + arrow_size) : start;
-		ty2 = added ? start : (start + arrow_size);
-		by1 = added ? (end - arrow_size) : end;
-		by2 = added ? end : (end - arrow_size);
+		ty1 = added ? (start + vspace_arrow_size) : start;
+		ty2 = added ? start : (start + vspace_arrow_size);
+		by1 = added ? (end - vspace_arrow_size) : end;
+		by2 = added ? end : (end - vspace_arrow_size);
 	}
 
-	int const midx = x + arrow_size;
-	int const rightx = midx + arrow_size;
+	int const midx = x + vspace_arrow_size;
+	int const rightx = midx + vspace_arrow_size;
 
 	// first the string
 	int w = 0;
@@ -199,7 +199,7 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
 	docstring const lab = label();
 	theFontMetrics(font).rectText(lab, w, a, d);
 
-	pi.pain.rectText(x + 2 * arrow_size + 5,
+	pi.pain.rectText(x + 2 * vspace_arrow_size + 5,
 			 start + (end - start) / 2 + (a - d) / 2,
 			 lab, font, Color_none, Color_none);