Get rid of boost::noncopyable.

This commit is contained in:
Richard Heck 2014-11-14 23:40:07 +00:00
parent 0f2069b8a5
commit df7b0eb61d
3 changed files with 14 additions and 6 deletions

View File

@ -19,7 +19,6 @@
#include "support/docstring.h"
#include "support/FileName.h"
#include <boost/noncopyable.hpp>
#include <boost/signal.hpp>
#include <vector>
@ -98,7 +97,7 @@ bool operator!=(AuxInfo const &, AuxInfo const &);
* This is required by the LaTeX compiler, and we also make use of it by
* various support::makeAbsPath() calls.
*/
class LaTeX : boost::noncopyable {
class LaTeX {
public:
/** Return values from scanLogFile() and run() (to come)
@ -169,6 +168,10 @@ public:
int scanLogFile(TeXErrors &);
private:
/// noncopyable
LaTeX(LaTeX const &);
void operator=(LaTeX const &);
/// use this for running LaTeX once
int startscript();

View File

@ -18,8 +18,6 @@
#include "support/strfwd.h"
#include <boost/noncopyable.hpp>
#include <string>
#include <vector>
@ -56,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_; }
@ -70,6 +68,9 @@ 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(),

View File

@ -107,7 +107,7 @@ public:
/**
* A singleton class that manages the external inset templates
*/
class TemplateManager : boost::noncopyable {
class TemplateManager {
public:
/// Map from the LyX name of the template to the template structure
typedef std::map<std::string, Template> Templates;
@ -129,6 +129,10 @@ public:
std::string const getPreambleDefByName(std::string const & name) const;
private:
TemplateManager();
/// noncopyable
TemplateManager(TemplateManager const &);
void operator=(TemplateManager const &);
void readTemplates(support::FileName const & path);
void dumpTemplates(std::ostream &) const;
void dumpPreambleDefs(std::ostream &) const;