#include <config.h>
#include <cmath> // fabs()
-#include <cstdlib> // atoi()
#include FORMS_H_LOCATION
return string();
int closestind = -1;
- double error = 100000;
+ double error = 100000.0;
for (int i = 0; i < matches; ++i) {
if (sizes[i] == 0) {
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
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) {