On Linux show in crash message box the backtrace

[lyx.git] / src / frontends / qt4 / GuiFontMetrics.h

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index 1a6fdfa408d59f88cd50587d40a82ee4c17341b2..be36dbf23f39c5ca7ccebbcba5f2097c709e77cc 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file FontMetrics.h
+ * \file GuiFontMetrics.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QT4_FONT_METRICS_H
-#define QT4_FONT_METRICS_H
+#ifndef GUI_FONT_METRICS_H
+#define GUI_FONT_METRICS_H
 
 #include "frontends/FontMetrics.h"
 
@@ -19,16 +19,13 @@
 #include <QFontMetrics>
 #include <QHash>
 
-
 namespace lyx {
 namespace frontend {
 
-class GuiFontMetrics: public FontMetrics
+class GuiFontMetrics : public FontMetrics
 {
 public:
-
        GuiFontMetrics(QFont const & font);
-       GuiFontMetrics(QFont const & font, QFont const & smallcaps_font);
 
        virtual ~GuiFontMetrics() {}
 
@@ -56,20 +53,15 @@ public:
        int width(QString const & str) const;
 
 private:
-       int smallcapsWidth(char_type c) const;
-
        /// Metrics on the font
        QFontMetrics metrics_;
-       QFontMetrics smallcaps_metrics_;
-
-       bool smallcaps_shape_;
 
        /// Cache of char widths
        mutable QHash<char_type, int> width_cache_;
 
        struct AscendDescend {
-               short int ascent;
-               short int descent;
+               int ascent;
+               int descent;
        };
        /// Cache of char ascends and descends
        mutable QHash<char_type, AscendDescend> metrics_cache_;
@@ -83,4 +75,4 @@ private:
 } // namespace frontend
 } // namespace lyx
 
-#endif // QT4_FONT_METRICS_H
+#endif // GUI_FONT_METRICS_H