X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBidi.h;h=5287b1455c508f0526fe93b2c82108f31bd422d8;hb=cd4033aef3a3f1efdb5a676b8bab3d367f53a830;hp=d556bc894408b4cd9d7b12d315a2ed86af9b7333;hpb=dd306473146eec6098bf9c15ae23107658379360;p=lyx.git

diff --git a/src/Bidi.h b/src/Bidi.h
index d556bc8944..5287b1455c 100644
--- a/src/Bidi.h
+++ b/src/Bidi.h
@@ -12,11 +12,12 @@
 #ifndef BIDI_H
 #define BIDI_H
 
-#include <config.h>
-
 #include "support/types.h"
 #include <vector>
 
+
+namespace lyx {
+
 class Buffer;
 class Paragraph;
 class Row;
@@ -24,43 +25,47 @@ class LyXFont;
 
 
 /// bidi stuff
-struct  Bidi {
+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, LyXFont 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;
 	///
 	void computeTables(Paragraph const & par,
 			   Buffer const &, Row const & row);
-private: 
-	/// 
+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