citation patch from Angus

[lyx.git] / src / FontInfo.h

diff --git a/src/FontInfo.h b/src/FontInfo.h
index ba856eb19cecf175d0621e98fdfd9b0bc4ed4e37..d3d2e8b0a08a5b6216c0a7fad11f196be0f87f65 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -4,13 +4,13 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1997 Asger Alstrup
+ *           Copyright 1997 Asger Alstrup
  *           and the LyX Team.
  *
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _FONTINFO_H_
-#define _FONTINFO_H_ 
+#ifndef FONTINFO_H
+#define FONTINFO_H 
 
 #ifdef __GNUG__
 #pragma interface
@@ -19,19 +19,21 @@
 #include "LString.h"
 
 /** This class manages a font.
-The idea is to create a FontInfo object with a font name pattern with a 
-wildcard at the size field. Then this object can host request for font-
-instances of any given size. If no exact match is found, the closest size
-is chosen instead. If the font is scalable, the flag lyxrc->use_scalable_fonts
-determines whether to allow scalable fonts to give an exact match. */
+    The idea is to create a FontInfo object with a font name pattern with a 
+    wildcard at the size field. Then this object can host request for font-
+    instances of any given size. If no exact match is found, the closest size
+    is chosen instead. If the font is scalable, the flag
+    lyxrc.use_scalable_fonts determines whether to allow scalable fonts to
+    give an exact match.
+*/
 class FontInfo {
 public:
        ///
        FontInfo() { init(); }
 
        ///
-       FontInfo(string const & pat)
-       : pattern(pat) { init(); }
+       explicit FontInfo(string const & pat)
+               : pattern(pat) { init(); }
 
        /// Destructor
        ~FontInfo() { release(); }
@@ -80,15 +82,7 @@ private:
        int scaleindex;
 
        /// Initialize empty record
-       void init()
-       {
-               sizes = 0;
-               strings = 0;
-               matches = 0;
-               queried = false;
-               scalable = false;
-               scaleindex = -1;
-       }
+       void init();
 
        /// Release allocated stuff
        void release();