MacOSX compile fix: The class Point conflicted with a struct defined in MacTypes.h.

* coordcache.[Ch]: put everything in the LyX namespace.


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

src/BufferView.C

@@ -78,8 +78,10 @@
 #include <vector>
 
 
+using lyx::CoordCache;
 using lyx::docstring;
 using lyx::pos_type;
+using lyx::Point;
 
 using lyx::support::addPath;
 using lyx::support::bformat;

src/BufferView.h

@@ -201,11 +201,11 @@ public:
 	void updateMetrics(bool singlepar = false);
 
 	///
-	CoordCache & coordCache() {
+	lyx::CoordCache & coordCache() {
 		return coord_cache_;
 	}
 	///
-	CoordCache const & coordCache() const {
+	lyx::CoordCache const & coordCache() const {
 		return coord_cache_;
 	}
 	/// get this view's keyboard map handler
@@ -247,7 +247,7 @@ private:
 
 	///
 	ViewMetricsInfo metrics_info_;
-	CoordCache coord_cache_;
+	lyx::CoordCache coord_cache_;
 	///
 	Buffer * buffer_;
 

src/bufferview_funcs.C

@@ -40,6 +40,9 @@
 
 #include <sstream>
 
+using lyx::Point;
+using lyx::CoordCache;
+
 using lyx::support::bformat;
 
 using std::istringstream;

src/bufferview_funcs.h

@@ -21,7 +21,10 @@ class BufferView;
 class DocIterator;
 class InsetBase_code;
 class LyXFont;
+
+namespace lyx {
 class Point;
+}
 
 
 namespace bv_funcs {
@@ -37,7 +40,7 @@ bool string2font(std::string const & data, LyXFont & font, bool & toggle);
  */
 std::string const freefont2string();
 
-Point getPos(BufferView & bv, DocIterator const & dit, bool boundary);
+lyx::Point getPos(BufferView & bv, DocIterator const & dit, bool boundary);
 
 enum CurStatus {
 	CUR_INSIDE,
@@ -49,7 +52,7 @@ enum CurStatus {
 CurStatus status(BufferView const * bv, DocIterator const & dit);
 
 
-Point coordOffset(DocIterator const & dit, bool boundary);
+lyx::Point coordOffset(DocIterator const & dit, bool boundary);
 
 /// Moves cursor to the next inset with one of the given codes.
 void gotoInset(BufferView * bv, std::vector<InsetBase_code> const & codes,

src/coordcache.C

@@ -19,6 +19,8 @@
 #include <boost/assert.hpp>
 
 
+namespace lyx {
+
 // just a helper to be able to set a breakpoint
 void lyxbreaker(void const * data, const char * hint, int size)
 {
@@ -46,3 +48,5 @@ Point CoordCache::get(LyXText const * text, lyx::pit_type pit)
 	BOOST_ASSERT(posit != it->second.end());
 	return posit->second;
 }
+
+} // namespace lyx

src/coordcache.h

@@ -25,6 +25,8 @@ class Paragraph;
 
 #include <map>
 
+namespace lyx {
+
 void lyxbreaker(void const * data, const char * hint, int size);
 
 class Point {
@@ -153,4 +155,6 @@ private:
 	SliceCache slices1_;
 };
 
+} // namespace lyx
+
 #endif

src/cursor.C

@@ -51,8 +51,10 @@
 #include <limits>
 
 using lyx::char_type;
+using lyx::CoordCache;
 using lyx::docstring;
 using lyx::pit_type;
+using lyx::Point;
 
 using std::string;
 using std::vector;

src/cursor.h

@@ -22,7 +22,6 @@ class Buffer;
 class BufferView;
 class FuncStatus;
 class FuncRequest;
-class Point;
 class LyXFont;
 
 // these should go

src/insets/insettabular.C

@@ -47,6 +47,7 @@
 #include <limits>
 
 using lyx::docstring;
+using lyx::Point;
 
 using lyx::cap::dirtyTabularStack;
 using lyx::cap::tabularStackDirty;

src/mathed/InsetMathNest.C

@@ -60,7 +60,10 @@
 
 #include <sstream>
 
+using lyx::CoordCache;
 using lyx::docstring;
+using lyx::Point;
+
 using lyx::cap::copySelection;
 using lyx::cap::grabAndEraseSelection;
 using lyx::cap::cutSelection;

src/rowpainter.C

@@ -48,8 +48,9 @@ using lyx::frontend::NullPainter;
 using lyx::frontend::FontMetrics;
 
 using lyx::char_type;
-using lyx::pos_type;
 using lyx::pit_type;
+using lyx::pos_type;
+using lyx::Point;
 
 using std::endl;
 using std::max;

src/text2.C

@@ -62,6 +62,7 @@
 
 #include <sstream>
 
+using lyx::CoordCache;
 using lyx::docstring;
 using lyx::pit_type;
 using lyx::pos_type;