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

diff --git a/src/BufferView.C b/src/BufferView.C
index b56600006731e81ee9b4e6ffb5f66547b63e32c1..e5e1678da8279c1490147d8a743574b9b03e9b1f 100644 (file)
--- a/src/BufferView.C
+++ b/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;

diff --git a/src/BufferView.h b/src/BufferView.h
index 53fcf3a6962e80dc84c3505c9d33df49a5c04853..c0761ff0094dcefbc28744ca10c34de0b878b14d 100644 (file)
--- a/src/BufferView.h
+++ b/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_;
 

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index b5cdfd0d4885b07b531dfa120ae4814b42267366..1f0ff23106708bf5560c824ff8dc26c49bd46056 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -40,6 +40,9 @@
 
 #include <sstream>
 
+using lyx::Point;
+using lyx::CoordCache;
+
 using lyx::support::bformat;
 
 using std::istringstream;

diff --git a/src/bufferview_funcs.h b/src/bufferview_funcs.h
index aaa2400af128fc105bf03d2785a52a5c1a41dc2b..66931166c4e08ae4adbae63fcebe3892795d7dfe 100644 (file)
--- a/src/bufferview_funcs.h
+++ b/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,

diff --git a/src/coordcache.C b/src/coordcache.C
index 262aaa7d8a7ff9b687b707f53f1d97840265aea5..f3647189fb6a8addab0b83081bb19c85857e6333 100644 (file)
--- a/src/coordcache.C
+++ b/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

diff --git a/src/coordcache.h b/src/coordcache.h
index 70ec9c1f0bf9e6c3628221f2e02ef370d2d1f3d5..851ce4f378513b35ead46746452f0cd902df876e 100644 (file)
--- a/src/coordcache.h
+++ b/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

diff --git a/src/cursor.C b/src/cursor.C
index 6920dd6e5df5e7999cce86a08873b375b31b36a6..cae408cdaf7253756892be3fc94c32b24a589ad1 100644 (file)
--- a/src/cursor.C
+++ b/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;

diff --git a/src/cursor.h b/src/cursor.h
index e934700244e060bdbe3c7b9b197cb0e8d39cfa9d..19da827ab69efcccf3ccf68f842583a5899ef658 100644 (file)
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -22,7 +22,6 @@ class Buffer;
 class BufferView;
 class FuncStatus;
 class FuncRequest;
-class Point;
 class LyXFont;
 
 // these should go

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 61a327774f71c61e35f8d6f1ff8c8a1e331a41c4..0ac3d57731101273b4ca8e2ef921e7de2c321e3d 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -47,6 +47,7 @@
 #include <limits>
 
 using lyx::docstring;
+using lyx::Point;
 
 using lyx::cap::dirtyTabularStack;
 using lyx::cap::tabularStackDirty;

diff --git a/src/mathed/InsetMathNest.C b/src/mathed/InsetMathNest.C
index 25569afe88ff7ac0e355be99afbd0af93b05f92b..3ccd2e1a37b2f78a21c9447439babea56c927201 100644 (file)
--- a/src/mathed/InsetMathNest.C
+++ b/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;

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 8b7a8e2b9fe38237ebc60a66db34facdd9ee6c5b..102c154a20594832f58e966db8e0c42846d6e396 100644 (file)
--- a/src/rowpainter.C
+++ b/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;

diff --git a/src/text2.C b/src/text2.C
index bc8257fc0af4d3627eb02772d6937b22dbdb4231..c916e07a6189a7769d72e50c57fead57c2c82686 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -62,6 +62,7 @@
 
 #include <sstream>
 
+using lyx::CoordCache;
 using lyx::docstring;
 using lyx::pit_type;
 using lyx::pos_type;