Asger's exchanging of the class and struct keywords.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9502 a592a061-630c-0410-9148-cb99ea01b6c8

src/Bidi.h

@@ -24,7 +24,8 @@ class LyXFont;
 
 
 /// bidi stuff
-struct  Bidi {
+class Bidi {
+public:
 	///
 	bool isBoundary(Buffer const &, Paragraph const & par,
 			lyx::pos_type pos) const;

src/BufferView.h

@@ -174,9 +174,9 @@ public:
 
 private:
 	///
-	struct Pimpl;
+	class Pimpl;
 	///
-	friend struct BufferView::Pimpl;
+	friend class BufferView::Pimpl;
 	///
 	Pimpl * pimpl_;
 };

src/BufferView_pimpl.h

@@ -45,7 +45,8 @@ class ViewMetricsInfo;
 
 
 ///
-struct BufferView::Pimpl : public boost::signals::trackable {
+class BufferView::Pimpl : public boost::signals::trackable {
+public:
 	///
 	Pimpl(BufferView & bv, LyXView * owner, int width, int height);
 	///
@@ -151,7 +152,8 @@ private:
 	///
 	bool using_xterm_cursor;
 	///
-	struct Position {
+	class Position {
+	public:
 		/// Filename
 		std::string filename;
 		/// Cursor paragraph Id

src/CutAndPaste.C

@@ -66,7 +66,8 @@ typedef limited_stack<pair<ParagraphList, textclass_type> > CutStack;
 
 CutStack theCuts(10);
 
-struct resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
+class resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
+public:
 	void operator()(Paragraph & p) const {
 		p.cleanChanges();
 		p.setInsetOwner(0);

src/DepTable.h

@@ -46,7 +46,8 @@ public:
 	void remove_file(std::string const &);
 private:
 	///
-	struct dep_info {
+	class dep_info {
+	public:
 		/// Previously calculated CRC value
 		unsigned long crc_prev;
 		/// Current CRC value - only re-computed if mtime has changed.

src/InsetList.C

@@ -31,7 +31,8 @@ namespace {
 
 typedef InsetList::InsetTable Table;
 
-struct InsetTablePosLess : public std::binary_function<Table, Table, bool> {
+class InsetTablePosLess : public std::binary_function<Table, Table, bool> {
+public:
 	bool operator()(Table const & t1, Table const & t2) const
 	{
 		return t1.pos < t2.pos;

src/InsetList.h

@@ -24,13 +24,14 @@ class Buffer;
 class InsetList {
 public:
 	///
-	struct InsetTable {
+	class InsetTable {
+	public:
+		///
+		InsetTable(lyx::pos_type p, InsetBase * i) : pos(p), inset(i) {}
 		///
 		lyx::pos_type pos;
 		///
 		InsetBase * inset;
-		///
-		InsetTable(lyx::pos_type p, InsetBase * i) : pos(p), inset(i) {}
 	};
 	///
 	typedef std::vector<InsetTable> List;

src/LColor.C

@@ -42,9 +42,11 @@ struct ColorEntry {
 
 }
 
-struct LColor::Pimpl {
+class LColor::Pimpl {
+public:
 	///
-	struct information {
+	class information {
+	public:
 		/// the name as it appears in the GUI
 		string guiname;
 		/// the name used in LaTeX

src/LColor.h

@@ -222,7 +222,7 @@ private:
 	///
 	void addColor(LColor::color c, std::string const & lyxname) const;
 	///
-	struct Pimpl;
+	class Pimpl;
 	///
 	boost::scoped_ptr<Pimpl> pimpl_;
 };

src/LaTeX.h

@@ -28,7 +28,8 @@ class DepTable;
 class TeXErrors {
 private:
 	///
-	struct Error {
+	class Error {
+	public:
 		///
 		Error () : error_in_line(0) {}
 		///

src/LaTeXFeatures.h

@@ -21,7 +21,7 @@
 
 class Buffer;
 class BufferParams;
-struct Language;
+class Language;
 
 /** The packages and commands that a buffer needs. This class
  *  contains a list<string>.  Each of the LaTeX packages that a buffer needs

src/PrinterParams.h

@@ -15,14 +15,15 @@
 #include "lyxrc.h"
 
 /**
-  This struct contains (or should contain) all the parameters required for
-  printing a buffer.  Some work still needs to be done on this struct and
+  This class contains (or should contain) all the parameters required for
+  printing a buffer.  Some work still needs to be done on this class and
   printing handling in general to make it nice and full-featured.
   The main things I'd like to add now is the ability to print a read-only
   document with different orientation, papersize or single/duplex state
   than the document's settings. ARRae 20000423
 */
-struct PrinterParams {
+class PrinterParams {
+public:
 	///
 	enum Target {
 		///

src/box.h

@@ -22,7 +22,8 @@
  *
  * Negative values are allowed.
  */
-struct Box {
+class Box {
+public:
 	int x1;
 	int x2;
 	int y1;

src/buffer.C

@@ -143,8 +143,9 @@ int const LYX_FORMAT = 239;
 
 typedef std::map<string, bool> DepClean;
 
-struct Buffer::Impl
+class Buffer::Impl
 {
+public:
 	Impl(Buffer & parent, string const & file, bool readonly);
 
 	limited_stack<Undo> undostack;
@@ -1458,7 +1459,9 @@ bool Buffer::isUnnamed() const
 }
 
 
+#ifdef WITH_WARNINGS
 #warning this function should be moved to buffer_pimpl.C
+#endif
 void Buffer::markDirty()
 {
 	if (pimpl_->lyx_clean) {

src/bufferparams.C

@@ -278,8 +278,9 @@ SpaceTranslator const & spacetranslator()
 }
 
 
-struct BufferParams::Impl
+class BufferParams::Impl
 {
+public:
 	Impl();
 
 	AuthorList authorlist;

src/bufferparams.h

@@ -34,7 +34,7 @@ class LatexFeatures;
 class Spacing;
 class TexRow;
 class VSpace;
-struct Language;
+class Language;
 
 
 namespace lyx {
@@ -232,7 +232,8 @@ private:
 	 *  drag in other header files.
 	 */
 	class Impl;
-	struct MemoryTraits {
+	class MemoryTraits {
+	public:
 		static Impl * clone(Impl const *);
 		static void destroy(Impl *);
 	};

src/changes.h

@@ -21,7 +21,8 @@
 #include <iosfwd>
 
 
-struct Change {
+class Change {
+public:
 	/// the type of change
 	enum Type {
 		UNCHANGED, // no change
@@ -95,7 +96,8 @@ public:
 		lyx::time_type curtime, Change const & old, Change const & change);
 
 private:
-	struct Range {
+	class Range {
+	public:
 		Range(lyx::pos_type s, lyx::pos_type e)
 			: start(s), end(e) {}
 
@@ -121,7 +123,8 @@ private:
 	friend bool operator==(Range const & r1, Range const & r2);
 	friend bool operator!=(Range const & r1, Range const & r2);
 
-	struct ChangeRange {
+	class ChangeRange {
+	public:
 		ChangeRange(lyx::pos_type s, lyx::pos_type e, Change c)
 			: range(Range(s, e)), change(c) {}
 		Range range;

src/client/debug.h

@@ -16,10 +16,11 @@
 #include "support/debugstream.h"
 
 /** Ideally this should have been a namespace, but since we try to be
-    compilable on older C++ compilators too, we use a struct instead.
+    compilable on older C++ compilators too, we use a class instead.
     This is all the different debug levels that we have.
 */
-struct lyx_debug_trait {
+class lyx_debug_trait {
+public:
 	///
 	enum type {
 		///

src/coordcache.h

@@ -20,7 +20,8 @@ class Paragraph;
 void lyxbreaker(void const * data, const char * hint, int size);
 void lyxaborter(int x, int y);
 
-struct Point {
+class Point {
+public:
 	Point()
 		: x_(0), y_(0)
 	{}

src/debug.h

@@ -19,7 +19,8 @@
  *  compilable on older C++ compilators too, we use a struct instead.
  *  This is all the different debug levels that we have.
  */
-struct lyx_debug_trait {
+class lyx_debug_trait {
+public:
 	///
 	enum type {
 		///

src/errorlist.h

@@ -20,7 +20,8 @@
 class Buffer;
 
 /// A class to hold an error item
-struct ErrorItem {
+class ErrorItem {
+public:
 	std::string error;
 	std::string description;
 	int par_id;

src/exporter.h

@@ -45,7 +45,8 @@ public:
 };
 
 
-struct ExportedFile {
+class ExportedFile {
+public:
 	ExportedFile(std::string const &, std::string const &);
 	/// absolute name of the source file
 	std::string sourceName;

src/frontends/controllers/BCView.h

@@ -35,7 +35,8 @@ class ButtonPolicy;
  *  make a logical whole. E.g., an input and a choice widget that together
  *  are used to set a LyXLength can be interrogated together.
  */
-struct CheckedWidget {
+class CheckedWidget {
+public:
 	///
 	virtual ~CheckedWidget();
 

src/frontends/controllers/ControlCommandBuffer.C

@@ -38,7 +38,8 @@ namespace frontend {
 
 namespace {
 
-struct prefix_p {
+class prefix_p {
+public:
 	string p;
 	prefix_p(string const & s)
 		: p(s) {}

src/frontends/controllers/ControlMath.C

@@ -293,7 +293,8 @@ bool operator<(XPMmap const & lhs, XPMmap const & rhs)
 }
 
 
-struct CompareKey : public std::unary_function<XPMmap, bool> {
+class CompareKey : public std::unary_function<XPMmap, bool> {
+public:
 	CompareKey(string const & name) : name_(name) {}
 	bool operator()(XPMmap const & other) const {
 		return other.key == name_;

src/frontends/controllers/biblio.C

@@ -269,8 +269,9 @@ string const getYear(InfoMap const & map, string const & key)
 namespace {
 
 // A functor for use with std::sort, leading to case insensitive sorting
-struct compareNoCase: public std::binary_function<string, string, bool>
+class compareNoCase: public std::binary_function<string, string, bool>
 {
+public:
 	bool operator()(string const & s1, string const & s2) const {
 		return compare_ascii_no_case(s1, s2) < 0;
 	}
@@ -384,8 +385,9 @@ string const escape_special_chars(string const & expr)
 
 // A functor for use with std::find_if, used to ascertain whether a
 // data entry matches the required regex_
-struct RegexMatch : public std::unary_function<string, bool>
+class RegexMatch : public std::unary_function<string, bool>
 {
+public:
 	// re and icase are used to construct an instance of boost::RegEx.
 	// if icase is true, then matching is insensitive to case
 	RegexMatch(InfoMap const & m, string const & re, bool icase)

src/frontends/controllers/biblio.h

@@ -103,7 +103,8 @@ searchKeys(InfoMap const & map,
 	   bool caseSensitive=false);
 
 
-struct CitationStyle {
+class CitationStyle {
+public:
 	///
 	CitationStyle(CiteStyle s = CITE, bool f = false, bool force = false)
 		: style(s), full(f), forceUCase(force) {}

src/frontends/controllers/frnt_lang.C

@@ -27,10 +27,11 @@ namespace frontend {
 
 namespace {
 
-struct Sorter
+class Sorter
 	: public std::binary_function<LanguagePair,
 				      LanguagePair, bool>
 {
+public:
 	bool operator()(LanguagePair const & lhs,
 			LanguagePair const & rhs) const {
 		return lhs.first < rhs.first;

src/frontends/qt2/Dialogs.C

@@ -115,7 +115,8 @@ char const * const dialognames[] = {
 char const * const * const end_dialognames =
 	dialognames + (sizeof(dialognames) / sizeof(char *));
 
-struct cmpCStr {
+class cmpCStr {
+public:
 	cmpCStr(char const * name) : name_(name) {}
 	bool operator()(char const * other) {
 		return strcmp(other, name_) == 0;

src/frontends/qt2/FileDialog.C

@@ -46,7 +46,8 @@ using std::endl;
 using std::string;
 
 
-struct FileDialog::Private {
+class FileDialog::Private {
+public:
 	Button b1;
 	Button b2;
 };

src/frontends/qt2/QContentPane.h

@@ -27,7 +27,8 @@
 class QWorkArea;
 
 /// for emulating triple click
-struct double_click {
+class double_click {
+public:
 	int x;
 	int y;
 	Qt::ButtonState state;
@@ -53,10 +54,11 @@ struct double_click {
  *  of the work area. In this way, we'll be able to continue scrolling
  *  (and selecting) the text.
  *
- *  This struct stores all the parameters needed to make this happen.
+ *  This class stores all the parameters needed to make this happen.
  */
-struct SyntheticMouseEvent
+class SyntheticMouseEvent
 {
+public:
 	SyntheticMouseEvent();
 
 	FuncRequest cmd;

src/frontends/qt2/QPrefsDialog.C

@@ -485,7 +485,8 @@ void QPrefsDialog::updateCopiers()
 
 namespace {
 
-struct SamePrettyName {
+class SamePrettyName {
+public:
 	SamePrettyName(string const & n) : pretty_name_(n) {}
 
 	bool operator()(::Format const & fmt) const {

src/frontends/qt2/qfont_loader.h

@@ -56,7 +56,8 @@ public:
 
 private:
 	/// hold info about a particular font
-	struct font_info {
+	class font_info {
+	public:
 		font_info(LyXFont const & f);
 
 		/// the font instance

src/frontends/qt2/qsetborder.h

@@ -63,7 +63,8 @@ private:
 	void drawTop(bool);
 	void drawBottom(bool);
 
-	struct Border {
+	class Border {
+	public:
 		Border() : set(true), enabled(true) {}
 		bool set;
 		bool enabled;

src/frontends/qt2/qtTimeout.h

@@ -22,7 +22,7 @@
  * This class executes the callback when the timeout expires
  * using Qt mechanisms
  */
-struct qtTimeout : QObject, public Timeout::Impl {
+class qtTimeout : QObject, public Timeout::Impl {
 public:
 	///
 	qtTimeout(Timeout & owner_);

src/graph.h

@@ -42,7 +42,8 @@ private:
 	int bfs_init(int, bool clear_visited = true);
 
 	///
-	struct Vertex {
+	class Vertex {
+	public:
 		std::vector<int> in_vertices;
 		std::vector<int> out_vertices;
 		std::vector<int> out_edges;

src/graphics/GraphicsCache.C

@@ -34,7 +34,8 @@ namespace graphics {
  */
 typedef std::map<string, Cache::ItemPtr> CacheType;
 
-struct Cache::Impl {
+class Cache::Impl {
+public:
 	///
 	CacheType cache;
 };

src/graphics/GraphicsCacheItem.C

@@ -46,7 +46,8 @@ using std::string;
 namespace lyx {
 namespace graphics {
 
-struct CacheItem::Impl : public boost::signals::trackable {
+class CacheItem::Impl : public boost::signals::trackable {
+public:
 
 	///
 	Impl(string const & file);

src/graphics/GraphicsConverter.C

@@ -50,7 +50,8 @@ using std::string;
 namespace lyx {
 namespace graphics {
 
-struct Converter::Impl : public boost::signals::trackable {
+class Converter::Impl : public boost::signals::trackable {
+public:
 	///
 	Impl(string const &, string const &, string const &, string const &);
 

src/graphics/GraphicsLoader.C

@@ -27,6 +27,7 @@ namespace lyx {
 namespace graphics {
 
 struct Loader::Impl : boost::signals::trackable {
+public:
 	///
 	Impl();
 	///

src/graphics/GraphicsParams.h

@@ -26,7 +26,8 @@ namespace graphics {
 /** Parse a string of the form "200pt 500pt 300mm 5in" into a
  *  usable bounding box.
  */
-struct BoundingBox {
+class BoundingBox {
+public:
 	///
 	BoundingBox();
 	///
@@ -47,8 +48,9 @@ bool operator!=(BoundingBox const &, BoundingBox const &);
 std::ostream & operator<<(std::ostream &, BoundingBox const &);
 
 
-struct Params
+class Params
 {
+public:
 	Params();
 
 	DisplayType display;

src/graphics/PreviewImage.C

@@ -27,7 +27,8 @@ using std::string;
 namespace lyx {
 namespace graphics {
 
-struct PreviewImage::Impl : public boost::signals::trackable {
+class PreviewImage::Impl : public boost::signals::trackable {
+public:
 	///
 	Impl(PreviewImage & p, PreviewLoader & l,
 	     string const & s, string const & f, double af);

src/graphics/PreviewLoader.C

@@ -92,7 +92,8 @@ private:
 
 
 /// Store info on a currently executing, forked process.
-struct InProgress {
+class InProgress {
+public:
 	///
 	InProgress() : pid(0) {}
 	///
@@ -122,7 +123,8 @@ typedef InProgressProcesses::value_type InProgressProcess;
 namespace lyx {
 namespace graphics {
 
-struct PreviewLoader::Impl : public boost::signals::trackable {
+class PreviewLoader::Impl : public boost::signals::trackable {
+public:
 	///
 	Impl(PreviewLoader & p, Buffer const & b);
 	/// Stop any InProgress items still executing.
@@ -253,7 +255,8 @@ Buffer const & PreviewLoader::buffer() const
 
 namespace {
 
-struct IncrementedFileName {
+class IncrementedFileName {
+public:
 	IncrementedFileName(string const & to_format,
 			    string const & filename_base)
 		: to_format_(to_format), base_(filename_base), counter_(1)
@@ -407,7 +410,8 @@ void PreviewLoader::Impl::add(string const & latex_snippet)
 
 namespace {
 
-struct EraseSnippet {
+class EraseSnippet {
+public:
 	EraseSnippet(string const & s) : snippet_(s) {}
 	void operator()(InProgressProcess & process)
 	{

src/graphics/Previews.C

@@ -37,7 +37,8 @@ Previews & Previews::get()
 }
 
 
-struct Previews::Impl {
+class Previews::Impl {
+public:
 	///
 	typedef boost::shared_ptr<PreviewLoader> PreviewLoaderPtr;
 	///

src/insets/ExternalTemplate.h

@@ -22,7 +22,8 @@ class LyXLex;
 namespace lyx {
 namespace external {
 
-struct Template {
+class Template {
+public:
 	/// We have to have default commands for safety reasons!
 	Template();
 	///
@@ -30,7 +31,8 @@ struct Template {
 	///
 	void dumpFormats(std::ostream &) const;
 
-	struct Option {
+	class Option {
+	public:
 		Option(std::string const & name_, std::string const & opt_)
 			: name(name_), option(opt_) {}
 		std::string name;
@@ -55,7 +57,8 @@ struct Template {
 	std::vector<TransformID> transformIds;
 
 	/// This is the information needed to support a specific output format
-	struct Format {
+	class Format {
+	public:
 		Format();
 		///
 		void readFormat(LyXLex &);

src/insets/ExternalTransforms.h

@@ -327,8 +327,9 @@ typedef boost::function<TransformCommand::ptr_type(RotationData)>
 	RotationCommandFactory;
 
 
-struct TransformStore
+class TransformStore
 {
+public:
 	TransformStore() {}
 
 	/** Stores \c factory and a reminder of what \c data this \c factory

src/insets/insetbase.C

@@ -31,7 +31,8 @@
 
 namespace {
 
-struct InsetName {
+class InsetName {
+public:
 	InsetName(std::string const & n, InsetBase::Code c)
 		: name(n), code(c) {}
 	std::string name;

src/insets/insetbox.h

@@ -18,7 +18,8 @@
 #include "lyxlength.h"
 
 
-struct InsetBoxParams {
+class InsetBoxParams {
+public:
 	///
 	InsetBoxParams(std::string const &);
 	///

src/insets/insetbranch.h

@@ -18,7 +18,8 @@
 class BranchList;
 
 
-struct InsetBranchParams {
+class InsetBranchParams {
+public:
 	explicit InsetBranchParams(std::string const & b = std::string())
 		: branch(b) {}
 	///

src/insets/insetcharstyle.h

@@ -17,7 +17,8 @@
 #include "lyxtextclass.h"
 
 
-struct InsetCharStyleParams {
+class InsetCharStyleParams {
+public:
 	///
 	void write(std::ostream & os) const;
 	///

src/insets/insetcite.h

@@ -50,7 +50,8 @@ private:
 	/// This function does the donkey work of creating the pretty label
 	std::string const generateLabel(Buffer const &) const;
 
-	struct Cache {
+	class Cache {
+	public:
 		///
 		Cache() : engine(lyx::biblio::ENGINE_BASIC) {}
 		///

src/insets/insetexternal.h

@@ -23,16 +23,17 @@
 
 
 /** No two InsetExternalParams variables can have the same temporary file.
- *  This struct has copy-semantics but the copy constructor
+ *  This class has copy-semantics but the copy constructor
  *  and assignment operator simply call the default constructor.
- *  Use of this struct enables us to use the compiler-generated
+ *  Use of this class enables us to use the compiler-generated
  *  copy constructor and assignment operator for the
- *  InsetExternalParams struct.
+ *  InsetExternalParams class.
  */
 namespace lyx {
 namespace external {
 
-struct TempName {
+class TempName {
+public:
 	TempName();
 	TempName(TempName const &);
 	~TempName();
@@ -61,7 +62,8 @@ Translator<DisplayType, std::string> const & displayTranslator();
 
 
 /// hold parameters settable from the GUI
-struct InsetExternalParams {
+class InsetExternalParams {
+public:
 	InsetExternalParams();
 
 	void write(Buffer const &, std::ostream &) const;

src/insets/insetfloat.h

@@ -17,7 +17,8 @@
 #include "toc.h"
 
 
-struct InsetFloatParams {
+class InsetFloatParams {
+public:
 	///
 	InsetFloatParams() : wide(false), sideways(false) {}
 	///

src/insets/insetgraphicsParams.h

@@ -27,9 +27,10 @@ namespace graphics {
 }
 
 
-/// This struct holds all the parameters needed by insetGraphics.
-struct InsetGraphicsParams
+/// This class holds all the parameters needed by insetGraphics.
+class InsetGraphicsParams
 {
+public:
 	/// Image filename.
 	lyx::support::FileName filename;
 	/// Scaling the Screen inside Lyx

src/insets/insetinclude.h

@@ -19,7 +19,7 @@
 
 class Buffer;
 class Dimension;
-struct LaTeXFeatures;
+class LaTeXFeatures;
 class RenderMonitoredPreview;
 
 

src/insets/insetindex.h

@@ -15,7 +15,7 @@
 
 #include "insetcommand.h"
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 /** Used to insert index labels
   */

src/insets/insetnote.h

@@ -15,7 +15,8 @@
 #include "insetcollapsable.h"
 
 
-struct InsetNoteParams {
+class InsetNoteParams {
+public:
 	enum Type {
 		Note,
 		Comment,

src/insets/insetquotes.h

@@ -18,7 +18,7 @@
 class BufferParams;
 class Language;
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 
 /** Quotes.

src/insets/insetspace.h

@@ -18,7 +18,7 @@
 
 #include "inset.h"
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 ///  Used to insert different kinds of spaces
 class InsetSpace : public InsetOld {

src/insets/insetspecialchar.h

@@ -17,7 +17,7 @@
 
 #include "inset.h"
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 ///  Used to insert special chars
 class InsetSpecialChar : public InsetOld {

src/insets/insetwrap.h

@@ -17,7 +17,8 @@
 #include "lyxlength.h"
 
 
-struct InsetWrapParams {
+class InsetWrapParams {
+public:
 	///
 	void write(std::ostream &) const;
 	///

src/lyxlex.h

@@ -143,7 +143,7 @@ public:
 	LyXLex & operator>>(bool &);
 
 private:
-	struct Pimpl;
+	class Pimpl;
 	///
 	Pimpl * pimpl_;
 };
@@ -155,7 +155,8 @@ private:
     exceptions.
     @author Lgb
 */
-struct pushpophelper {
+class pushpophelper {
+public:
 	///
 	pushpophelper(LyXLex & lexrc, keyword_item * i, int s) : lex(lexrc) {
 		lex.pushTable(i, s);

src/lyxlex_pimpl.C

@@ -39,8 +39,9 @@ using std::ostream;
 
 namespace {
 
-struct compare_tags
+class compare_tags
 	: public std::binary_function<keyword_item, keyword_item, bool> {
+public:
 	// used by lower_bound, sort and sorted
 	bool operator()(keyword_item const & a, keyword_item const & b) const
 	{

src/lyxlex_pimpl.h

@@ -22,7 +22,8 @@
 #include <vector>
 
 ///
-struct LyXLex::Pimpl : boost::noncopyable {
+class LyXLex::Pimpl : boost::noncopyable {
+public:
 	///
 	Pimpl(keyword_item * tab, int num);
 	///
@@ -80,7 +81,8 @@ private:
 	///
 	void verifyTable();
 	///
-	struct pushed_table {
+	class pushed_table {
+	public:
 		///
 		pushed_table()
 			: table_elem(0), table_siz(0) {}

src/lyxrc.C

@@ -1162,7 +1162,8 @@ void LyXRC::print() const
 }
 
 
-struct SameMover {
+class SameMover {
+public:
 	typedef std::pair<std::string, SpecialisedMover> Data;
 
 	SameMover(Data const & comparison)

src/lyxtextclass.h

@@ -23,7 +23,8 @@ class FloatList;
 
 
 ///
-struct CharStyle {
+class CharStyle {
+public:
 	std::string name;
 	std::string latextype;
 	std::string latexname;

src/lyxtextclasslist.C

@@ -69,9 +69,10 @@ LyXTextClassList::operator[](textclass_type textclass) const
 
 
 // used when sorting the textclass list.
-struct less_textclass_avail_desc
+class less_textclass_avail_desc
 	: public std::binary_function<LyXTextClass, LyXTextClass, int>
 {
+public:
 	int operator()(LyXTextClass const & tc1,
 		       LyXTextClass const & tc2) const
 	{

src/mathed/math_gridinfo.h

@@ -15,8 +15,9 @@
 #include <string>
 
 
-struct ColInfo
+class ColInfo
 {
+public:
 	ColInfo() : align('c'), rightline(0), leftline(false) {}
 	char   align;      // column alignment
 	std::string width;      // column width
@@ -26,16 +27,18 @@ struct ColInfo
 };
 
 
-struct RowInfo
+class RowInfo
 {
+public:
 	RowInfo() : topline(false), bottomline(false) {}
 	bool topline;     // horizontal line above
 	int  bottomline;  // horizontal line below
 };
 
 
-struct CellInfo
+class CellInfo
 {
+public:
 	CellInfo()
 		: multi(0), leftline(false), rightline(false),
 	   topline(false), bottomline(false)

src/mathed/math_gridinset.h

@@ -23,7 +23,8 @@ class MathGridInset : public MathNestInset {
 public:
 
 	/// additional per-cell information
-	struct CellInfo {
+	class CellInfo {
+	public:
 		///
 		CellInfo();
 		/// a dummy cell before a multicolumn cell
@@ -40,7 +41,8 @@ public:
 	};
 
 	/// additional per-row information
-	struct RowInfo {
+	class RowInfo {
+	public:
 		///
 		RowInfo();
 		///
@@ -60,7 +62,8 @@ public:
 	};
 
 	// additional per-row information
-	struct ColInfo {
+	class ColInfo {
+	public:
 		///
 		ColInfo();
 		/// currently possible: 'l', 'c', 'r'

src/mathed/math_mathmlstream.h

@@ -87,14 +87,16 @@ WriteStream & operator<<(WriteStream &, unsigned int);
 //  MathML
 //
 
-struct MTag {
+class MTag {
+public:
 	///
 	MTag(char const * const tag) : tag_(tag) {}
 	///
 	char const * const tag_;
 };
 
-struct ETag {
+class ETag {
+public:
 	///
 	ETag(char const * const tag) : tag_(tag) {}
 	///

src/mathed/math_parser.h

@@ -23,7 +23,8 @@ class LyXLex;
 
 
 ///
-struct latexkeys {
+class latexkeys {
+public:
 	/// name of the macro or primitive
 	std::string name;
 	/// name of a inset that handles that macro

src/mathed/math_replace.h

@@ -15,7 +15,8 @@
 
 #include "math_data.h"
 
-struct ReplaceData {
+class ReplaceData {
+public:
 	///
 	MathArray from;
 	///

src/mathed/math_support.C

@@ -335,7 +335,8 @@ named_deco_struct deco_table[] = {
 std::map<string, deco_struct> deco_list;
 
 // sort the table on startup
-struct init_deco_table {
+class init_deco_table {
+public:
 	init_deco_table() {
 		unsigned const n = sizeof(deco_table) / sizeof(deco_table[0]);
 		for (named_deco_struct * p = deco_table; p != deco_table + n; ++p) {

src/mathed/math_symbolinset.h

@@ -14,7 +14,7 @@
 
 #include "math_inset.h"
 
-struct latexkeys;
+class latexkeys;
 
 
 /** "normal" symbols that don't take limits and don't grow in displayed

src/metricsinfo.h

@@ -37,7 +37,8 @@ enum Styles {
 //
 // This is the part common to MetricsInfo and PainterInfo
 //
-struct MetricsBase {
+class MetricsBase {
+public:
 	///
 	MetricsBase();
 	///
@@ -60,7 +61,8 @@ struct MetricsBase {
 // This contains a MetricsBase and information that's only relevant during
 // the first phase of the two-phase draw
 //
-struct MetricsInfo {
+class MetricsInfo {
+public:
 	///
 	MetricsInfo();
 	///
@@ -75,7 +77,8 @@ struct MetricsInfo {
 // This contains a MetricsBase and information that's only relevant during
 // the second phase of the two-phase draw
 //
-struct PainterInfo {
+class PainterInfo {
+public:
 	///
 	PainterInfo(BufferView * bv, Painter & pain);
 	///
@@ -89,11 +92,11 @@ struct PainterInfo {
 	bool ltr_pos;
 };
 
-struct TextMetricsInfo {};
+class TextMetricsInfo {};
 
-
-struct ViewMetricsInfo
+class ViewMetricsInfo
 {
+public:
 	ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2,
 			int y1, int y2) : p1(p1), p2(p2), y1(y1), y2(y2) {}
 	lyx::pit_type p1;
@@ -107,7 +110,8 @@ struct ViewMetricsInfo
 // The original state gets restored when the Changer is destructed.
 
 template <class Struct, class Temp = Struct>
-struct Changer {
+class Changer {
+public:
 	///
 	Changer(Struct & orig) : orig_(orig) {}
 protected:
@@ -120,7 +124,8 @@ protected:
 
 
 // temporarily change some aspect of a font
-struct FontChanger : public Changer<LyXFont> {
+class FontChanger : public Changer<LyXFont> {
+public:
 	///
 	FontChanger(LyXFont & orig, char const * font);
 	///
@@ -129,7 +134,8 @@ struct FontChanger : public Changer<LyXFont> {
 
 
 // temporarily change a full font
-struct FontSetChanger : public Changer<MetricsBase> {
+class FontSetChanger : public Changer<MetricsBase> {
+public:
 	///
 	FontSetChanger(MetricsBase & mb, char const * font);
 	///
@@ -138,7 +144,8 @@ struct FontSetChanger : public Changer<MetricsBase> {
 
 
 // temporarily change the style
-struct StyleChanger : public Changer<MetricsBase> {
+class StyleChanger : public Changer<MetricsBase> {
+public:
 	///
 	StyleChanger(MetricsBase & mb, Styles style);
 	///
@@ -147,21 +154,24 @@ struct StyleChanger : public Changer<MetricsBase> {
 
 
 // temporarily change the style to script style
-struct ScriptChanger : public StyleChanger {
+class ScriptChanger : public StyleChanger {
+public:
 	///
 	ScriptChanger(MetricsBase & mb);
 };
 
 
 // temporarily change the style suitable for use in fractions
-struct FracChanger : public StyleChanger {
+class FracChanger : public StyleChanger {
+public:
 	///
 	FracChanger(MetricsBase & mb);
 };
 
 
 // temporarily change the style suitable for use in tabulars and arrays
-struct ArrayChanger : public StyleChanger {
+class ArrayChanger : public StyleChanger {
+public:
 	///
 	ArrayChanger(MetricsBase & mb);
 };
@@ -169,7 +179,8 @@ struct ArrayChanger : public StyleChanger {
 
 
 // temporarily change the shape of a font
-struct ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+class ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+public:
 	///
 	ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape);
 	///
@@ -178,8 +189,9 @@ struct ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
 
 
 // temporarily change the available text width
-struct WidthChanger : public Changer<MetricsBase>
+class WidthChanger : public Changer<MetricsBase>
 {
+public:
 	///
 	WidthChanger(MetricsBase & mb, int width);
 	///
@@ -188,7 +200,8 @@ struct WidthChanger : public Changer<MetricsBase>
 
 
 // temporarily change the used color
-struct ColorChanger : public Changer<LyXFont, std::string> {
+class ColorChanger : public Changer<LyXFont, std::string> {
+public:
 	///
 	ColorChanger(LyXFont & font, std::string const & color);
 	///

src/mover.h

@@ -98,8 +98,9 @@ protected:
  *  copied .fig file will require a transformation of the picture file
  *  reference if it is to be found by XFig.
  */
-struct SpecialisedMover : public Mover
+class SpecialisedMover : public Mover
 {
+public:
 	SpecialisedMover() {}
 
 	/** @c command should be of the form

src/outputparams.h

@@ -21,7 +21,8 @@
 class ExportData;
 
 
-struct OutputParams {
+class OutputParams {
+public:
 	//
 	enum FLAVOR {
 		LATEX,

src/paragraph.h

@@ -401,9 +401,9 @@ private:
 	/// end of label
 	lyx::pos_type begin_of_body_;
 
-	struct Pimpl;
+	class Pimpl;
 	///
-	friend struct Paragraph::Pimpl;
+	friend class Paragraph::Pimpl;
 	///
 	Pimpl * pimpl_;
 

src/paragraph_pimpl.h

@@ -26,7 +26,8 @@
 class LyXLayout;
 
 
-struct Paragraph::Pimpl {
+class Paragraph::Pimpl {
+public:
 	///
 	Pimpl(Paragraph * owner);
 	/// "Copy constructor"
@@ -90,7 +91,8 @@ struct Paragraph::Pimpl {
 	    and font_i covers the chars in positions pos_{i-1}+1,...,pos_i
 	    (font_1 covers the chars 0,...,pos_1) (Dekel)
 	*/
-	struct FontTable  {
+	class FontTable  {
+	public:
 		///
 		FontTable(lyx::pos_type p, LyXFont const & f)
 			: pos_(p), font_(f)
@@ -133,11 +135,11 @@ struct Paragraph::Pimpl {
 #endif
 	};
 	///
-	friend struct matchFT;
+	friend class matchFT;
 	///
-	struct matchFT {
+	class matchFT {
+	public:
 		/// used by lower_bound and upper_bound
-		inline
 		int operator()(FontTable const & a, FontTable const & b) const {
 			return a.pos() < b.pos();
 		}

src/support/FileMonitor.C

@@ -27,7 +27,8 @@ using std::string;
 namespace lyx {
 namespace support {
 
-struct FileMonitor::Impl : public boost::signals::trackable {
+class FileMonitor::Impl : public boost::signals::trackable {
+public:
 
 	///
 	Impl(string const & file_with_path, int interval);

src/support/lyxsum.C

@@ -29,7 +29,7 @@ using std::string;
 // understand those weak symbols (seen on HP-UX, tru64, AIX and
 // others). Thus we force an explicit instanciation of this particular
 // template (JMarc)
-template class boost::detail::crc_table_t<32, 0x04C11DB7, true>;
+template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
 
 // Various implementations of lyx::sum(), depending on what methods
 // are available. Order is faster to slowest.

src/tabular.h

@@ -157,7 +157,8 @@ public:
 		BOX_MINIPAGE = 2
 	};
 
-	struct ltType {
+	class ltType {
+	public:
 		// constructor
 		ltType();
 		// we have this header type (is set in the getLT... functions)
@@ -397,7 +398,8 @@ public:
 	///
 //private:
 	///
-	struct cellstruct {
+	class cellstruct {
+	public:
 		///
 		cellstruct(BufferParams const &);
 		///
@@ -442,7 +444,8 @@ public:
 	typedef std::vector<cell_vector> cell_vvector;
 
 	///
-	struct rowstruct {
+	class rowstruct {
+	public:
 		///
 		rowstruct();
 		///
@@ -469,7 +472,8 @@ public:
 	typedef std::vector<rowstruct> row_vector;
 
 	///
-	struct columnstruct {
+	class columnstruct {
+		public:
 		///
 		columnstruct();
 		///

src/toc.h

@@ -29,7 +29,8 @@ namespace lyx {
 namespace toc {
 
 ///
-struct TocItem {
+class TocItem {
+public:
 	TocItem(int par_id, int d, std::string const & s)
 		: id_(par_id), depth(d), str(s) {}
 	///

src/trans_decl.h

@@ -35,7 +35,8 @@ struct Keyexc {
 typedef std::list<Keyexc> KmodException;
 
 ///
-struct KmodInfo {
+class KmodInfo {
+public:
 	///
 	std::string data;
 	///

src/undo.h

@@ -44,12 +44,13 @@ The idea is to store the contents of 'interesting' paragraphs in some
 structure ('Undo') _before_ it is changed in some edit operation.
 Obviously, the stored ranged should be as small as possible. However, it
 there is a lower limit: The StableDocIterator pointing stored in the undo
-struct must be valid after the changes, too, as it will used as a pointer
+class must be valid after the changes, too, as it will used as a pointer
 where to insert the stored bits when performining undo.
 
 */
 
-struct Undo {
+class Undo {
+public:
 	/// This is used to combine consecutive undo recordings of the same kind.
 	enum undo_kind {
 		/**