Revert part of 21965 which was debugging code.

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 64539422aead48e5bb9a5d410ad26c1b1ffce3e5..00cbf0941439fc5bbc89cea97c055c12ab2c8f36 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -18,8 +18,8 @@
 
 #include "Color.h"
 #include "Counters.h"
-#include "debug.h"
-#include "gettext.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Layout.h"
@@ -50,9 +50,8 @@ using support::rtrim;
 using support::subst;
 using support::addName;
 
-#if !defined(TEX2LYX_FONT_H) && !defined(FONT_H)
 extern FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
-#endif
+
 
 namespace {
 
@@ -451,7 +450,7 @@ bool TextClass::read(FileName const & filename, ReadType rt)
                error = !layout2layout(filename, tempfile);
                if (!error)
                        error = read(tempfile, rt);
-               support::unlink(tempfile);
+               tempfile.removeFile();
                return error;
        }