do not reconfigure when not needed

[lyx.git] / src / lyxgluelength.h

diff --git a/src/lyxgluelength.h b/src/lyxgluelength.h
index 77c53ec0d37b52a9b1c1175e9e7275ec42aeebdd..6c1ea63cbb3133f194510848a1f1a10f0f4a4dd9 100644 (file)
--- a/src/lyxgluelength.h
+++ b/src/lyxgluelength.h
@@ -1,20 +1,21 @@
 // -*- C++ -*-
 /**
  * \file lyxgluelength.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
+ * \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
 
 #include "lyxlength.h"
 
-#include "LString.h"
-
 
 class LyXGlueLength {
 public:
@@ -33,7 +34,7 @@ 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;
@@ -44,11 +45,11 @@ public:
 
 
        /// conversion
-       string const asString() const;
+       std::string const asString() const;
        ///
-       string const asLatexString() const;
+       std::string const asLatexString() const;
 
-       friend bool isValidGlueLength(string const & data,
+       friend bool isValidGlueLength(std::string const & data,
                                      LyXGlueLength* result);
 
 private:
@@ -66,6 +67,6 @@ bool operator==(LyXGlueLength const & l1, LyXGlueLength const & l2);
 bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2);
 /** If "data" is valid, the length represented by it is
     stored into "result", if that is not 0. */
-bool isValidGlueLength(string const & data, LyXGlueLength * result = 0);
+bool isValidGlueLength(std::string const & data, LyXGlueLength * result = 0);
 
 #endif // LYXGLUELENGTH_H