remove defaults stuff, let Qt handle no toolbar

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

diff --git a/src/frontends/xforms/xfont_metrics.h b/src/frontends/xforms/xfont_metrics.h
index f7e6ac1013ec4ab3703ebe6aec1ce7b8a895cdaa..1314d73124fee83295a72d78d70ebcfac6d5ccaf 100644 (file)
--- a/src/frontends/xforms/xfont_metrics.h
+++ b/src/frontends/xforms/xfont_metrics.h
@@ -1,58 +1,28 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file xfont_metrics.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author unknown
+ * \author John Levon
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
-
-#ifndef FONT_H
-#define FONT_H
+ * Full author contact details are available in file CREDITS
+ */
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#ifndef XFONT_METRICS_H
+#define XFONT_METRICS_H
 
-#include <X11/Xlib.h>
 
 #include "LString.h"
 
+#include "font_metrics.h"
+
+#include <X11/Xlib.h>
+
 class LyXFont;
 
-namespace font_metrics {
-//namespace lyx {
-//namespace font {
-///
-//istruct lyxfont {
-       ///
-       int maxAscent(LyXFont const & f);
-       ///
-       int maxDescent(LyXFont const & f);
-       ///
-       int ascent(char c, LyXFont const & f);
-       ///
-       int descent(char c, LyXFont const & f);
-       ///
-       int lbearing(char c, LyXFont const & f);
-       ///
-       int rbearing(char c, LyXFont const & f);
-       ///
-       int width(char const * s, size_t n, LyXFont const & f);
-       ///
-       int width(char c, LyXFont const & f);
-       ///
-       int width(string const & s, LyXFont const & f);
-       ///
-       //static
-       //int width(char const * s, LyXFont const & f) {
-       //      return width(s, strlen(s), f);
-       //}
-       ///
-       int signedWidth(string const & s, LyXFont const & f);
-       ///
+namespace xfont_metrics {
        int XTextWidth(LyXFont const & f, char const * str, int count);
        ///
        int width(XChar2b const * s, int n, LyXFont const & f);
@@ -60,30 +30,6 @@ namespace font_metrics {
        int XTextWidth16(LyXFont const & f, XChar2b const * str, int count);
        ///
        void XSetFont(Display * display, GC gc, LyXFont const & f);
-       // A couple of more high-level metrics
-       ///
-       void rectText(string const & str, LyXFont const & font,
-                     int & width, int & ascent, int & descent);
-       ///
-       void buttonText(string const & str, LyXFont const & font,
-                       int & width, int & ascent, int & descent);
-//};
-}
-
-//} // end of namespace font
-
-// import into namespace lyx
-//using font::maxAscent;
-//using font::maxDescent;
-//using font::ascent;
-//using font::descent;
-//using font::lbearing;
-//using font::rbearing;
-//using font::width;
-//using font::signedWidth;
-//using font::XTextWidth;
-//using font::XSetFont;
-
-//} // end of namespace lyx
+} // namespace xfont_metrics
 
-#endif
+#endif // FONT_METRICS_H