From efe09aeb50d864d9347f41cefad9369b7e1645ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= <poenitz@gmx.net>
Date: Sat, 5 Apr 2008 20:24:05 +0000
Subject: [PATCH] if we have a buffer we don't need to pass part of it
 separately...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24132 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/factory.cpp                 |  8 +++-----
 src/insets/InsetCollapsable.cpp | 10 +++++-----
 src/insets/InsetCollapsable.h   |  3 +--
 src/insets/InsetFlex.cpp        |  9 ++++-----
 src/insets/InsetFlex.h          |  3 +--
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/factory.cpp b/src/factory.cpp
index 796464ec5e..97d95e8831 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -103,7 +103,7 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
 
 		case LFUN_FLEX_INSERT: {
 			string s = cmd.getArg(0);
-			return new InsetFlex(buf, buf.params().documentClassPtr(), s);
+			return new InsetFlex(buf, s);
 		}
 
 		case LFUN_NOTE_INSERT: {
@@ -515,11 +515,9 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 		} else if (tmptok == "Flex") {
 			lex.next();
 			string s = lex.getString();
-			inset.reset(new InsetFlex(buf, 
-				buf.params().documentClassPtr(), s));
+			inset.reset(new InsetFlex(buf, s));
 		} else if (tmptok == "Branch") {
-			inset.reset(new InsetBranch(buf,
-						    InsetBranchParams()));
+			inset.reset(new InsetBranch(buf, InsetBranchParams()));
 		} else if (tmptok == "Environment") {
 			lex.next();
 			inset.reset(new InsetEnvironment(buf, lex.getDocString()));
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 91d477bed7..65910a5869 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -76,15 +76,16 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 
 
 InsetCollapsable::InsetCollapsable(Buffer const & buf,
-		CollapseStatus status, DocumentClass * dc)
+		CollapseStatus status)
 	: InsetText(buf), status_(status),
 	  openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
-	setLayout(dc);
+	DocumentClass const & dc = buf.params().documentClass();
+	setLayout(&dc);
 	setAutoBreakRows(true);
 	setDrawFrame(true);
 	setFrameColor(Color_collapsableframe);
-	paragraphs().back().setLayout(buf.params().documentClass().emptyLayout());
+	paragraphs().back().setLayout(dc.emptyLayout());
 }
 
 
@@ -161,8 +162,7 @@ void InsetCollapsable::read(Lexer & lex)
 	lex.setContext("InsetCollapsable::read");
 	string tmp_token;
 	status_ = Collapsed;
-	lex >> "status";
-	lex >> tmp_token;
+	lex >> "status" >> tmp_token;
 	if (tmp_token == "open")
 		status_ = Open;
 
diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 2aa4f1b951..fa8cf0fc50 100644
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -33,8 +33,7 @@ namespace frontend { class Painter; }
 class InsetCollapsable : public InsetText {
 public:
 	///
-	InsetCollapsable(Buffer const &,
-		CollapseStatus status = Inset::Open, DocumentClass * tc = 0);
+	InsetCollapsable(Buffer const &, CollapseStatus status = Inset::Open);
 	///
 	InsetCollapsable(InsetCollapsable const & rhs);
 	///
diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 5a12abe252..132ebd3066 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -39,12 +39,11 @@ using namespace std;
 namespace lyx {
 
 
-InsetFlex::InsetFlex(Buffer const & buf,
-	DocumentClass * dc, string const & layoutName)
-	: InsetCollapsable(buf, Collapsed, dc),
-	name_(layoutName)
+InsetFlex::InsetFlex(Buffer const & buf, string const & layoutName)
+	: InsetCollapsable(buf, Collapsed), name_(layoutName)
 {
-	setLayout(dc); // again, because now the name is initialized
+	// again, because now the name is initialized
+	setLayout(buf.params().documentClassPtr());
 	packages_ = getLayout().requires();
 	preamble_ = getLayout().preamble();
 }
diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index 5546acf215..63840a64ba 100644
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -23,8 +23,7 @@ namespace lyx {
 class InsetFlex : public InsetCollapsable {
 public:
 	///
-	InsetFlex(Buffer const &, DocumentClass * dc, 
-			std::string const & layoutName);
+	InsetFlex(Buffer const &, std::string const & layoutName);
 	///
 	docstring name() const { return from_utf8(name_); }