#include "graphics/GraphicsParams.h"
+#include "support/unique_ptr.h"
+
#include <boost/any.hpp>
-#include <boost/function.hpp>
-#include <string>
+#include <functional>
#include <map>
#include <memory>
+#include <string>
+
namespace lyx {
*/
class TransformCommand {
public:
- typedef std::auto_ptr<TransformCommand const> ptr_type;
+ typedef unique_ptr<TransformCommand const> ptr_type;
virtual ~TransformCommand() {}
/// The string from the External Template that we seek to replace.
class ResizeCommand : public TransformCommand {
protected:
ResizeData data;
- ResizeCommand(ResizeData const & data_) : data(data_) {}
+ explicit ResizeCommand(ResizeData const & data_) : data(data_) {}
private:
virtual std::string const front_placeholder_impl() const
{ return ptr_type(new ResizeLatexCommand(data)); }
private:
- ResizeLatexCommand(ResizeData const & data_)
+ explicit ResizeLatexCommand(ResizeData const & data_)
: ResizeCommand(data_) {}
virtual std::string const front_impl() const;
virtual std::string const back_impl() const;
class RotationCommand : public TransformCommand {
protected:
RotationData data;
- RotationCommand(RotationData const & data_) : data(data_) {}
+ explicit RotationCommand(RotationData const & data_) : data(data_) {}
private:
virtual std::string const front_placeholder_impl() const
{ return ptr_type(new RotationLatexCommand(data)); }
private:
- RotationLatexCommand(RotationData const & data_)
+ explicit RotationLatexCommand(RotationData const & data_)
: RotationCommand(data_) {}
virtual std::string const front_impl() const;
virtual std::string const back_impl() const;
*/
class TransformOption {
public:
- typedef std::auto_ptr<TransformOption const> ptr_type;
+ typedef unique_ptr<TransformOption const> ptr_type;
virtual ~TransformOption() {}
/// The string from the External Template that we seek to replace.
class ClipOption : public TransformOption {
protected:
ClipData data;
- ClipOption(ClipData const & data_) : data(data_) {}
+ explicit ClipOption(ClipData const & data_) : data(data_) {}
private:
virtual std::string const placeholder_impl() const
{ return ptr_type(new ClipLatexOption(data)); }
private:
- ClipLatexOption(ClipData const & data_)
+ explicit ClipLatexOption(ClipData const & data_)
: ClipOption(data_) {}
virtual std::string const option_impl() const;
};
{ return ptr_type(new ExtraOption(data)); }
private:
- ExtraOption(std::string const & data_) : data(data_) {}
+ explicit ExtraOption(std::string const & data_) : data(data_) {}
virtual std::string const placeholder_impl() const
{ return "$$Extra"; }
class ResizeOption : public TransformOption {
protected:
ResizeData data;
- ResizeOption(ResizeData const & data_) : data(data_) {}
+ explicit ResizeOption(ResizeData const & data_) : data(data_) {}
private:
virtual std::string const placeholder_impl() const
{ return ptr_type(new ResizeLatexOption(data)); }
private:
- ResizeLatexOption(ResizeData const & data_)
+ explicit ResizeLatexOption(ResizeData const & data_)
: ResizeOption(data_) {}
virtual std::string const option_impl() const;
};
class RotationOption : public TransformOption {
protected:
RotationData data;
- RotationOption(RotationData const & data_) : data(data_) {}
+ explicit RotationOption(RotationData const & data_) : data(data_) {}
private:
virtual std::string const placeholder_impl() const
{ return ptr_type(new RotationLatexOption(data)); }
private:
- RotationLatexOption(RotationData const & data_)
+ explicit RotationLatexOption(RotationData const & data_)
: RotationOption(data_) {}
virtual std::string const option_impl() const;
};
};
-typedef boost::function<TransformOption::ptr_type(ClipData)>
+typedef std::function<TransformOption::ptr_type(ClipData)>
ClipOptionFactory;
-typedef boost::function<TransformOption::ptr_type(std::string)>
+typedef std::function<TransformOption::ptr_type(std::string)>
ExtraOptionFactory;
-typedef boost::function<TransformOption::ptr_type(ResizeData)>
+typedef std::function<TransformOption::ptr_type(ResizeData)>
ResizeOptionFactory;
-typedef boost::function<TransformOption::ptr_type(RotationData)>
+typedef std::function<TransformOption::ptr_type(RotationData)>
RotationOptionFactory;
-typedef boost::function<TransformCommand::ptr_type(ResizeData)>
+typedef std::function<TransformCommand::ptr_type(ResizeData)>
ResizeCommandFactory;
-typedef boost::function<TransformCommand::ptr_type(RotationData)>
+typedef std::function<TransformCommand::ptr_type(RotationData)>
RotationCommandFactory;
class TransformStore
{
public:
- TransformStore() {}
+ TransformStore() : id(Rotate) {}
/** Stores \c factory and a reminder of what \c data this \c factory
* operates on.