X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.h;h=e911aa5a6b41f2ece4a7d9a97b147194bb7958d1;hb=b6aed54c45cf4a479cfd11e3e6851194f5a05947;hp=b71f1230095e2d3c82e1a5993ca19f37c9da562b;hpb=f9fa189e02ef0271b042cabc32f8cf90e0b54cb3;p=lyx.git

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index b71f123009..e911aa5a6b 100644
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -18,9 +18,6 @@
 
 #include "support/strfwd.h"
 
-#include <boost/noncopyable.hpp>
-
-#include <set>
 #include <string>
 #include <vector>
 
@@ -35,7 +32,7 @@ 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_; }
 	///
@@ -57,7 +54,7 @@ private:
 /// Buffer-specific information should therefore be placed in a
 /// DocumentClass object.
 /// 
-class LayoutFile : public TextClass, boost::noncopyable {
+class LayoutFile : public TextClass {
 public:
 	/// check whether the TeX class is available
 	bool isTeXClassAvailable() const { return tex_class_avail_; }
@@ -71,17 +68,21 @@ public:
  	LayoutModuleList const & excludedModules() const 
  			{ return excluded_modules_; }
 private:
+	/// noncopyable
+	LayoutFile(LayoutFile const &);
+	void operator=(LayoutFile const &);
 	/// Construct a layout with default values. Actual values loaded later.
 	explicit LayoutFile(std::string const & filename,
 			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() {}
 };
 
 
@@ -90,8 +91,6 @@ private:
 /// via LayoutFileList::get()
 class LayoutFileList {
 public:
-	///
-	LayoutFileList() {}
 	///
 	~LayoutFileList();
 	/// \return The sole instance of this class.
@@ -119,8 +118,9 @@ public:
 	/// add a textclass from user local directory.
 	/// \return the identifier for the loaded file, or else an
 	/// empty string if no file was loaded.
-	LayoutFileIndex
-		addLocalLayout(std::string const & textclass, std::string const & path);
+	LayoutFileIndex addLocalLayout(std::string const & textclass,
+	                               std::string const & path,
+	                               std::string const & oldpath = empty_string());
 	/// a list of the available classes
 	std::vector<LayoutFileIndex> classList() const;
 
@@ -128,6 +128,8 @@ public:
 	bool load(std::string const & name, std::string const & buf_path);
 
 private:
+	///
+	LayoutFileList() {}
 	///
 	typedef std::map<std::string, LayoutFile *> ClassMap;
 	/// noncopyable