From: Peter Kümmel <syntheticpp@gmx.net>
Date: Fri, 23 Apr 2010 09:10:35 +0000 (+0000)
Subject: cmake: more merged build fixes
X-Git-Tag: 2.0.0~3357
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=38628558a6af8d8a13e55546e99365dda1dca9e5;p=features.git

cmake: more merged build fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34274 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index f8b47ee4db..b9852b647a 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -78,3 +78,8 @@
 #undef Status
 #endif
 
+#ifdef IN
+#undef IN
+#endif
+
+
diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index c332b3972b..0a0c5ae629 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -10,6 +10,7 @@ file(GLOB frontends_qt4_sources
 	${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES})
 file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_MOC_FILES})
 list(REMOVE_ITEM frontends_qt4_sources ${moc_files} .)
+list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/liblyxqt4.cpp)
 
 file(GLOB frontends_qt4_headers
 	${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})
diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index be28d0765e..d47c1a9c57 100644
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -173,9 +173,9 @@ namespace {
 		string tag;
 	};
 
-	typedef map<string, Attributes> Translator;
+	typedef map<string, Attributes> TranslationMap;
 
-	void buildTranslator(Translator & t) {
+	void buildTranslationMap(TranslationMap & t) {
 		// the decorations we need to support are listed in lib/symbols
 		t["acute"] = Attributes(true, "&acute;");
 		t["bar"]   = Attributes(true, "&OverBar;");
@@ -206,18 +206,18 @@ namespace {
 		t["widetilde"] = Attributes(true, "&Tilde;");
 	}
 
-	Translator const & translator() {
-		static Translator t;
+	TranslationMap const & translationMap() {
+		static TranslationMap t;
 		if (t.empty())
-			buildTranslator(t);
+			buildTranslationMap(t);
 		return t;
 	}
 }
 
 void InsetMathDecoration::mathmlize(MathStream & os) const
 {
-	Translator const & t = translator();
-	Translator::const_iterator cur = t.find(to_utf8(key_->name));
+	TranslationMap const & t = translationMap();
+	TranslationMap::const_iterator cur = t.find(to_utf8(key_->name));
 	LASSERT(cur != t.end(), return);
 	char const * const outag = cur->second.over ? "mover" : "munder";
 	os << MTag(outag)
@@ -240,8 +240,8 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const
 		return;
 	}
 
-	Translator const & t = translator();
-	Translator::const_iterator cur = t.find(name);
+	TranslationMap const & t = translationMap();
+	TranslationMap::const_iterator cur = t.find(name);
 	LASSERT(cur != t.end(), return);
 	
 	bool symontop = cur->second.over;
diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 34933a078a..6750fa414f 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -78,7 +78,7 @@ bool has_math_fonts;
 
 namespace {
 
-MathWordList theWordList;
+MathWordList theMathWordList;
 
 
 bool isMathFontAvailable(docstring & name)
@@ -208,11 +208,11 @@ void initSymbols()
 					      << " used for " << to_utf8(tmp.name));
 		}
 
-		if (theWordList.find(tmp.name) != theWordList.end())
+		if (theMathWordList.find(tmp.name) != theMathWordList.end())
 			LYXERR(Debug::MATHED, "readSymbols: inset " << to_utf8(tmp.name)
 				<< " already exists.");
 		else
-			theWordList[tmp.name] = tmp;
+			theMathWordList[tmp.name] = tmp;
 
 		LYXERR(Debug::MATHED, "read symbol '" << to_utf8(tmp.name)
 			<< "  inset: " << to_utf8(tmp.inset)
@@ -242,7 +242,7 @@ bool isSpecialChar(docstring const & name)
 
 MathWordList const & mathedWordList()
 {
-	return theWordList;
+	return theMathWordList;
 }
 
 
@@ -301,8 +301,8 @@ int ensureMode(WriteStream & os, InsetMath::mode_type mode,
 
 latexkeys const * in_word_set(docstring const & str)
 {
-	MathWordList::iterator it = theWordList.find(str);
-	return it != theWordList.end() ? &(it->second) : 0;
+	MathWordList::iterator it = theMathWordList.find(str);
+	return it != theMathWordList.end() ? &(it->second) : 0;
 }