X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=47c0f2f2cd40c0dfdb58ea5811c3013ea1f37cca;hb=2420f5ed1e9fe98c6273de3c9d661641aefc011b;hp=49d700cb91638cc3e58b85a859b7d0e71511c4a4;hpb=52d3a1e426a079ad28a33b4cd5fba99946765a0e;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 49d700cb91..47c0f2f2cd 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -25,7 +25,6 @@
 #include "support/copied_ptr.h"
 
 #include <list>
-#include <set>
 #include <vector>
 
 namespace lyx {
@@ -129,7 +128,7 @@ public:
 	/// List of modules in use
 	LayoutModuleList const & getModules() const { return layoutModules_; }
 	/// List of default modules the user has removed
-	std::set<std::string> const & getRemovedModules() const 
+	std::list<std::string> const & getRemovedModules() const 
 			{ return removedModules_; }
 	///
 	/// Add a module to the list of modules in use. This checks only that the
@@ -142,7 +141,7 @@ public:
 	bool moduleCanBeAdded(std::string const & modName) const;
 	///
 	void addRemovedModule(std::string const & modName) 
-			{ removedModules_.insert(modName); }
+			{ removedModules_.push_back(modName); }
 	/// Clear the list
 	void clearLayoutModules() { layoutModules_.clear(); }
 	/// Clear the removed module list
@@ -346,20 +345,6 @@ private:
 	void readModules(Lexer &);
 	///
 	void readRemovedModules(Lexer &);
-	/// Called when the document class changes. Removes modules
-	/// excluded by, provided by, etc, the document class.
-	/// \return true if modules were consistent, false if changes had
-	/// to be made.
-	bool removeBadModules();
-	/// Adds default modules, if they're addable.
-	void addDefaultModules();
-	/// checks for consistency among modules: makes sure requirements
-	/// are met, no modules exclude one another, etc, and resolves any
-	/// such conflicts, leaving us with a consistent collection.
-	/// \return true if modules were consistent, false if changes had
-	/// to be made.
-	bool checkModuleConsistency();
-
 	/// for use with natbib
 	CiteEngine cite_engine_;
 	///
@@ -368,7 +353,7 @@ private:
 	LayoutModuleList layoutModules_;
 	/// this is for modules that are required by the document class but that
 	/// the user has chosen not to use
-	std::set<std::string> removedModules_;
+	std::list<std::string> removedModules_;
 
 	/** Use the Pimpl idiom to hide those member variables that would otherwise
 	 *  drag in other header files.