X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetinclude.C;h=12315f3cc37c096106535b93d34575e46cb88b3c;hb=3ce727041d6eef7a30ea58d8469ac8042eb20409;hp=bdfcd6a28d568954653c3c650aca5ebd0424e8e2;hpb=ec57ed1e96f6ca1b36c094b9a0083351ac313890;p=lyx.git

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index bdfcd6a28d..12315f3cc3 100644
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -12,6 +12,7 @@
 #include "insetinclude.h"
 #include "buffer.h"
 #include "bufferlist.h"
+#include "BufferView.h"
 #include "debug.h"
 #include "support/filetools.h"
 #include "lyxrc.h"
@@ -34,7 +35,7 @@ string const unique_id()
 {
 	static unsigned int seed = 1000;
 
-	std::ostringstream ost;
+	ostringstream ost;
 	ost << "file" << ++seed;
 
 	// Needed if we use lyxstring.
@@ -111,7 +112,7 @@ void InsetInclude::set(Params const & p)
 }
 
 
-Inset * InsetInclude::Clone(Buffer const & buffer) const
+Inset * InsetInclude::clone(Buffer const & buffer, bool) const
 {
 	Params p(params_);
 	p.masterFilename_ = buffer.fileName();
@@ -120,21 +121,27 @@ Inset * InsetInclude::Clone(Buffer const & buffer) const
 }
 
 
-void InsetInclude::Edit(BufferView * bv, int, int, unsigned int)
+void InsetInclude::edit(BufferView * bv, int, int, unsigned int)
 {
 	bv->owner()->getDialogs()->showInclude(this);
 }
 
 
-void InsetInclude::Write(Buffer const *, ostream & os) const
+void InsetInclude::edit(BufferView * bv, bool)
+{
+	edit(bv, 0, 0, 0);
+}
+
+
+void InsetInclude::write(Buffer const *, ostream & os) const
 {
 	os << "Include " << params_.cparams.getCommand() << "\n";
 }
 
 
-void InsetInclude::Read(Buffer const *, LyXLex & lex)
+void InsetInclude::read(Buffer const *, LyXLex & lex)
 {
-	params_.cparams.Read(lex);
+	params_.cparams.read(lex);
    
 	if (params_.cparams.getCmdName() == "include")
 		params_.flag = INCLUDE;
@@ -214,7 +221,7 @@ bool InsetInclude::loadIfNeeded() const
 }
 
 
-int InsetInclude::Latex(Buffer const * buffer, ostream & os,
+int InsetInclude::latex(Buffer const * buffer, ostream & os,
 			bool /*fragile*/, bool /*fs*/) const
 {
 	string incfile(params_.cparams.getContents());
@@ -284,7 +291,7 @@ int InsetInclude::Latex(Buffer const * buffer, ostream & os,
 }
 
 
-int InsetInclude::Ascii(Buffer const *, std::ostream & os, int) const
+int InsetInclude::ascii(Buffer const *, std::ostream & os, int) const
 {
 	if (isVerbatim())
 		os << GetFileContents(getFileName());
@@ -292,7 +299,7 @@ int InsetInclude::Ascii(Buffer const *, std::ostream & os, int) const
 }
 
 
-int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const
+int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
 {
 	string incfile(params_.cparams.getContents());
 	
@@ -331,7 +338,7 @@ int InsetInclude::Linuxdoc(Buffer const * buffer, ostream & os) const
 }
 
 
-int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const
+int InsetInclude::docBook(Buffer const * buffer, ostream & os) const
 {
 	string incfile(params_.cparams.getContents());
 
@@ -369,7 +376,7 @@ int InsetInclude::DocBook(Buffer const * buffer, ostream & os) const
 }
 
 
-void InsetInclude::Validate(LaTeXFeatures & features) const
+void InsetInclude::validate(LaTeXFeatures & features) const
 {
 
 	string incfile(params_.cparams.getContents());