X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBidi.h;h=a2b49b1fc11e0b1b8922222170e7d026651db748;hb=227f80157c878377fe8e161be957bd71fd94e216;hp=a961d93f2ebe1c1110abcac0faebe1f072421e1e;hpb=aabd481ab63fd50606dd0d984c0b407e4b27e6a7;p=lyx.git

diff --git a/src/Bidi.h b/src/Bidi.h
index a961d93f2e..a2b49b1fc1 100644
--- a/src/Bidi.h
+++ b/src/Bidi.h
@@ -15,10 +15,13 @@
 #include "support/types.h"
 #include <vector>
 
+
+namespace lyx {
+
 class Buffer;
 class Paragraph;
 class Row;
-class LyXFont;
+class Font;
 
 
 /// bidi stuff
@@ -26,20 +29,20 @@ class Bidi {
 public:
 	///
 	bool isBoundary(Buffer const &, Paragraph const & par,
-			lyx::pos_type pos) const;
+			pos_type pos) const;
 	///
 	bool isBoundary(Buffer const &, Paragraph const & par,
-				lyx::pos_type pos, LyXFont const & font) const;
+				pos_type pos, Font const & font) const;
 	///
-	lyx::pos_type log2vis(lyx::pos_type pos) const;
+	pos_type log2vis(pos_type pos) const;
 	/** Maps positions in the logical string to positions
 	 *  in visual string.
 	 */
-	lyx::pos_type vis2log(lyx::pos_type pos) const;
+	pos_type vis2log(pos_type pos) const;
 	///
-	lyx::pos_type level(lyx::pos_type pos) const;
+	pos_type level(pos_type pos) const;
 	///
-	bool inRange(lyx::pos_type pos) const;
+	bool inRange(pos_type pos) const;
 	/// same_direction?
 	bool same_direction() const;
 	///
@@ -49,17 +52,20 @@ private:
 	///
 	bool same_direction_;
 	///
-	std::vector<lyx::pos_type> log2vis_list_;
+	std::vector<pos_type> log2vis_list_;
 	/** Maps positions in the visual string to positions
 	 *  in logical string.
 	 */
-	std::vector<lyx::pos_type> vis2log_list_;
+	std::vector<pos_type> vis2log_list_;
 	///
-	std::vector<lyx::pos_type> levels_;
+	std::vector<pos_type> levels_;
 	///
-	lyx::pos_type start_;
+	pos_type start_;
 	///
-	lyx::pos_type end_;
+	pos_type end_;
 };
 
+
+} // namespace lyx
+
 #endif // BIDI_H