X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiFontLoader.cpp;h=ff3fe53675c1bdaf1b0a2f632d72b0278afab574;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=bad0ebe287cc006466544e72aea7beb50bc8fef7;hpb=a65738065959c266cd07df02994478b4fa10f6f1;p=lyx.git

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index bad0ebe287..ff3fe53675 100644
--- 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 ");
@@ -262,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())
@@ -313,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);