some reindentation, revert workarea xpos++, constify, remove all traces of LyXParagra...

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

diff --git a/src/insets/insetparent.C b/src/insets/insetparent.C
index 05b14f1626a60e58133882e99f0dbdd2b428dea8..9ad0f61bbb7985cc0e7a78ef2c7c067d94812cfd 100644 (file)
--- a/src/insets/insetparent.C
+++ b/src/insets/insetparent.C
@@ -21,22 +21,19 @@
 #include "support/filetools.h"
 #include "BufferView.h"
 #include "LyXView.h"
-#include "lyxfunc.h"
 #include "commandtags.h"
 #include "buffer.h"
 #include "gettext.h"
+#include "lyxfunc.h"
 
 using std::ostream;
 
 
-InsetParent::InsetParent(InsetCommandParams const & p, Buffer * bf)
+InsetParent::InsetParent(InsetCommandParams const & p, Buffer const & bf)
        : InsetCommand(p)
 {
-       string fn = p.getContents();
-       if (bf)
-               setContents(MakeAbsPath(fn, OnlyPath(bf->fileName())));
-       else
-               setContents(fn);
+       string const fn = p.getContents();
+       setContents(MakeAbsPath(fn, OnlyPath(bf.fileName())));
 }
 
 
@@ -49,7 +46,7 @@ string const InsetParent::getScreenLabel() const
 void InsetParent::Edit(BufferView * bv, int, int, unsigned int)
 {    
        bv->owner()->getLyXFunc()->
-               Dispatch(LFUN_CHILDOPEN, getContents().c_str());
+               Dispatch(LFUN_CHILDOPEN, getContents());
 }