Embedding: merge lyx::EmbeddedFiles to lyx::support::EmbeddedFileList

[lyx.git] / src / insets / InsetInclude.cpp

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index c917a3d7d19dbf01e8285d9ed495582e67969c48..fdc9abacefce085548c09ede17b33ac5efc3a82e 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -141,7 +141,7 @@ EmbeddedFile const includedFilename(Buffer const & buffer,
        EmbeddedFile file(to_utf8(params["filename"]),
               onlyPath(parentFilename(buffer)));
        file.setEmbed(params["embed"] == _("true") ? true : false);
-       file.enable(buffer.embeddedFiles().enabled(), &buffer);
+       file.enable(buffer.embedded(), &buffer);
        return file;
 }
 
@@ -713,17 +713,17 @@ void InsetInclude::updateBibfilesCache(Buffer const & buffer)
 }
 
 
-FileNameList const &
+EmbeddedFileList const &
 InsetInclude::getBibfilesCache(Buffer const & buffer) const
 {
        Buffer * const tmp = getChildBuffer(buffer, params());
        if (tmp) {
                tmp->setParent(0);
-               FileNameList const & cache = tmp->getBibfilesCache();
+               EmbeddedFileList const & cache = tmp->getBibfilesCache();
                tmp->setParent(&buffer);
                return cache;
        }
-       static FileNameList const empty;
+       static EmbeddedFileList const empty;
        return empty;
 }
 
@@ -899,9 +899,9 @@ void InsetInclude::updateLabels(Buffer const & buffer, ParIterator const &)
 
 
 void InsetInclude::registerEmbeddedFiles(Buffer const & buffer,
-       EmbeddedFiles & files) const
+       EmbeddedFileList & files) const
 {
-       files.registerFile(includedFilename(buffer, params()), this);
+       files.registerFile(includedFilename(buffer, params()), this, buffer);
 }