commit df7b0eb61d73891e7bc1ddc753d5c0b84a4c3958
Author: Richard Heck <[email protected]>
Date:   Fri Nov 14 23:40:07 2014 +0000

    Get rid of boost::noncopyable.

diff --git a/src/LaTeX.h b/src/LaTeX.h
index a4fcecd..5db3889 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -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();
 
diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index e27f58b..1632cda 100644
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -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(),
diff --git a/src/insets/ExternalTemplate.h b/src/insets/ExternalTemplate.h
index 4392870..18d9835 100644
--- a/src/insets/ExternalTemplate.h
+++ b/src/insets/ExternalTemplate.h
@@ -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;

Reply via email to