Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / FontInfo.h

diff --git a/src/frontends/xforms/FontInfo.h b/src/frontends/xforms/FontInfo.h
index 31590bee256e88b0fa93d506330b5849aca6ac26..89703e76c42a166f64a741f7903df83d37dae3ab 100644 (file)
--- a/src/frontends/xforms/FontInfo.h
+++ b/src/frontends/xforms/FontInfo.h
@@ -7,19 +7,18 @@
  * \author Asger Alstrup
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FONTINFO_H
 #define FONTINFO_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include <boost/scoped_array.hpp>
 
-#include "LString.h"
+#include <string>
 
-#include <boost/scoped_array.hpp>
+namespace lyx {
+namespace frontend {
 
 /** This class manages a font.
     The idea is to create a FontInfo object with a font name pattern with a
@@ -35,7 +34,7 @@ public:
        FontInfo() { init(); }
 
        ///
-       explicit FontInfo(string const & pat)
+       explicit FontInfo(std::string const & pat)
                : pattern(pat) { init(); }
 
        /// Does any font match our pattern?
@@ -51,23 +50,23 @@ public:
        }
 
        /// Get existing pattern
-       string const & getPattern() const { return pattern; }
+       std::string const & getPattern() const { return pattern; }
 
        /// Set new pattern
-       void setPattern(string const & pat);
+       void setPattern(std::string const & pat);
 
        /** Return full name of font close to this size.
          If impossible, result is the empty string */
-       string const getFontname(int size);
+       std::string const getFontname(int size);
 private:
        /// Font pattern (with wildcard for size)
-       string pattern;
+       std::string pattern;
 
        /// Available size list
        boost::scoped_array<int> sizes;
 
        /// Corresponding name list
-       boost::scoped_array<string> strings;
+       boost::scoped_array<std::string> strings;
 
        /// Number of matches
        int matches;
@@ -88,7 +87,10 @@ private:
        void query();
 
        /// Build newly sized font string
-       string const resize(string const &, int size) const;
+       std::string const resize(std::string const &, int size) const;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // FONTINFO_H