use the new bufferstorage (this change only deletes all references to the old one

[lyx.git] / src / FontLoader.C

diff --git a/src/FontLoader.C b/src/FontLoader.C
index a46495f16bf9f503b39681b79462165bc2457dee..3f1703cd7c817559a9a19593371133161126abca 100644 (file)
--- a/src/FontLoader.C
+++ b/src/FontLoader.C
@@ -1,17 +1,17 @@
 // -*- C++ -*-
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
  *      
  *         Copyright (C) 1997 Asger Alstrup
  *           and the LyX Team.
  *
- *======================================================*/
+ * ====================================================== */
 
 #include <config.h>
-#include <math.h>      // fabs()
-#include <stdlib.h>    // atoi()
+#include <cmath>       // fabs()
+#include <cstdlib>     // atoi()
 
 #ifdef __GNUG__
 #pragma implementation "FontLoader.h"
@@ -20,7 +20,7 @@
 #include "gettext.h"
 #include "FontLoader.h"
 #include "FontInfo.h"
-#include "error.h"
+#include "debug.h"
 #include "lyxrc.h"     // lyxrc.font_*
 extern LyXRC * lyxrc;
 #include "minibuffer.h"
@@ -50,11 +50,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;
                                }
                        }
@@ -64,14 +64,14 @@ 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]);
                                                fontstruct[i1][i2][i3][i4] = 0;
@@ -98,16 +98,16 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
        }
 
        // Normal font. Let's search for an existing name that matches.
-       LString ffamily;
-       LString fseries;
-       LString fshape;
-       LString norm = lyxrc->font_norm;
-       LString fontname;
+       string ffamily;
+       string fseries;
+       string fshape;
+       string norm = lyxrc->font_norm;
+       string fontname;
 
        FontInfo * fi = new FontInfo();
        fontinfo[family][series][shape] = fi;
 
-       for (int cfam=0; cfam < 2; cfam++) {
+       for (int cfam = 0; cfam < 2; cfam++) {
                // Determine family name
                switch (family) {
                case LyXFont::ROMAN_FAMILY:
@@ -134,7 +134,7 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
                default: ;
                }
 
-               for (int cser=0; cser < 4; cser++) {
+               for (int cser = 0; cser < 4; cser++) {
                        // Determine series name
                        switch (series) {
                        case LyXFont::MEDIUM_SERIES:
@@ -157,7 +157,7 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
                        default: ;
                        }
 
-                       for (int csha=0; csha < 2; csha++) {
+                       for (int csha = 0; csha < 2; csha++) {
                                // Determine shape name
                                switch (shape) {
                                case LyXFont::UP_SHAPE:
@@ -196,37 +196,37 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
 }
 
 /// Do load font
-XFontStruct* FontLoader::doLoad(LyXFont::FONT_FAMILY family, 
+XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family, 
                                LyXFont::FONT_SERIES series, 
                                LyXFont::FONT_SHAPE shape, 
                                LyXFont::FONT_SIZE size)
 {
-       getFontinfo(family,series,shape);
-       int fsize = (int) ( (lyxrc->font_sizes[size] * lyxrc->dpi * 
-                               (lyxrc->zoom/100.0) ) / 72.27 + 0.5 );
+       getFontinfo(family, series, shape);
+       int fsize = int( (lyxrc->font_sizes[size] * lyxrc->dpi * 
+                         (lyxrc->zoom/100.0) ) / 72.27 + 0.5 );
 
-       LString font = fontinfo[family][series][shape]->getFontname(fsize);
+       string font = fontinfo[family][series][shape]->getFontname(fsize);
 
        if (font.empty()) {
-               lyxerr.print("No font matches request. Using 'fixed'.");
-               lyxerr.print("Start LyX as 'lyx -dbg 515' to get more information.");
+               lyxerr << "No font matches request. Using 'fixed'." << endl;
+               lyxerr << "Start LyX as 'lyx -dbg 515' to get more information." << endl;
                font = "fixed";
        }
 
        minibuffer->Store();
        minibuffer->Set(_("Loading font into X-Server..."));
 
-       XFontStruct* fs = XLoadQueryFont(fl_display, font.c_str());
+       XFontStruct * fs = XLoadQueryFont(fl_display, font.c_str());
 
        if (fs == 0) {
-               if (font=="fixed") {
-                       lyxerr.print("We're doomed. Can't get 'fixed' font.");
+               if (font == "fixed") {
+                       lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
                } else {
-                       lyxerr.print("Could not get font. Using 'fixed'.");
+                       lyxerr << "Could not get font. Using 'fixed'." << endl;
                        fs = XLoadQueryFont(fl_display, "fixed");
                }
        } else {
-               if (lyxerr.debugging(Error::FONT)) {
+               if (lyxerr.debugging(Debug::FONT)) {
                        // Tell user the font matching
                        LyXFont f;
                        f.setFamily(family);
@@ -239,8 +239,8 @@ XFontStruct* FontLoader::doLoad(LyXFont::FONT_FAMILY family,
                        f.setNoun(LyXFont::INHERIT);
                        f.setLatex(LyXFont::INHERIT);
                        f.setColor(LyXFont::INHERIT_COLOR);
-                       lyxerr.print(LString("Font '") + f.stateText() 
-                                     + "' matched by\n" + font + '\n');
+                       lyxerr << "Font '" << f.stateText() 
+                              << "' matched by\n" << font << endl;
                }
        }
        minibuffer->Reset();