Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / LayoutModuleList.h

diff --git a/src/LayoutModuleList.h b/src/LayoutModuleList.h
index 245b6a7e693bd54ba3d77080559cade71c0baf2e..f5741dede1657d6c3d016d01dd3f2222c28d1d47 100644 (file)
--- a/src/LayoutModuleList.h
+++ b/src/LayoutModuleList.h
@@ -57,7 +57,10 @@ public:
        std::list<std::string> const & list() const { return lml_; }
        /// Checks to make sure module's requriements are satisfied, that it does
        /// not conflict with already-present modules, isn't already loaded, etc.
-       bool moduleCanBeAdded(std::string const & modName, 
+       bool moduleCanBeAdded(std::string const & modName,
+                       LayoutFile const * const lay) const;
+       /// Like !moduleCanBeAdded(), but does not check requirements
+       bool moduleConflicts(std::string const & modName,
                        LayoutFile const * const lay) const;
        /// If the user changes the base class for a given document, then the
        /// associated module list has to be updated. This just calls