This patch removes the grfx namespace and replaces it with
lyx::graphics.
namespace alias is used to reduce the hassle work developers.
Both xforms and qt are fixed.
Please comment.
? newfile1.lyx
? qt-build
? string-build
? xforms-build
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.489
diff -u -p -r1.489 buffer.C
--- src/buffer.C 30 Jun 2003 23:55:50 -0000 1.489
+++ src/buffer.C 3 Jul 2003 19:48:13 -0000
@@ -110,6 +110,8 @@ using std::for_each;
using lyx::pos_type;
using lyx::textclass_type;
+namespace grfx = lyx::graphics;
+
// all these externs should eventually be removed.
extern BufferList bufferlist;
Index: src/lyx_main.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_main.C,v
retrieving revision 1.153
diff -u -p -r1.153 lyx_main.C
--- src/lyx_main.C 30 Jun 2003 23:55:53 -0000 1.153
+++ src/lyx_main.C 3 Jul 2003 19:48:15 -0000
@@ -3,7 +3,7 @@
* Copyright 1995-2002 the LyX Team
* Read the file COPYING
*
- * \author unknown
+ * \author Lars Gullik Bjønnes
*/
#include <config.h>
@@ -58,6 +58,8 @@ using std::exit;
using std::signal;
using std::system;
#endif
+
+namespace grfx = lyx::graphics;
extern void LoadLyXFile(string const &);
extern void QuitLyX();
Index: src/lyxrc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxrc.C,v
retrieving revision 1.149
diff -u -p -r1.149 lyxrc.C
--- src/lyxrc.C 30 Jun 2003 23:55:55 -0000 1.149
+++ src/lyxrc.C 3 Jul 2003 19:48:17 -0000
@@ -40,6 +40,8 @@ using std::ios;
using std::endl;
using std::vector;
+namespace grfx = lyx::graphics;
+
class kb_keymap;
extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
Index: src/lyxrc.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxrc.h,v
retrieving revision 1.73
diff -u -p -r1.73 lyxrc.h
--- src/lyxrc.h 31 Mar 2003 02:59:32 -0000 1.73
+++ src/lyxrc.h 3 Jul 2003 19:48:18 -0000
@@ -337,7 +337,7 @@ enum LyXRCTags {
///
int label_init_length;
///
- grfx::DisplayType display_graphics;
+ lyx::graphics::DisplayType display_graphics;
///
bool show_banner;
///
Index: src/frontends/Painter.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Painter.h,v
retrieving revision 1.9
diff -u -p -r1.9 Painter.h
--- src/frontends/Painter.h 13 Feb 2003 16:52:46 -0000 1.9
+++ src/frontends/Painter.h 3 Jul 2003 19:48:18 -0000
@@ -19,9 +19,12 @@
class LyXFont;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Image;
}
+}
+
/**
* Painter - A painter class to encapsulate all graphics parameters and operations
@@ -132,7 +135,7 @@ public:
/// draw an image from the image cache
virtual Painter & image(int x, int y,
int w, int h,
- grfx::Image const & image) = 0;
+ lyx::graphics::Image const & image) = 0;
/// draw a string at position x, y (y is the baseline)
virtual Painter & text(int x, int y,
Index: src/frontends/screen.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/screen.C,v
retrieving revision 1.45
diff -u -p -r1.45 screen.C
--- src/frontends/screen.C 30 Jun 2003 23:56:10 -0000 1.45
+++ src/frontends/screen.C 3 Jul 2003 19:48:19 -0000
@@ -48,6 +48,8 @@ using std::min;
using std::max;
using std::endl;
+namespace grfx = lyx::graphics;
+
namespace {
class SplashScreen : boost::noncopyable, boost::signals::trackable {
Index: src/frontends/qt2/QExternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QExternal.C,v
retrieving revision 1.21
diff -u -p -r1.21 QExternal.C
--- src/frontends/qt2/QExternal.C 30 Jun 2003 23:56:11 -0000 1.21
+++ src/frontends/qt2/QExternal.C 3 Jul 2003 19:48:19 -0000
@@ -33,6 +33,8 @@
using namespace lyx::support;
+namespace grfx = lyx::graphics;
+
typedef QController<ControlExternal, QView<QExternalDialog> > base_class;
Index: src/frontends/qt2/QLImage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLImage.C,v
retrieving revision 1.20
diff -u -p -r1.20 QLImage.C
--- src/frontends/qt2/QLImage.C 30 Jun 2003 23:56:11 -0000 1.20
+++ src/frontends/qt2/QLImage.C 3 Jul 2003 19:48:19 -0000
@@ -32,7 +32,8 @@ using namespace lyx::support;
using std::find_if;
using std::endl;
-namespace grfx {
+namespace lyx {
+namespace graphics {
/// Access to this class is through this static method.
Image::ImagePtr QLImage::newImage()
@@ -253,4 +254,5 @@ void QLImage::scale(Params const & param
xformed_pixmap_ = xformed_pixmap_.xForm(m);
}
-} // namespace grfx
+} // namespace graphics
+} // lyx
Index: src/frontends/qt2/QLImage.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLImage.h,v
retrieving revision 1.5
diff -u -p -r1.5 QLImage.h
--- src/frontends/qt2/QLImage.h 13 Feb 2003 16:52:52 -0000 1.5
+++ src/frontends/qt2/QLImage.h 3 Jul 2003 19:48:19 -0000
@@ -18,7 +18,8 @@
#include <qpixmap.h>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class QLImage : public Image {
public:
@@ -80,6 +81,7 @@ private:
QPixmap xformed_pixmap_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // QLIMAGE_H
Index: src/frontends/qt2/QLPainter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLPainter.C,v
retrieving revision 1.21
diff -u -p -r1.21 QLPainter.C
--- src/frontends/qt2/QLPainter.C 24 May 2003 15:19:05 -0000 1.21
+++ src/frontends/qt2/QLPainter.C 3 Jul 2003 19:48:20 -0000
@@ -36,6 +36,7 @@
using std::endl;
+namespace grfx = lyx::graphics;
QLPainter::QLPainter(QWorkArea & qwa)
: Painter(), owner_(qwa), paint_check_(0)
Index: src/frontends/qt2/QLPainter.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLPainter.h,v
retrieving revision 1.7
diff -u -p -r1.7 QLPainter.h
--- src/frontends/qt2/QLPainter.h 13 Feb 2003 16:52:52 -0000 1.7
+++ src/frontends/qt2/QLPainter.h 3 Jul 2003 19:48:20 -0000
@@ -100,7 +100,7 @@ public:
/// draw an image from the image cache
virtual Painter & image(int x, int y,
int w, int h,
- grfx::Image const & image);
+ lyx::graphics::Image const & image);
/// draw a string at position x, y (y is the baseline)
virtual Painter & text(int x, int y,
Index: src/frontends/qt2/QPrefs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefs.C,v
retrieving revision 1.36
diff -u -p -r1.36 QPrefs.C
--- src/frontends/qt2/QPrefs.C 30 Jun 2003 23:56:11 -0000 1.36
+++ src/frontends/qt2/QPrefs.C 3 Jul 2003 19:48:21 -0000
@@ -63,6 +63,8 @@ using std::setfill;
using std::setw;
using std::endl;
+namespace grfx = lyx::graphics;
+
typedef Qt2CB<ControlPrefs, Qt2DB<QPrefsDialog> > base_class;
Index: src/frontends/qt2/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/lyx_gui.C,v
retrieving revision 1.44
diff -u -p -r1.44 lyx_gui.C
--- src/frontends/qt2/lyx_gui.C 30 Jun 2003 23:56:11 -0000 1.44
+++ src/frontends/qt2/lyx_gui.C 3 Jul 2003 19:48:21 -0000
@@ -119,7 +119,7 @@ void parse_init(int & argc, char * argv[
{
static LQApplication a(argc, argv);
- using namespace grfx;
+ using namespace lyx::graphics;
Image::newImage = boost::bind(&QLImage::newImage);
Image::loadableFormats = boost::bind(&QLImage::loadableFormats);
Index: src/frontends/xforms/FormExternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormExternal.C,v
retrieving revision 1.35
diff -u -p -r1.35 FormExternal.C
--- src/frontends/xforms/FormExternal.C 30 Jun 2003 23:56:13 -0000 1.35
+++ src/frontends/xforms/FormExternal.C 3 Jul 2003 19:48:22 -0000
@@ -32,6 +32,8 @@
using namespace lyx::support;
+namespace grfx = lyx::graphics;
+
typedef FormController<ControlExternal, FormView<FD_external> > base_class;
FormExternal::FormExternal(Dialog & parent)
Index: src/frontends/xforms/FormPreferences.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPreferences.C,v
retrieving revision 1.165
diff -u -p -r1.165 FormPreferences.C
--- src/frontends/xforms/FormPreferences.C 30 Jun 2003 23:56:13 -0000 1.165
+++ src/frontends/xforms/FormPreferences.C 3 Jul 2003 19:48:24 -0000
@@ -68,6 +68,8 @@ extern string user_lyxdir;
using namespace lyx::support;
+namespace grfx = lyx::graphics;
+
namespace {
// These should probably go inside the class definition...
Index: src/frontends/xforms/XPainter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/XPainter.C,v
retrieving revision 1.17
diff -u -p -r1.17 XPainter.C
--- src/frontends/xforms/XPainter.C 30 Jun 2003 23:56:15 -0000 1.17
+++ src/frontends/xforms/XPainter.C 3 Jul 2003 19:48:25 -0000
@@ -35,6 +35,7 @@ using namespace lyx::support;
using std::endl;
using std::max;
+namespace grfx = lyx::graphics;
XPainter::XPainter(XWorkArea & xwa)
: Painter(), owner_(xwa)
Index: src/frontends/xforms/XPainter.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/XPainter.h,v
retrieving revision 1.8
diff -u -p -r1.8 XPainter.h
--- src/frontends/xforms/XPainter.h 13 Feb 2003 16:52:59 -0000 1.8
+++ src/frontends/xforms/XPainter.h 3 Jul 2003 19:48:25 -0000
@@ -95,7 +95,7 @@ public:
/// draw an image from the image cache
virtual Painter & image(int x, int y,
int w, int h,
- grfx::Image const & image);
+ lyx::graphics::Image const & image);
/// draw a string at position x, y (y is the baseline)
virtual Painter & text(int x, int y,
Index: src/frontends/xforms/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/lyx_gui.C,v
retrieving revision 1.39
diff -u -p -r1.39 lyx_gui.C
--- src/frontends/xforms/lyx_gui.C 30 Jun 2003 23:56:15 -0000 1.39
+++ src/frontends/xforms/lyx_gui.C 3 Jul 2003 19:48:25 -0000
@@ -172,7 +172,7 @@ void parse_init(int & argc, char * argv[
lyxColorHandler.reset(new LyXColorHandler());
- using namespace grfx;
+ using namespace lyx::graphics;
// connect the image loader based on the xforms library
Image::newImage = boost::bind(&xformsImage::newImage);
Index: src/frontends/xforms/xformsImage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/xformsImage.C,v
retrieving revision 1.26
diff -u -p -r1.26 xformsImage.C
--- src/frontends/xforms/xformsImage.C 30 Jun 2003 23:56:15 -0000 1.26
+++ src/frontends/xforms/xformsImage.C 3 Jul 2003 19:48:26 -0000
@@ -45,7 +45,8 @@ unsigned int packedcolor(LColor::color c
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
/// Access to this class is through this static method.
Image::ImagePtr xformsImage::newImage()
@@ -364,10 +365,13 @@ void xformsImage::errorCB(string const &
finishedLoading(false);
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
namespace {
+
+namespace grfx = lyx::graphics;
extern "C" {
Index: src/frontends/xforms/xformsImage.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/xformsImage.h,v
retrieving revision 1.7
diff -u -p -r1.7 xformsImage.h
--- src/frontends/xforms/xformsImage.h 13 Feb 2003 16:52:59 -0000 1.7
+++ src/frontends/xforms/xformsImage.h 3 Jul 2003 19:48:26 -0000
@@ -24,7 +24,8 @@
struct flimage_;
typedef flimage_ FL_IMAGE;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class xformsImage : public Image
{
@@ -104,6 +105,7 @@ private:
PixmapStatus pixmap_status_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // XFORMSIMAGE_H
Index: src/graphics/GraphicsCache.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsCache.C,v
retrieving revision 1.36
diff -u -p -r1.36 GraphicsCache.C
--- src/graphics/GraphicsCache.C 30 Jun 2003 23:56:16 -0000 1.36
+++ src/graphics/GraphicsCache.C 3 Jul 2003 19:48:26 -0000
@@ -25,7 +25,8 @@
using namespace lyx::support;
-namespace grfx {
+namespace lyx {
+namespace graphics {
/** The cache contains one item per file, so use a map to find the
* cache item quickly by filename.
@@ -113,4 +114,5 @@ Cache::ItemPtr const Cache::item(string
return it->second;
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/GraphicsCache.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsCache.h,v
retrieving revision 1.28
diff -u -p -r1.28 GraphicsCache.h
--- src/graphics/GraphicsCache.h 13 Feb 2003 16:53:00 -0000 1.28
+++ src/graphics/GraphicsCache.h 3 Jul 2003 19:48:26 -0000
@@ -26,7 +26,8 @@
#include <boost/shared_ptr.hpp>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class CacheItem;
@@ -79,6 +80,7 @@ private:
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSCACHE_H
Index: src/graphics/GraphicsCacheItem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsCacheItem.C,v
retrieving revision 1.52
diff -u -p -r1.52 GraphicsCacheItem.C
--- src/graphics/GraphicsCacheItem.C 30 Jun 2003 23:56:16 -0000 1.52
+++ src/graphics/GraphicsCacheItem.C 3 Jul 2003 19:48:26 -0000
@@ -32,7 +32,8 @@ using namespace lyx::support;
using std::endl;
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct CacheItem::Impl : public boost::signals::trackable {
@@ -311,11 +312,14 @@ void CacheItem::Impl::imageLoaded(bool s
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
namespace {
+namespace grfx = lyx::graphics;
+
string const findTargetFormat(string const & from)
{
typedef grfx::Image::FormatList FormatList;
@@ -351,7 +355,8 @@ string const findTargetFormat(string con
} // anon namespace
-namespace grfx {
+namespace lyx {
+namespace graphics {
void CacheItem::Impl::convertToDisplayFormat()
{
@@ -409,4 +414,5 @@ void CacheItem::Impl::convertToDisplayFo
converter_->startConversion();
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/GraphicsCacheItem.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsCacheItem.h,v
retrieving revision 1.36
diff -u -p -r1.36 GraphicsCacheItem.h
--- src/graphics/GraphicsCacheItem.h 13 Feb 2003 16:53:00 -0000 1.36
+++ src/graphics/GraphicsCacheItem.h 3 Jul 2003 19:48:27 -0000
@@ -37,7 +37,8 @@
class InsetGraphics;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Image;
class Converter;
@@ -95,6 +96,7 @@ private:
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSCACHEITEM_H
Index: src/graphics/GraphicsConverter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsConverter.C,v
retrieving revision 1.33
diff -u -p -r1.33 GraphicsConverter.C
--- src/graphics/GraphicsConverter.C 30 Jun 2003 23:56:16 -0000 1.33
+++ src/graphics/GraphicsConverter.C 3 Jul 2003 19:48:27 -0000
@@ -36,7 +36,8 @@ using namespace lyx::support;
using std::endl;
using std::ostream;
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct Converter::Impl : public boost::signals::trackable {
///
@@ -108,7 +109,9 @@ string const & Converter::convertedFile(
return pimpl_->finished_ ? pimpl_->to_file_ : empty;
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
+
//------------------------------
// Implementation details follow
@@ -126,7 +129,8 @@ bool build_script(string const & from_fi
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
Converter::Impl::Impl(string const & from_file, string const & to_file_base,
string const & from_format, string const & to_format)
@@ -223,7 +227,8 @@ void Converter::Impl::converted(pid_t /*
}
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
namespace {
Index: src/graphics/GraphicsConverter.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsConverter.h,v
retrieving revision 1.15
diff -u -p -r1.15 GraphicsConverter.h
--- src/graphics/GraphicsConverter.h 13 Feb 2003 16:53:00 -0000 1.15
+++ src/graphics/GraphicsConverter.h 3 Jul 2003 19:48:27 -0000
@@ -22,7 +22,8 @@
#include <boost/scoped_ptr.hpp>
#include <boost/utility.hpp>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Converter : boost::noncopyable {
public:
@@ -65,6 +66,7 @@ private:
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSCONVERTER_H
Index: src/graphics/GraphicsImage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsImage.C,v
retrieving revision 1.16
diff -u -p -r1.16 GraphicsImage.C
--- src/graphics/GraphicsImage.C 13 Feb 2003 16:53:00 -0000 1.16
+++ src/graphics/GraphicsImage.C 3 Jul 2003 19:48:27 -0000
@@ -19,7 +19,8 @@
using std::endl;
using std::abs;
-namespace grfx {
+namespace lyx {
+namespace graphics {
// This is to be connected to a function that will return a new
// instance of a viable derived class.
@@ -53,4 +54,5 @@ Image::getScaledDimensions(Params const
return std::make_pair(width, height);
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/GraphicsImage.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsImage.h,v
retrieving revision 1.16
diff -u -p -r1.16 GraphicsImage.h
--- src/graphics/GraphicsImage.h 13 Feb 2003 16:53:00 -0000 1.16
+++ src/graphics/GraphicsImage.h 3 Jul 2003 19:48:27 -0000
@@ -33,7 +33,8 @@
#include <vector>
#include <utility>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Params;
@@ -107,6 +108,7 @@ protected:
getScaledDimensions(Params const & params) const;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSIMAGE_H
Index: src/graphics/GraphicsLoader.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsLoader.C,v
retrieving revision 1.18
diff -u -p -r1.18 GraphicsLoader.C
--- src/graphics/GraphicsLoader.C 5 Jun 2003 22:45:51 -0000 1.18
+++ src/graphics/GraphicsLoader.C 3 Jul 2003 19:48:27 -0000
@@ -25,7 +25,8 @@
#include <list>
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct Loader::Impl : boost::signals::trackable {
///
@@ -296,4 +297,5 @@ void Loader::Impl::startLoading()
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/GraphicsLoader.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsLoader.h,v
retrieving revision 1.17
diff -u -p -r1.17 GraphicsLoader.h
--- src/graphics/GraphicsLoader.h 5 Jun 2003 22:45:51 -0000 1.17
+++ src/graphics/GraphicsLoader.h 3 Jul 2003 19:48:27 -0000
@@ -32,7 +32,8 @@
class Inset;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Image;
class Params;
@@ -106,6 +107,7 @@ private:
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSLOADER_H
Index: src/graphics/GraphicsParams.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsParams.C,v
retrieving revision 1.28
diff -u -p -r1.28 GraphicsParams.C
--- src/graphics/GraphicsParams.C 13 Feb 2003 16:53:00 -0000 1.28
+++ src/graphics/GraphicsParams.C 3 Jul 2003 19:48:27 -0000
@@ -18,7 +18,8 @@
using std::abs;
-namespace grfx {
+namespace lyx {
+namespace graphics {
Params::Params()
: display(ColorDisplay),
@@ -95,4 +96,5 @@ bool operator!=(BoundingBox const & a, B
return !(a == b);
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/GraphicsParams.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsParams.h,v
retrieving revision 1.20
diff -u -p -r1.20 GraphicsParams.h
--- src/graphics/GraphicsParams.h 13 Feb 2003 16:53:00 -0000 1.20
+++ src/graphics/GraphicsParams.h 3 Jul 2003 19:48:27 -0000
@@ -18,7 +18,8 @@
#include "LString.h"
-namespace grfx {
+namespace lyx {
+namespace graphics {
/** Parse a string of the form "200pt 500pt 300mm 5in" into a
* usable bounding box.
@@ -67,6 +68,7 @@ struct Params
bool operator==(Params const &, Params const &);
bool operator!=(Params const &, Params const &);
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSPARAMS_H
Index: src/graphics/GraphicsTypes.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsTypes.C,v
retrieving revision 1.5
diff -u -p -r1.5 GraphicsTypes.C
--- src/graphics/GraphicsTypes.C 4 Nov 2002 00:15:55 -0000 1.5
+++ src/graphics/GraphicsTypes.C 3 Jul 2003 19:48:28 -0000
@@ -14,7 +14,8 @@
#include "graphics/GraphicsTypes.h"
-namespace grfx {
+namespace lyx {
+namespace graphics {
/// The translator between the Display enum and corresponding lyx string.
Translator<DisplayType, string> displayTranslator(DefaultDisplay, "default");
@@ -41,4 +42,5 @@ void setDisplayTranslator()
}
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/GraphicsTypes.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsTypes.h,v
retrieving revision 1.13
diff -u -p -r1.13 GraphicsTypes.h
--- src/graphics/GraphicsTypes.h 30 Jun 2003 23:56:16 -0000 1.13
+++ src/graphics/GraphicsTypes.h 3 Jul 2003 19:48:28 -0000
@@ -18,7 +18,8 @@
#include "LString.h"
#include "support/translator.h"
-namespace grfx {
+namespace lyx {
+namespace graphics {
/// The status of the loading process
enum ImageStatus {
@@ -68,6 +69,7 @@ extern Translator<DisplayType, string> d
///
void setDisplayTranslator();
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSTYPES_H
Index: src/graphics/LoaderQueue.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/LoaderQueue.C,v
retrieving revision 1.5
diff -u -p -r1.5 LoaderQueue.C
--- src/graphics/LoaderQueue.C 6 May 2003 20:34:11 -0000 1.5
+++ src/graphics/LoaderQueue.C 3 Jul 2003 19:48:28 -0000
@@ -19,8 +19,8 @@
using std::endl;
using std::list;
-
-namespace grfx {
+namespace lyx {
+namespace graphics {
int LoaderQueue::s_numimages_ = 5;
int LoaderQueue::s_millisecs_ = 500;
@@ -113,4 +113,5 @@ void LoaderQueue::touch(Cache::ItemPtr c
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/LoaderQueue.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/LoaderQueue.h,v
retrieving revision 1.4
diff -u -p -r1.4 LoaderQueue.h
--- src/graphics/LoaderQueue.h 25 Feb 2003 15:17:53 -0000 1.4
+++ src/graphics/LoaderQueue.h 3 Jul 2003 19:48:28 -0000
@@ -29,7 +29,8 @@
#include <set>
#include <queue>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class LoaderQueue {
public:
@@ -74,6 +75,7 @@ private:
void stopLoader();
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // LOADERQUEUE_H
Index: src/graphics/PreviewImage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/PreviewImage.C,v
retrieving revision 1.14
diff -u -p -r1.14 PreviewImage.C
--- src/graphics/PreviewImage.C 30 Jun 2003 23:56:16 -0000 1.14
+++ src/graphics/PreviewImage.C 3 Jul 2003 19:48:28 -0000
@@ -22,7 +22,8 @@
using namespace lyx::support;
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct PreviewImage::Impl : public boost::signals::trackable {
///
@@ -152,4 +153,5 @@ void PreviewImage::Impl::statusChanged()
}
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/PreviewImage.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/PreviewImage.h,v
retrieving revision 1.10
diff -u -p -r1.10 PreviewImage.h
--- src/graphics/PreviewImage.h 5 Jun 2003 22:45:51 -0000 1.10
+++ src/graphics/PreviewImage.h 3 Jul 2003 19:48:28 -0000
@@ -17,7 +17,8 @@
class Inset;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewLoader;
class Image;
@@ -55,6 +56,7 @@ private:
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // PREVIEWIMAGE_H
Index: src/graphics/PreviewLoader.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/PreviewLoader.C,v
retrieving revision 1.52
diff -u -p -r1.52 PreviewLoader.C
--- src/graphics/PreviewLoader.C 30 Jun 2003 23:56:16 -0000 1.52
+++ src/graphics/PreviewLoader.C 3 Jul 2003 19:48:29 -0000
@@ -117,7 +117,8 @@ typedef InProgressProcesses::value_type
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct PreviewLoader::Impl : public boost::signals::trackable {
///
@@ -241,7 +242,8 @@ Buffer const & PreviewLoader::buffer() c
return pimpl_->buffer();
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
// The details of the Impl
@@ -306,7 +308,8 @@ void InProgress::stop() const
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
: parent_(p), buffer_(b), font_scaling_factor_(0.0)
@@ -637,8 +640,8 @@ void PreviewLoader::Impl::dumpData(ostre
}
}
-} // namespace grfx
-
+} // namespace graphics
+} // namespace lyx
namespace {
Index: src/graphics/PreviewLoader.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/PreviewLoader.h,v
retrieving revision 1.10
diff -u -p -r1.10 PreviewLoader.h
--- src/graphics/PreviewLoader.h 13 Feb 2003 16:53:00 -0000 1.10
+++ src/graphics/PreviewLoader.h 3 Jul 2003 19:48:29 -0000
@@ -25,7 +25,8 @@
class Buffer;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewImage;
@@ -92,6 +93,7 @@ private:
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // PREVIEWLOADER_H
Index: src/graphics/PreviewedInset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/PreviewedInset.C,v
retrieving revision 1.14
diff -u -p -r1.14 PreviewedInset.C
--- src/graphics/PreviewedInset.C 30 Jun 2003 23:56:16 -0000 1.14
+++ src/graphics/PreviewedInset.C 3 Jul 2003 19:48:29 -0000
@@ -30,7 +30,8 @@
using namespace lyx::support;
-namespace grfx {
+namespace lyx {
+namespace graphics {
bool PreviewedInset::activated()
{
@@ -50,15 +51,15 @@ void PreviewedInset::generatePreview()
!view() || !view()->buffer())
return;
- grfx::Previews & previews = grfx::Previews::get();
- grfx::PreviewLoader & loader = previews.loader(view()->buffer());
+ Previews & previews = Previews::get();
+ PreviewLoader & loader = previews.loader(view()->buffer());
addPreview(loader);
if (!snippet_.empty())
loader.startLoading();
}
-void PreviewedInset::addPreview(grfx::PreviewLoader & ploader)
+void PreviewedInset::addPreview(PreviewLoader & ploader)
{
if (!Previews::activated() || !previewWanted())
return;
@@ -88,8 +89,8 @@ void PreviewedInset::removePreview()
if (!view() || !view()->buffer() || snippet_.empty())
return;
- grfx::Previews & previews = grfx::Previews::get();
- grfx::PreviewLoader & loader = previews.loader(view()->buffer());
+ Previews & previews = Previews::get();
+ PreviewLoader & loader = previews.loader(view()->buffer());
loader.remove(snippet_);
snippet_.erase();
pimage_ = 0;
@@ -103,8 +104,8 @@ bool PreviewedInset::previewReady() cons
return false;
if (!pimage_ || snippet_ != pimage_->snippet()) {
- grfx::PreviewLoader & ploader =
- grfx::Previews::get().loader(view()->buffer());
+ PreviewLoader & ploader =
+ Previews::get().loader(view()->buffer());
pimage_ = ploader.preview(snippet_);
}
@@ -115,7 +116,7 @@ bool PreviewedInset::previewReady() cons
}
-void PreviewedInset::imageReady(grfx::PreviewImage const & pimage) const
+void PreviewedInset::imageReady(PreviewImage const & pimage) const
{
// Check snippet against the Inset's current contents
if (snippet_ != pimage.snippet())
@@ -127,4 +128,5 @@ void PreviewedInset::imageReady(grfx::Pr
view()->updateInset(&inset_);
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/PreviewedInset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/PreviewedInset.h,v
retrieving revision 1.11
diff -u -p -r1.11 PreviewedInset.h
--- src/graphics/PreviewedInset.h 26 Feb 2003 13:10:16 -0000 1.11
+++ src/graphics/PreviewedInset.h 3 Jul 2003 19:48:29 -0000
@@ -23,7 +23,8 @@
class Inset;
class BufferView;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewImage;
class PreviewLoader;
@@ -87,7 +88,7 @@ private:
boost::signals::connection connection_;
};
-} // namespace grfx
-
+} // namespace graphics
+} // namespace lyx
#endif // PREVIEWEDINSET_H
Index: src/graphics/Previews.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/Previews.C,v
retrieving revision 1.13
diff -u -p -r1.13 Previews.C
--- src/graphics/Previews.C 30 Jun 2003 23:56:16 -0000 1.13
+++ src/graphics/Previews.C 3 Jul 2003 19:48:29 -0000
@@ -22,9 +22,11 @@
#include <map>
+namespace lyx {
+
using namespace lyx::support;
-namespace grfx {
+namespace graphics {
bool Previews::activated()
{
@@ -99,4 +101,5 @@ void Previews::generateBufferPreviews(Bu
ploader.startLoading();
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
Index: src/graphics/Previews.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/Previews.h,v
retrieving revision 1.9
diff -u -p -r1.9 Previews.h
--- src/graphics/Previews.h 13 Feb 2003 16:53:00 -0000 1.9
+++ src/graphics/Previews.h 3 Jul 2003 19:48:30 -0000
@@ -21,7 +21,8 @@
class Buffer;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewLoader;
@@ -66,6 +67,7 @@ private:
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // PREVIEWS_H
Index: src/insets/inset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/inset.h,v
retrieving revision 1.102
diff -u -p -r1.102 inset.h
--- src/insets/inset.h 30 Jun 2003 23:56:17 -0000 1.102
+++ src/insets/inset.h 3 Jul 2003 19:48:30 -0000
@@ -34,9 +34,11 @@ class WordLangTuple;
class ParagraphList;
class UpdatableInset;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewLoader;
}
+}
/// Insets
class Inset : public InsetBase {
@@ -311,7 +313,7 @@ public:
* Most insets have no interest in this capability, so the method
* defaults to empty.
*/
- virtual void addPreview(grfx::PreviewLoader &) const {}
+ virtual void addPreview(lyx::graphics::PreviewLoader &) const {}
/** Find the PreviewLoader, add a LaTeX snippet to it and
* start the loading process.
Index: src/insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.149
diff -u -p -r1.149 insetcollapsable.C
--- src/insets/insetcollapsable.C 30 Jun 2003 23:56:17 -0000 1.149
+++ src/insets/insetcollapsable.C 3 Jul 2003 19:48:30 -0000
@@ -41,6 +41,7 @@ using std::ostream;
using std::endl;
using std::max;
+namespace grfx = lyx::graphics;
InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
: UpdatableInset(), collapsed_(collapsed), inset(bp),
Index: src/insets/insetcollapsable.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.h,v
retrieving revision 1.110
diff -u -p -r1.110 insetcollapsable.h
--- src/insets/insetcollapsable.h 16 Jun 2003 11:49:30 -0000 1.110
+++ src/insets/insetcollapsable.h 3 Jul 2003 19:48:31 -0000
@@ -167,7 +167,7 @@ public:
bool = true, bool = false);
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
protected:
///
Index: src/insets/insetexternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetexternal.C,v
retrieving revision 1.82
diff -u -p -r1.82 insetexternal.C
--- src/insets/insetexternal.C 30 Jun 2003 23:56:18 -0000 1.82
+++ src/insets/insetexternal.C 3 Jul 2003 19:48:31 -0000
@@ -49,6 +49,7 @@ using namespace lyx::support;
using std::ostream;
using std::endl;
+namespace grfx = lyx::graphics;
namespace {
Index: src/insets/insetexternal.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetexternal.h,v
retrieving revision 1.43
diff -u -p -r1.43 insetexternal.h
--- src/insets/insetexternal.h 16 Jun 2003 11:49:31 -0000 1.43
+++ src/insets/insetexternal.h 3 Jul 2003 19:48:31 -0000
@@ -36,7 +36,7 @@ public:
/// The name of the tempfile used for manipulations.
string tempname;
/// how the inset is displayed by LyX
- grfx::DisplayType display;
+ lyx::graphics::DisplayType display;
/// The scale of the displayed graphic (If shown).
unsigned int lyxscale;
};
Index: src/insets/insetgraphicsParams.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphicsParams.h,v
retrieving revision 1.32
diff -u -p -r1.32 insetgraphicsParams.h
--- src/insets/insetgraphicsParams.h 3 Jun 2003 15:10:10 -0000 1.32
+++ src/insets/insetgraphicsParams.h 3 Jul 2003 19:48:31 -0000
@@ -18,11 +18,16 @@
#include "LString.h"
#include "lyxlength.h"
+namespace grfx = lyx::graphics;
+
class LyXLex;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Params;
}
+}
+
/// This struct holds all the parameters needed by insetGraphics.
struct InsetGraphicsParams
Index: src/insets/insetinclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetinclude.C,v
retrieving revision 1.127
diff -u -p -r1.127 insetinclude.C
--- src/insets/insetinclude.C 30 Jun 2003 23:56:19 -0000 1.127
+++ src/insets/insetinclude.C 3 Jul 2003 19:48:32 -0000
@@ -50,6 +50,8 @@ using std::endl;
using std::vector;
using std::pair;
+namespace grfx = lyx::graphics;
+
extern BufferList bufferlist;
Index: src/insets/insetinclude.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetinclude.h,v
retrieving revision 1.71
diff -u -p -r1.71 insetinclude.h
--- src/insets/insetinclude.h 16 Jun 2003 11:49:31 -0000 1.71
+++ src/insets/insetinclude.h 3 Jul 2003 19:48:32 -0000
@@ -109,7 +109,7 @@ public:
bool loadIfNeeded() const;
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
private:
/// get the text displayed on the button
Index: src/insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.292
diff -u -p -r1.292 insettabular.C
--- src/insets/insettabular.C 30 Jun 2003 23:56:19 -0000 1.292
+++ src/insets/insettabular.C 3 Jul 2003 19:48:35 -0000
@@ -59,6 +59,8 @@ using std::endl;
using std::swap;
using std::max;
+namespace grfx = lyx::graphics;
+
namespace {
int const ADD_TO_HEIGHT = 2;
Index: src/insets/insettabular.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.h,v
retrieving revision 1.126
diff -u -p -r1.126 insettabular.h
--- src/insets/insettabular.h 16 Jun 2003 11:49:33 -0000 1.126
+++ src/insets/insettabular.h 3 Jul 2003 19:48:35 -0000
@@ -211,7 +211,7 @@ public:
bool forceDefaultParagraphs(Inset const * in) const;
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
//
// Public structures and variables
Index: src/insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.415
diff -u -p -r1.415 insettext.C
--- src/insets/insettext.C 30 Jun 2003 23:56:20 -0000 1.415
+++ src/insets/insettext.C 3 Jul 2003 19:48:38 -0000
@@ -76,6 +76,7 @@ using namespace lyx::support;
using lyx::pos_type;
using lyx::textclass_type;
+namespace grfx = lyx::graphics;
// These functions should probably go into bufferview_funcs somehow (Jug)
Index: src/insets/insettext.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.h,v
retrieving revision 1.169
diff -u -p -r1.169 insettext.h
--- src/insets/insettext.h 27 Jun 2003 11:53:41 -0000 1.169
+++ src/insets/insettext.h 3 Jul 2003 19:48:38 -0000
@@ -230,7 +230,7 @@ public:
void appendParagraphs(Buffer * bp, ParagraphList &);
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
//
// Public structures and variables
Index: src/insets/renderers.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/renderers.C,v
retrieving revision 1.2
diff -u -p -r1.2 renderers.C
--- src/insets/renderers.C 30 Jun 2003 23:56:21 -0000 1.2
+++ src/insets/renderers.C 3 Jul 2003 19:48:39 -0000
@@ -28,6 +28,8 @@
using namespace lyx::support;
+namespace grfx = lyx::graphics;
+
RenderInset::RenderInset()
{}
Index: src/insets/renderers.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/renderers.h,v
retrieving revision 1.1
diff -u -p -r1.1 renderers.h
--- src/insets/renderers.h 12 Jun 2003 08:52:36 -0000 1.1
+++ src/insets/renderers.h 3 Jul 2003 19:48:39 -0000
@@ -27,7 +27,7 @@ class MetricsInfo;
class PainterInfo;
-class RenderInset
+class RenderInset
{
public:
virtual ~RenderInset();
@@ -62,7 +62,7 @@ public:
/// This should provide the text for the button
void update(string const &, bool editable);
-
+
/// compute the size of the object returned in dim
virtual void metrics(MetricsInfo & mi, Dimension & dim) const;
/// draw inset and update (xo, yo)-cache
@@ -84,7 +84,7 @@ public:
virtual RenderInset * clone() const;
/// Refresh the info about which file to display and how to display it.
- void update(grfx::Params const & params);
+ void update(lyx::graphics::Params const & params);
/// compute the size of the object returned in dim
virtual void metrics(MetricsInfo & mi, Dimension & dim) const;
@@ -109,10 +109,10 @@ private:
/// Is the image ready to draw, or should we display a message instead?
bool readyToDisplay() const;
-
+
/// The stored data.
- grfx::Loader loader_;
- grfx::Params params_;
+ lyx::graphics::Loader loader_;
+ lyx::graphics::Params params_;
/// Cached variable (not copied).
mutable unsigned long checksum_;
Index: src/mathed/formula.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formula.C,v
retrieving revision 1.270
diff -u -p -r1.270 formula.C
--- src/mathed/formula.C 3 Jul 2003 12:03:52 -0000 1.270
+++ src/mathed/formula.C 3 Jul 2003 19:48:39 -0000
@@ -52,6 +52,7 @@
using std::ostream;
using std::vector;
+namespace grfx = lyx::graphics;
class InsetFormula::PreviewImpl : public grfx::PreviewedInset {
public:
Index: src/mathed/formula.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formula.h,v
retrieving revision 1.90
diff -u -p -r1.90 formula.h
--- src/mathed/formula.h 28 Jun 2003 01:23:10 -0000 1.90
+++ src/mathed/formula.h 3 Jul 2003 19:48:39 -0000
@@ -70,7 +70,7 @@ public:
///
void generatePreview() const;
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
///
void mutate(string const & type);
--
Lgb
