Move #includes out of header files.

[lyx.git] / src / lyxfont.h

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 39da3b0489144900d703993f43cfb76f15f749eb..635cab282441ac5307436bb40173e8a6fa2bfab1 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -1,21 +1,20 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxfont.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author Dekel Tsur
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LYXFONT_H
 #define LYXFONT_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include <iosfwd>
 
 #include "LString.h"
@@ -282,11 +281,7 @@ public:
        void reduce(LyXFont const & tmplt);
 
        /// Realize font from a template (INHERIT are realized)
-#ifndef INHERIT_LANGUAGE
        LyXFont & realize(LyXFont const & tmplt);
-#else
-       LyXFont & realize(LyXFont const & tmplt, Language const * language);
-#endif
        /// Is a given font fully resolved?
        bool resolved() const;
 
@@ -294,12 +289,7 @@ public:
        LyXFont & lyxRead(LyXLex &);
 
        /// Writes the changes from this font to orgfont in .lyx format in file
-#ifndef INHERIT_LANGUAGE
        void lyxWriteChanges(LyXFont const & orgfont, std::ostream &) const;
-#else
-       void lyxWriteChanges(LyXFont const & orgfont, Language const * doclang,
-                            std::ostream &) const;
-#endif
 
        /** Writes the head of the LaTeX needed to change to this font.
            Writes to string, the head of the LaTeX needed to change
@@ -460,5 +450,4 @@ bool operator!=(LyXFont const & font1, LyXFont const & font2)
        return !(font1 == font2);
 }
 
-
 #endif