Fix bug 4441. GuiRef: Ok button must be default.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 6712468a7f7cd63f36ed3b426da850bfeac729a9..47c0f2f2cd40c0dfdb58ea5811c3013ea1f37cca 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -15,8 +15,9 @@
 #ifndef BUFFERPARAMS_H
 #define BUFFERPARAMS_H
 
-#include "Font.h"
 #include "Citation.h"
+#include "Font.h"
+#include "LayoutModuleList.h"
 #include "paper.h"
 
 #include "insets/InsetQuotes.h"
@@ -24,7 +25,6 @@
 #include "support/copied_ptr.h"
 
 #include <list>
-#include <set>
 #include <vector>
 
 namespace lyx {
@@ -53,8 +53,6 @@ class VSpace;
  */
 class BufferParams {
 public:
-       ///
-       typedef std::list<std::string> LayoutModuleList;
        ///
        enum ParagraphSeparation {
                ///
@@ -130,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
@@ -143,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
@@ -347,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_;
        ///
@@ -369,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.