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

[lyx.git] / src / LayoutFile.h

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index 55807e907745a767fef2b05141fa773cc7930805..31031eae8e6b0221d408d1c2f6a3e622d7347060 100644 (file)
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -29,10 +29,6 @@ namespace lyx {
 
 class Layout;
 
-/// Reads the style files
-extern bool LyXSetStyle();
-
-
 /// Index into LayoutFileList. Basically a 'strong typedef'.
 class LayoutFileIndex {
 public:
@@ -80,6 +76,7 @@ private:
                        std::string const & className = std::string(),
                        std::string const & description = std::string(),
                        std::string const & prerequisites = std::string(),
+                       std::string const & category = std::string(),
                        bool texclassavail = false);
        /// The only class that should create a LayoutFile is
        /// LayoutFileList, which calls the private constructor.
@@ -115,7 +112,9 @@ public:
        /// Clears the textclass so as to force it to be reloaded
        void reset(LayoutFileIndex const & tc);
 
-       /// add a default textclass with all standard layouts.
+       /// Add a default textclass with all standard layouts.
+       /// Note that this will over-write any information we may have
+       /// gotten from textclass.lst about this class.
        LayoutFileIndex addEmptyClass(std::string const & textclass);
 
        /// add a textclass from user local directory.