Get rid of trailing whitespace 'noise' in future patches for the

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

diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index dba6f3693266e7b22ea762777dc14e01864900a0..c01cccddb8139f7054c2ecaf88b8f22c5a8ac63e 100644 (file)
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -13,15 +13,19 @@
 #include "insetbranch.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "lyxlex.h"
+#include "paragraph.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using std::auto_ptr;
+using std::istringstream;
 using std::ostream;
+using std::ostringstream;
 
 
 void InsetBranch::init()
@@ -36,7 +40,7 @@ InsetBranch::InsetBranch(BufferParams const & bp, string const & label)
        params_.branch = label;
        // Hack: stash the list of all allowable branch labels from this
        // buffer into inset's parm list as a "stowaway":
-       params_.branchlist = bp.branchlist;
+       params_.branchlist = bp.branchlist();
        init();
 }
 
@@ -125,7 +129,7 @@ dispatch_result InsetBranch::localDispatch(FuncRequest const & cmd)
        case LFUN_INSET_EDIT:
                if (cmd.button() != mouse_button::button3)
                        return InsetCollapsable::localDispatch(cmd);
-               
+
                return UNDISPATCHED;
        case LFUN_INSET_DIALOG_UPDATE:
                InsetBranchMailer("branch", *this).updateDialog(bv);
@@ -145,7 +149,7 @@ dispatch_result InsetBranch::localDispatch(FuncRequest const & cmd)
 int InsetBranch::latex(Buffer const & buf, ostream & os,
        LatexRunParams const & runparams) const
 {
-       string const branch_sel = buf.params.branchlist.allSelected();
+       string const branch_sel = buf.params().branchlist().allSelected();
        if (branch_sel.find(params_.branch, 0) != string::npos)
                return inset.latex(buf, os, runparams);
        return 0;
@@ -161,7 +165,7 @@ int InsetBranch::linuxdoc(Buffer const &, std::ostream &) const
 int InsetBranch::docbook(Buffer const & buf, std::ostream & os, bool mixcont) const
 {
        // untested - MV
-       string const branch_sel = buf.params.branchlist.allSelected();
+       string const branch_sel = buf.params().branchlist().allSelected();
        if (branch_sel.find(params_.branch, 0) != string::npos)
                return inset.docbook(buf, os, mixcont);
        return 0;
@@ -170,7 +174,7 @@ int InsetBranch::docbook(Buffer const & buf, std::ostream & os, bool mixcont) co
 
 int InsetBranch::ascii(Buffer const & buf, std::ostream & os, int ll) const
 {
-       string const branch_sel = buf.params.branchlist.allSelected();
+       string const branch_sel = buf.params().branchlist().allSelected();
        if (branch_sel.find(params_.branch, 0) != string::npos) {
                return inset.ascii(buf, os, ll);
        }
@@ -195,14 +199,14 @@ InsetBranchMailer::InsetBranchMailer(string const & name,
 string const InsetBranchMailer::inset2string(Buffer const & buf) const
 {
        InsetBranchParams params = inset_.params();
-       params.branchlist = buf.params.branchlist;
+       params.branchlist = buf.params().branchlist();
        inset_.setParams(params);
        return params2string(name_, params);
 }
 
 
 string const InsetBranchMailer::params2string(string const & name,
-                               InsetBranchParams const & params)
+                                             InsetBranchParams const & params)
 {
        ostringstream data;
        data << name << ' ';