X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.C;h=a9117e6f946d7b7bb487afbfe4f9859392ea9224;hb=664eb7ff45dbb4fabc22ec0b56798031a82335b1;hp=eed9a4018fbb1c6a255cdb625fad6df3f708978a;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/FontInfo.C b/src/FontInfo.C
index eed9a4018f..a9117e6f94 100644
--- a/src/FontInfo.C
+++ b/src/FontInfo.C
@@ -11,7 +11,8 @@
 
 #include <config.h>
 #include <cmath>	// fabs()
-#include <cstdlib>	// atoi()
+
+#include FORMS_H_LOCATION
 
 #ifdef __GNUG__
 #pragma implementation "FontInfo.h"
@@ -25,13 +26,13 @@
 using std::endl;
 
 /// Load font close to this size
-string FontInfo::getFontname(int size)
+string const FontInfo::getFontname(int size)
 {
 	if (!exist())
 		return string();
 
 	int closestind = -1;
-	double error = 100000;
+	double error = 100000.0;
 
 	for (int i = 0; i < matches; ++i) {
 		if (sizes[i] == 0) {
@@ -69,7 +70,7 @@ string FontInfo::getFontname(int size)
 
 
 /// Build newly sized font string 
-string FontInfo::resize(string const & font, int size) const
+string const FontInfo::resize(string const & font, int size) const
 {
 	string ret(font);
 	// Find the position of the size spec
@@ -115,7 +116,7 @@ void FontInfo::query()
 
 	char ** list = 0;
 	if (lyxrc.use_gui)
-		list = XListFonts(fl_display, pattern.c_str(), 100, &matches);
+		list = XListFonts(fl_get_display(), pattern.c_str(), 100, &matches);
 
 	if (list == 0) {
 		// No fonts matched
@@ -127,9 +128,9 @@ void FontInfo::query()
 		strings = new string[matches];
 
 		// We have matches. Run them through
-		for(int i = 0; i < matches; ++i) {
+		for (int i = 0; i < matches; ++i) {
 			string name(list[i]);
-			sizes[i] = atoi(token(name, '-', 7).c_str());
+			sizes[i] = lyx::atoi(token(name, '-', 7));
 			strings[i] = name;
 			if (sizes[i] == 0) {
 				if (scaleindex == -1) {
@@ -144,6 +145,17 @@ void FontInfo::query()
 }
 
 
+void FontInfo::init()
+{
+	sizes = 0;
+	strings = 0;
+	matches = 0;
+	queried = false;
+	scalable = false;
+	scaleindex = -1;
+}
+
+
 /// Release allocated stuff
 void FontInfo::release()
 {