Add additional LASSERT-type macros for dealing with various kinds

[lyx.git] / src / support / types.h

diff --git a/src/support/types.h b/src/support/types.h
index 92077fa7cb15515d4f2dcd9298c6ffc6f9326569..0e25333672af6336df248e858028134e5703ad39 100644 (file)
--- a/src/support/types.h
+++ b/src/support/types.h
@@ -8,7 +8,7 @@
  * indices wile trying to stay compatible with types used
  * by the standard containers.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,26 +16,28 @@
 #ifndef LYX_TYPES_H
 #define LYX_TYPES_H
 
-// this probably could be improved by using <cstddef>...
-#include <vector>
+#include <cstddef>
+
+namespace lyx {
 
-namespace lyx
-{
        /// a type for positions used in paragraphs
        // needs to be signed for a while to hold the special value -1 that is
-       // used there...
-       typedef std::vector<char>::difference_type   pos_type;
+       // used there
+       typedef ptrdiff_t  pos_type;
+
+       /// a type for paragraph offsets
+       // FIXME: should be unsigned as well.
+       // however, simply changing it breaks a downward loop somewhere...
+       typedef ptrdiff_t  pit_type;
 
+       /// a type for the nesting depth of a paragraph
+       typedef size_t     depth_type;
 
 // set this to '0' if you want to have really safe types
 #if 1
 
        /// a type for sizes
-       typedef std::vector<char>::size_type         size_type;
-
-       /// a type used for numbering text classes
-       // used to be LyXTextClassList::size_type
-       typedef std::vector<char>::size_type         textclass_type;
+       typedef size_t     size_type;
 
 #else
 
@@ -45,7 +47,7 @@ namespace lyx
 
        struct size_type {
                ///
-               typedef std::vector<char>::size_type  base_type;
+               typedef size_t  base_type;
                ///
                size_type(base_type t) { data_ = t; }
                ///
@@ -55,19 +57,6 @@ namespace lyx
                base_type data_;
        };
 
-       struct textclass_type {
-               ///
-               typedef std::vector<char>::size_type  base_type;
-               ///
-               textclass_type(base_type t) { data_ = t; }
-               ///
-               operator base_type() const { return data_; }
-               ///
-               private:
-               base_type data_;
-       };
-
-
 #endif
 
        ///
@@ -85,6 +74,14 @@ namespace lyx
                NEXT_WORD
        };
 
-}
+       ///
+       enum PageSides {
+               ///
+               OneSide,
+               ///
+               TwoSides
+       };
+
+} // namespace lyx
 
 #endif // LYX_TYPES_H