* src/LyXRC.{cpp,h}:

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index d66040c5630ad9e77bf803708743219ef827ac42..c29fe0543906a9275af3aa1a81cb2396c9a243a6 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -28,8 +28,8 @@
 #include "Language.h"
 #include "LaTeX.h"
 #include "Layout.h"
+#include "LayoutPtr.h"
 #include "LyX.h"
-#include "lyxlayout_ptr_fwd.h"
 #include "TextClass.h"
 #include "TextClassList.h"
 #include "Paragraph.h"
@@ -72,12 +72,6 @@ using support::unlink;
 namespace Alert = frontend::Alert;
 
 
-bool checkIfLoaded(FileName const & fn)
-{
-       return theBufferList().getBuffer(fn.absFilename());
-}
-
-
 Buffer * checkAndLoadLyXFile(FileName const & filename)
 {
        // File already open?
@@ -97,9 +91,8 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
                if (theBufferList().close(checkBuffer, false))
                        // Load it again.
                        return checkAndLoadLyXFile(filename);
-               else
-                       // The file could not be closed.
-                       return 0;
+               // The file could not be closed.
+               return 0;
        }
 
        if (filename.isReadable()) {
@@ -473,11 +466,6 @@ void updateLabels(Buffer const & buf, bool childonly)
        cbuf.tocBackend().update();
        if (!childonly)
                cbuf.structureChanged();
-       // FIXME
-       // the embedding signal is emitted with structureChanged signal
-       // this is inaccurate so these two will be separated later.
-       //cbuf.embeddedFiles().update();
-       //cbuf.embeddingChanged();
 }