simplificatons

[lyx.git] / src / insets / insetinclude.C

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 9c1652f81ad8e1caca6dd8826eaca331bcd0c9be..12315f3cc37c096106535b93d34575e46cb88b3c 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -35,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.
@@ -112,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();
@@ -121,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;
@@ -215,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());
@@ -285,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());
@@ -293,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());
        
@@ -332,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());
 
@@ -370,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());