do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiFontLoader.cpp

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index c6757809b357989c705cd508e1958953ff290134..6ec0bc508d366cac2ce7b1a3c4f116151c6ad37c 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -14,10 +14,10 @@
 #include "GuiFontLoader.h"
 #include "qt_helpers.h"
 
-#include "support/debug.h"
 #include "LyXRC.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
@@ -27,6 +27,8 @@
 #include <QFontInfo>
 #include <QFontDatabase>
 
+using namespace std;
+using namespace lyx::support;
 
 QString const math_fonts[] = {"cmex10", "cmmi10", "cmr10", "cmsy10",
        "eufm10", "msam10", "msbm10", "wasy10", "esint10"};
@@ -35,11 +37,6 @@ int const num_math_fonts = sizeof(math_fonts) / sizeof(*math_fonts);
 
 namespace lyx {
 
-using support::contains;
-using support::package;
-using support::addPath;
-using support::addName;
-
 extern docstring const stateText(FontInfo const & f);
 
 namespace frontend {
@@ -224,6 +221,11 @@ void GuiFontLoader::update()
 }
 
 
+GuiFontLoader::~GuiFontLoader()
+{
+       update();
+}
+
 /////////////////////////////////////////////////
 
 
@@ -328,8 +330,8 @@ GuiFontInfo::GuiFontInfo(FontInfo const & f)
 
 bool GuiFontLoader::available(FontInfo const & f)
 {
-       static std::vector<int> cache_set(NUM_FAMILIES, false);
-       static std::vector<int> cache(NUM_FAMILIES, false);
+       static vector<int> cache_set(NUM_FAMILIES, false);
+       static vector<int> cache(NUM_FAMILIES, false);
 
        FontFamily family = f.family();
        if (cache_set[family])