#include <config.h>
#include "InsetList.h"
-#include "BufferView.h"
+
#include "buffer.h"
+#include "bufferparams.h"
+#include "BufferView.h"
#include "debug.h"
#include "insets/insetbranch.h"
-
using lyx::pos_type;
+using std::endl;
using std::lower_bound;
using std::upper_bound;
-using std::endl;
+
namespace {
List::iterator it = list.begin();
List::iterator end = list.end();
for (; it != end; ++it) {
- if (it->inset) {
- if (it->inset->isTextInset()) {
- static_cast<UpdatableInset*>
- (it->inset)->deleteLyXText(bv, true);
- }
+ if (it->inset && it->inset->isTextInset()) {
+ static_cast<UpdatableInset*>
+ (it->inset)->deleteLyXText(bv, true);
}
}
}
void InsetList::insetsOpenCloseBranch(BufferView * bv)
{
- BufferParams bp = bv->buffer()->params;
+ BufferParams bp = bv->buffer()->params();
List::iterator it = list.begin();
List::iterator end = list.end();
for (; it != end; ++it) {
if (it->inset && it->inset->lyxCode() == InsetOld::BRANCH_CODE) {
InsetBranch * inset = static_cast<InsetBranch *>(it->inset);
- if (bp.branchlist.selected(inset->params().branch)) {
+ if (bp.branchlist().selected(inset->params().branch)) {
inset->open(bv);
} else {
inset->close(bv);