anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make Andre a little happier.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28560 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-02-19 19:10:59 +00:00
parent 00f5adcfe3
commit 084de459fb
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BufferParams.cpp
View File

@ -708,8 +708,8 @@ void BufferParams::writeFile(ostream & os) const
// removed modules // removed modules
if (!removedModules_.empty()) { if (!removedModules_.empty()) {
os << "\\begin_removed_modules" << '\n'; os << "\\begin_removed_modules" << '\n';
set<string>::const_iterator it = removedModules_.begin(); list<string>::const_iterator it = removedModules_.begin();
set<string>::const_iterator en = removedModules_.end(); list<string>::const_iterator en = removedModules_.end();
for (; it != en; it++) for (; it != en; it++)
os << *it << '\n'; os << *it << '\n';
os << "\\end_removed_modules" << '\n'; os << "\\end_removed_modules" << '\n';
@ -1937,15 +1937,15 @@ void BufferParams::readRemovedModules(Lexer & lex)
string mod = lex.getString(); string mod = lex.getString();
if (mod == "\\end_removed_modules") if (mod == "\\end_removed_modules")
break; break;
removedModules_.insert(mod); removedModules_.push_back(mod);
lex.eatLine(); lex.eatLine();
} }
// now we want to remove any removed modules that were previously // now we want to remove any removed modules that were previously
// added. normally, that will be because default modules were added in // added. normally, that will be because default modules were added in
// setBaseClass(), which gets called when \textclass is read at the // setBaseClass(), which gets called when \textclass is read at the
// start of the read. // start of the read.
set<string>::const_iterator rit = removedModules_.begin(); list<string>::const_iterator rit = removedModules_.begin();
set<string>::const_iterator const ren = removedModules_.end(); list<string>::const_iterator const ren = removedModules_.end();
for (; rit != ren; rit++) { for (; rit != ren; rit++) {
LayoutModuleList::iterator const mit = layoutModules_.begin(); LayoutModuleList::iterator const mit = layoutModules_.begin();
LayoutModuleList::iterator const men = layoutModules_.end(); LayoutModuleList::iterator const men = layoutModules_.end();

7
src/BufferParams.h
View File

@ -25,7 +25,6 @@
#include "support/copied_ptr.h" #include "support/copied_ptr.h"
#include <list> #include <list>
#include <set>
#include <vector> #include <vector>
namespace lyx { namespace lyx {
@ -129,7 +128,7 @@ public:
/// List of modules in use /// List of modules in use
LayoutModuleList const & getModules() const { return layoutModules_; } LayoutModuleList const & getModules() const { return layoutModules_; }
/// List of default modules the user has removed /// List of default modules the user has removed
std::set<std::string> const & getRemovedModules() const std::list<std::string> const & getRemovedModules() const
{ return removedModules_; } { return removedModules_; }
/// ///
/// Add a module to the list of modules in use. This checks only that the /// 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; bool moduleCanBeAdded(std::string const & modName) const;
/// ///
void addRemovedModule(std::string const & modName) void addRemovedModule(std::string const & modName)
{ removedModules_.insert(modName); } { removedModules_.push_back(modName); }
/// Clear the list /// Clear the list
void clearLayoutModules() { layoutModules_.clear(); } void clearLayoutModules() { layoutModules_.clear(); }
/// Clear the removed module list /// Clear the removed module list
@ -368,7 +367,7 @@ private:
LayoutModuleList layoutModules_; LayoutModuleList layoutModules_;
/// this is for modules that are required by the document class but that /// this is for modules that are required by the document class but that
/// the user has chosen not to use /// 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 /** Use the Pimpl idiom to hide those member variables that would otherwise
* drag in other header files. * drag in other header files.