Replace LString.h with support/std_string.h,

[features.git] / src / frontends / font_metrics.h

diff --git a/src/frontends/font_metrics.h b/src/frontends/font_metrics.h
index 8c5e4e4fc45793f4dd5df4e942e51972c19f4300..ffd0c17378d84beb3a3f5f47e1ae411b135f95bb 100644 (file)
--- a/src/frontends/font_metrics.h
+++ b/src/frontends/font_metrics.h
@@ -1,17 +1,19 @@
 // -*- C++ -*-
 /**
  * \file font_metrics.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 unknown
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FONT_METRICS_H
 #define FONT_METRICS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXFont;
 
@@ -21,22 +23,22 @@ class LyXFont;
  *
  * The geometry is the standard typographical geometry,
  * as follows :
- *                                                                
+ *
  * --------------+------------------<maxAscent
  *               |          |
  *               <-------> (right bearing)
  *               <-> (left bearing)
  * char ascent>___          |
- *               ^   oooo   |  oooo              
- *   origin>____ |  oo  oo  | oo  oo             
- *              \|  oo  oo  | oo  oo             
- * --------------+---ooooo--|--oooo-<baseline  
- *               |      oo  |                 
- * char          |  oo  oo  |                
- * descent>______|   oooo   |                
+ *               ^   oooo   |  oooo
+ *   origin>____ |  oo  oo  | oo  oo
+ *              \|  oo  oo  | oo  oo
+ * --------------+---ooooo--|--oooo-<baseline
+ *               |      oo  |
+ * char          |  oo  oo  |
+ * descent>______|   oooo   |
  *               <-  width ->
  * --------------+----------+-------<maxDescent
- *  
+ *
  */
 namespace font_metrics {
        /// return the maximum ascent of the font
@@ -64,22 +66,22 @@ namespace font_metrics {
        }
        /// FIXME ??
        int signedWidth(string const & s, LyXFont const & f);
-       /** 
+       /**
         * fill in width,ascent,descent with the values for the
         * given string in the font.
         */
        void rectText(string const & str, LyXFont const & font,
-               int & width, 
-               int & ascent, 
+               int & width,
+               int & ascent,
                int & descent);
-       /** 
+       /**
         * fill in width,ascent,descent with the values for the
         * given string in the font for a button.
         */
        void buttonText(string const & str, LyXFont const & font,
-               int & width, 
-               int & ascent, 
+               int & width,
+               int & ascent,
                int & descent);
-};
+}
 
 #endif // FONT_METRICS_H