X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxgluelength.h;h=6c1ea63cbb3133f194510848a1f1a10f0f4a4dd9;hb=73603ed31be3133738cb93a65dd5ead9782c7a34;hp=aae56652eba1ffc026270144d114e3ab4b2a8b04;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/lyxgluelength.h b/src/lyxgluelength.h
index aae56652eb..6c1ea63cbb 100644
--- a/src/lyxgluelength.h
+++ b/src/lyxgluelength.h
@@ -1,27 +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
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "lyxlength.h"
 
-#include "LString.h"
-
-class BufferParams;
-class BufferView;
-
 
 class LyXGlueLength {
 public:
@@ -40,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;
@@ -51,15 +45,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
@@ -74,7 +65,8 @@ 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);
 
 #endif // LYXGLUELENGTH_H