* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / GuiFontLoader.cpp

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index 9e4a9ca36fd4e791efedc75c1adf0b659389ace1..ff3fe53675c1bdaf1b0a2f632d72b0278afab574 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -30,7 +30,7 @@
 #include <QFontInfo>
 #include <QFontDatabase>
 
-#include "support/assert.h"
+#include "support/lassert.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -140,7 +140,7 @@ static bool isChosenFont(QFont & font, QString const & family)
        // positions.
        QFontInfo fi(font);
 
-       LYXERR(Debug::FONT, "got: " << fromqstr(fi.family()));
+       LYXERR(Debug::FONT, "got: " << fi.family());
 
        if (fi.family().contains(family)) {
                LYXERR(Debug::FONT, " got it ");
@@ -153,8 +153,7 @@ static bool isChosenFont(QFont & font, QString const & family)
 
 QFont symbolFont(QString const & family, bool * ok)
 {
-       LYXERR(Debug::FONT, "Looking for font family "
-               << fromqstr(family) << " ... ");
+       LYXERR(Debug::FONT, "Looking for font family " << family << " ... ");
        QString upper = family;
        upper[0] = family[0].toUpper();
 
@@ -168,7 +167,7 @@ QFont symbolFont(QString const & family, bool * ok)
                return font;
        }
 
-       LYXERR(Debug::FONT, "Trying " << fromqstr(upper) << " ... ");
+       LYXERR(Debug::FONT, "Trying " << upper << " ... ");
        font.setFamily(upper);
 
        if (isChosenFont(font, upper)) {
@@ -180,7 +179,7 @@ QFont symbolFont(QString const & family, bool * ok)
        // A simple setFamily() fails on Qt 2
 
        QString const raw = rawName(family);
-       LYXERR(Debug::FONT, "Trying " << fromqstr(raw) << " ... ");
+       LYXERR(Debug::FONT, "Trying " << raw << " ... ");
        font.setRawName(raw);
 
        if (isChosenFont(font, family)) {
@@ -206,9 +205,8 @@ FontLoader::FontLoader()
                QString const font_file = fonts_dir + '/' + math_fonts[i] + ".ttf";
                int fontID = QFontDatabase::addApplicationFont(font_file);
 
-               LYXERR(Debug::FONT, "Adding font " << fromqstr(font_file)
-                                   << static_cast<const char *>
-                                       (fontID < 0 ? " FAIL" : " OK"));
+               LYXERR(Debug::FONT, "Adding font " << font_file
+                                   << (fontID < 0 ? " FAIL" : " OK"));
        }
 
        for (int i1 = 0; i1 < NUM_FAMILIES; ++i1)
@@ -264,7 +262,7 @@ GuiFontInfo::GuiFontInfo(FontInfo const & f)
                        font.setFamily(family);
 #ifdef Q_WS_MACX
 #if QT_VERSION >= 0x040300
-                       // Workaround for a Qt bug, see http://bugzilla.lyx.org/show_bug.cgi?id=3684
+                       // Workaround for a Qt bug, see http://www.lyx.org/trac/ticket/3684
                        // It is reported to Trolltech at 02/06/07 against 4.3 final.
                        // FIXME: Add an upper version limit as soon as the bug is fixed in Qt.
                        if (family == "Times" && !font.exactMatch())
@@ -306,8 +304,8 @@ GuiFontInfo::GuiFontInfo(FontInfo const & f)
                        break;
        }
 
-       LYXERR(Debug::FONT, "Font '" << to_utf8(stateText(f))
-               << "' matched by\n" << fromqstr(font.family()));
+       LYXERR(Debug::FONT, "Font '" << stateText(f)
+               << "' matched by\n" << font.family());
 
        // Is this an exact match?
        if (font.exactMatch())
@@ -315,7 +313,7 @@ GuiFontInfo::GuiFontInfo(FontInfo const & f)
        else
                LYXERR(Debug::FONT, "This font is NOT an exact match");
 
-       LYXERR(Debug::FONT, "XFLD: " << fromqstr(font.rawName()));
+       LYXERR(Debug::FONT, "XFLD: " << font.rawName());
 
        font.setPointSizeF(convert<double>(lyxrc.font_sizes[f.size()])
                               * lyxrc.zoom / 100.0);