Russian layouttranslations reviewed by Yuriy, Dec 13 2017.

[lyx.git] / src / LayoutModuleList.h

diff --git a/src/LayoutModuleList.h b/src/LayoutModuleList.h
index 245b6a7e693bd54ba3d77080559cade71c0baf2e..c56e5725725225890c596ab4e069ec6758894127 100644 (file)
--- a/src/LayoutModuleList.h
+++ b/src/LayoutModuleList.h
@@ -20,9 +20,9 @@ namespace lyx {
 class LayoutFile;
 
 /**
-       Represents a list of modules, such as might be associated with 
+       Represents a list of modules, such as might be associated with
        a particular document. Provides methods for adding modules, checking
-       if a module can be added, and, importantly, adapting the list to a 
+       if a module can be added, and, importantly, adapting the list to a
        new DocumentClass.
 */
 class LayoutModuleList {
@@ -50,14 +50,17 @@ public:
                { return lml_.insert(pos, str); }
        ///
        void push_back(std::string const & str) { lml_.push_back(str); }
-       /// 
+       ///
        size_t size() const { return lml_.size(); }
        /// This is needed in GuiDocument. It seems better than an
        /// implicit conversion.
        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
@@ -93,5 +96,5 @@ private:
        ///
        std::list<std::string> lml_;
 };
-}
+} // namespace lyx
 #endif