X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.h;h=e27f58befb2eb1e81d1287394cff1a1b18459bbc;hb=11e679f73ecca718c61307973c3d67739354e1c7;hp=6ecc035da57f172e5aaeb6ad726ee7e6842bdbfa;hpb=cf8646083f038ebcca32aec577594a52d70198e4;p=lyx.git

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index 6ecc035da5..e27f58befb 100644
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -20,7 +20,6 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <set>
 #include <string>
 #include <vector>
 
@@ -29,17 +28,13 @@ namespace lyx {
 
 class Layout;
 
-/// Reads the style files
-extern bool LyXSetStyle();
-
-
 /// Index into LayoutFileList. Basically a 'strong typedef'.
 class LayoutFileIndex {
 public:
 	///
 	typedef std::string base_type;
 	///
-	LayoutFileIndex(base_type t) { data_ = t; }
+	LayoutFileIndex(base_type const & t) : data_(t) { }
 	///
 	operator base_type() const { return data_; }
 	///
@@ -64,7 +59,7 @@ private:
 class LayoutFile : public TextClass, boost::noncopyable {
 public:
 	/// check whether the TeX class is available
-	bool isTeXClassAvailable() const { return texClassAvail_; }
+	bool isTeXClassAvailable() const { return tex_class_avail_; }
 	///
 	LayoutModuleList const & defaultModules() const 
 			{ return default_modules_; }
@@ -80,12 +75,13 @@ 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.
 	friend class LayoutFileList;
 	/// can't create empty LayoutFile
-	LayoutFile() {};
+	LayoutFile() {}
 };
 
 
@@ -94,8 +90,6 @@ private:
 /// via LayoutFileList::get()
 class LayoutFileList {
 public:
-	///
-	LayoutFileList() {}
 	///
 	~LayoutFileList();
 	/// \return The sole instance of this class.
@@ -115,7 +109,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.
@@ -130,6 +126,8 @@ public:
 	bool load(std::string const & name, std::string const & buf_path);
 
 private:
+	///
+	LayoutFileList() {}
 	///
 	typedef std::map<std::string, LayoutFile *> ClassMap;
 	/// noncopyable