X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontLoader.C;h=fafb7110b96fd9801d0f8f95e2637301417bb5ae;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=6938348f6e9b9b1d5a34b7b22461cc7842c515a2;hpb=e42217a77872a3c76e1b843da61a63bf980d3441;p=lyx.git

diff --git a/src/FontLoader.C b/src/FontLoader.C
index 6938348f6e..fafb7110b9 100644
--- a/src/FontLoader.C
+++ b/src/FontLoader.C
@@ -11,7 +11,6 @@
 
 #include <config.h>
 #include <cmath>	// fabs()
-#include <cstdlib>	// atoi()
 
 #ifdef __GNUG__
 #pragma implementation "FontLoader.h"
@@ -59,11 +58,11 @@ void FontLoader::update()
 void FontLoader::reset()
 {
 	// Clear font infos, font structs and font metrics
-	for (int i1 = 0; i1<4; i1++)
-		for (int i2 = 0; i2<2; i2++)
-			for (int i3 = 0; i3<4; i3++) {
+	for (int i1 = 0; i1 < 4; ++i1)
+		for (int i2 = 0; i2 < 2; ++i2)
+			for (int i3 = 0; i3 < 4; ++i3) {
 				fontinfo[i1][i2][i3] = 0;
-				for (int i4 = 0; i4<10; i4++) {
+				for (int i4 = 0; i4<10; ++i4) {
 					fontstruct[i1][i2][i3][i4] = 0;
 				}
 			}
@@ -73,16 +72,16 @@ void FontLoader::reset()
 void FontLoader::unload() 
 {
 	// Unload all fonts
-	for (int i1 = 0; i1<4; i1++)
-		for (int i2 = 0; i2<2; i2++)
-			for (int i3 = 0; i3<4; i3++) {
+	for (int i1 = 0; i1 < 4; ++i1)
+		for (int i2 = 0; i2 < 2; ++i2)
+			for (int i3 = 0; i3 < 4; ++i3) {
 				if (fontinfo[i1][i2][i3]) {
 					delete fontinfo[i1][i2][i3];
 					fontinfo[i1][i2][i3] = 0;
 				}
-				for (int i4 = 0; i4<10; i4++) {
+				for (int i4 = 0; i4 < 10; ++i4) {
 					if (fontstruct[i1][i2][i3][i4]) {
-						XFreeFont(fl_display, fontstruct[i1][i2][i3][i4]);
+						XFreeFont(fl_get_display(), fontstruct[i1][i2][i3][i4]);
 						fontstruct[i1][i2][i3][i4] = 0;
 					}
 				}
@@ -245,14 +244,14 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
 
 	current_view->owner()->getMiniBuffer()->Store();
 	current_view->owner()->getMiniBuffer()->Set(_("Loading font into X-Server..."));
-	fs = XLoadQueryFont(fl_display, font.c_str());
+	fs = XLoadQueryFont(fl_get_display(), font.c_str());
 	
 	if (fs == 0) {
 		if (font == "fixed") {
 			lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
 		} else {
 			lyxerr << "Could not get font. Using 'fixed'." << endl;
-			fs = XLoadQueryFont(fl_display, "fixed");
+			fs = XLoadQueryFont(fl_get_display(), "fixed");
 		}
 	} else if (lyxerr.debugging(Debug::FONT)) {
 		// Tell user the font matching