Fix bug 3148: always update the Labels if a DEPM is triggered.

[lyx.git] / src / lyxgluelength.h

diff --git a/src/lyxgluelength.h b/src/lyxgluelength.h
index e07b0fa664d97d881fd09a4618cba9776b25c657..667efa826e8390d16ba491aa3118b04f59d5fa72 100644 (file)
--- a/src/lyxgluelength.h
+++ b/src/lyxgluelength.h
@@ -1,27 +1,23 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxgluelength.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *     
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author Jean-Marc Lasgouttes
  *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LYX_GLUE_LENGTH_H
 #define LYX_GLUE_LENGTH_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "lyxlength.h"
 
-#include "LString.h"
 
-class BufferParams;
-class BufferView;
+namespace lyx {
 
 
 class LyXGlueLength {
@@ -41,8 +37,8 @@ public:
          1.2 cm  //  4mm +2pt  //  2cm -4mm +2mm  //  4+0.1-0.2cm
          The traditional Latex format is also accepted, like
          4cm plus 10pt minus 10pt */
-       explicit LyXGlueLength(string const & data);
-       
+       explicit LyXGlueLength(std::string const & data);
+
        ///
        LyXLength const & len() const;
        ///
@@ -52,15 +48,12 @@ public:
 
 
        /// conversion
-       string const asString() const;
+       std::string const asString() const;
        ///
-       string const asLatexString() const;
-
+       std::string const asLatexString() const;
 
-       /** If "data" is valid, the length represented by it is
-         stored into "result", if that is not 0. */
-       friend bool isValidGlueLength(string const & data,
-                                     LyXGlueLength* result = 0);
+       friend bool isValidGlueLength(std::string const & data,
+                                     LyXGlueLength* result);
 
 private:
        /// the normal vlaue
@@ -75,7 +68,11 @@ private:
 bool operator==(LyXGlueLength const & l1, LyXGlueLength const & l2);
 ///
 bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2);
-///
-bool isValidGlueLength(string const & data, LyXGlueLength * result);
+/** If "data" is valid, the length represented by it is
+    stored into "result", if that is not 0. */
+bool isValidGlueLength(std::string const & data, LyXGlueLength * result = 0);
+
+
+} // namespace lyx
 
-#endif
+#endif // LYXGLUELENGTH_H