Index: src/LaTeXFeatures.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/LaTeXFeatures.h,v
retrieving revision 1.43
diff -u -r1.43 LaTeXFeatures.h
--- src/LaTeXFeatures.h	2002/07/21 21:20:54	1.43
+++ src/LaTeXFeatures.h	2004/11/09 20:45:03
@@ -26,7 +26,7 @@
 #include <map>
 
 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
Index: src/frontends/screen.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/screen.h,v
retrieving revision 1.10
diff -u -r1.10 screen.h
--- src/frontends/screen.h	2002/12/01 22:59:18	1.10
+++ src/frontends/screen.h	2004/11/09 20:45:15
@@ -21,7 +21,7 @@
 class LyXCursor;
 class WorkArea;
 class BufferView;
-struct Row;
+class Row;
 
 /**
  * LyXScreen - document rendering management
Index: src/frontends/controllers/ControlPrint.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/controllers/ControlPrint.h,v
retrieving revision 1.9
diff -u -r1.9 ControlPrint.h
--- src/frontends/controllers/ControlPrint.h	2002/10/21 17:38:08	1.9
+++ src/frontends/controllers/ControlPrint.h	2004/11/09 20:45:15
@@ -21,7 +21,7 @@
 
 #include "LString.h"
 
-class PrinterParams;
+struct PrinterParams;
 
 /** A controller for Print dialogs.
  */
Index: src/graphics/GraphicsParams.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/graphics/GraphicsParams.h,v
retrieving revision 1.19
diff -u -r1.19 GraphicsParams.h
--- src/graphics/GraphicsParams.h	2002/12/01 22:59:23	1.19
+++ src/graphics/GraphicsParams.h	2004/11/09 20:45:19
@@ -21,7 +21,6 @@
 #include "GraphicsTypes.h"
 #include "LString.h"
 
-
 namespace grfx {
 
 /** Parse a string of the form "200pt 500pt 300mm 5in" into a
@@ -45,8 +44,9 @@
 bool operator==(BoundingBox const &, BoundingBox const &);
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
-struct Params
+class Params
 {
+	public:
 	Params();
 
 	DisplayType display;
Index: src/insets/inset.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/inset.h,v
retrieving revision 1.61
diff -u -r1.61 inset.h
--- src/insets/inset.h	2002/12/01 22:59:24	1.61
+++ src/insets/inset.h	2004/11/09 20:45:20
@@ -35,7 +35,7 @@
 class FuncRequest;
 class WordLangTuple;
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 namespace grfx {
 	class PreviewLoader;
Index: src/insets/insetinclude.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetinclude.h,v
retrieving revision 1.52
diff -u -r1.52 insetinclude.h
--- src/insets/insetinclude.h	2002/12/01 22:59:24	1.52
+++ src/insets/insetinclude.h	2004/11/09 20:45:21
@@ -22,7 +22,7 @@
 #include <boost/scoped_ptr.hpp>
 
 class Buffer;
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 // Created by AAS 970521
 
Index: src/insets/insetindex.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetindex.h,v
retrieving revision 1.31
diff -u -r1.31 insetindex.h
--- src/insets/insetindex.h	2002/09/25 14:26:11	1.31
+++ src/insets/insetindex.h	2004/11/09 20:45:21
@@ -18,7 +18,7 @@
 
 #include "insetcommand.h"
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 /** Used to insert index labels
   */
Index: src/insets/insetquotes.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetquotes.h,v
retrieving revision 1.40
diff -u -r1.40 insetquotes.h
--- src/insets/insetquotes.h	2002/09/25 14:26:11	1.40
+++ src/insets/insetquotes.h	2004/11/09 20:45:22
@@ -21,7 +21,7 @@
 class BufferParams;
 class Language;
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 
 /** Quotes.
Index: src/insets/insetref.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetref.h,v
retrieving revision 1.40
diff -u -r1.40 insetref.h
--- src/insets/insetref.h	2002/09/25 14:26:11	1.40
+++ src/insets/insetref.h	2004/11/09 20:45:22
@@ -18,7 +18,7 @@
 
 #include "insetcommand.h"
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 /** The reference inset
  */
Index: src/insets/insetspecialchar.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetspecialchar.h,v
retrieving revision 1.41
diff -u -r1.41 insetspecialchar.h
--- src/insets/insetspecialchar.h	2002/09/25 14:26:11	1.41
+++ src/insets/insetspecialchar.h	2004/11/09 20:45:22
@@ -21,7 +21,7 @@
 #include "inset.h"
 #include "LString.h"
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 ///  Used to insert special chars
 class InsetSpecialChar : public Inset {
Index: src/insets/inseturl.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/inseturl.h,v
retrieving revision 1.46
diff -u -r1.46 inseturl.h
--- src/insets/inseturl.h	2002/09/25 14:26:12	1.46
+++ src/insets/inseturl.h	2004/11/09 20:45:22
@@ -18,7 +18,7 @@
 
 #include "insetcommand.h"
 
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 /** The url inset
  */
Index: src/mathed/math_metricsinfo.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/mathed/Attic/math_metricsinfo.h,v
retrieving revision 1.16
diff -u -r1.16 math_metricsinfo.h
--- src/mathed/math_metricsinfo.h	2002/10/02 06:38:49	1.16
+++ src/mathed/math_metricsinfo.h	2004/11/09 20:45:24
@@ -52,7 +52,8 @@
 };
 
 
-struct MathPainterInfo {
+class MathPainterInfo {
+	public:
 	///
 	MathPainterInfo(Painter & pain);
 	///
Index: src/mathed/math_parser.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/mathed/math_parser.h,v
retrieving revision 1.52
diff -u -r1.52 math_parser.h
--- src/mathed/math_parser.h	2002/09/11 08:26:02	1.52
+++ src/mathed/math_parser.h	2004/11/09 20:45:24
@@ -32,7 +32,8 @@
 
 
 ///
-struct latexkeys {
+class latexkeys {
+	public:
 	/// name of the macro or primitive
 	string name;
 	/// name of a inset that handles that macro
Index: src/mathed/math_symbolinset.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/mathed/math_symbolinset.h,v
retrieving revision 1.30
diff -u -r1.30 math_symbolinset.h
--- src/mathed/math_symbolinset.h	2003/01/07 11:24:43	1.30
+++ src/mathed/math_symbolinset.h	2004/11/09 20:45:24
@@ -8,7 +8,7 @@
 
 #include "math_diminset.h"
 
-struct latexkeys;
+class latexkeys;
 
 // "normal" symbols that don't take limits and don't grow in displayed
 // formulae
--- src/support/DebugStream.C.bak	2004-12-13 13:32:49.854527500 +0100
+++ src/support/DebugStream.C	2004-12-13 13:29:14.466963100 +0100
@@ -56,7 +56,7 @@
 	}
 #ifdef MODERN_STL_STREAMS
 	///
-	virtual int_type overflow(int_type c = traits_type::eof()) {
+	virtual int_type overflow(int_type c = std::streambuf::traits_type::eof()) {
 		// fakes success by returning c
 		return c == traits_type::eof() ? ' ' : c;
 	}
@@ -90,7 +90,7 @@
 		return sb1->sputn(p, n);
 	}
 	///
-	virtual int_type overflow(int_type c = traits_type::eof()) {
+	virtual int_type overflow(int_type c = std::streambuf::traits_type::eof()) {
 		sb2->sputc(c);
 		return sb1->sputc(c);
 	}
@@ -137,7 +137,7 @@
 		return sb->sputn(p, n);
 	}
 	///
-	virtual int_type overflow(int_type c = traits_type::eof()) {
+	virtual int_type overflow(int_type c = std::streambuf::traits_type::eof()) {
 		return sb->sputc(c);
 	}
 #else
--- ../QLPainter.C	2002-12-17 21:37:10.000000000 +0100
+++ src/frontends/qt2/QLPainter.C	2004-12-13 14:48:08.474077100 +0100
@@ -234,8 +234,8 @@
 	int tmpx = x;
 	size_t ls = s.length();
 	for (size_t i = 0; i < ls; ++i) {
-		QChar const c = s[i].upper();
-		if (c != s[i]) {
+		QChar const c = s.operator[](i).upper();
+		if (c != s.operator[](i)) {
 			qp_->setFont(qsmallfont);
 			qp_->drawText(tmpx, y, c);
 			tmpx += qsmallfontm.width(c);
@@ -262,7 +262,7 @@
 #if QT_VERSION >= 300
 	str.setLength(ls);
 	for (size_t i = 0; i < ls; ++i)
-		str[i] = QChar(encoding->ucs(s[i]));
+		str.operator[](i) = QChar(encoding->ucs(s[i]));
 	// HACK: QT3 refuses to show single compose characters
 	if (ls == 1 && str[0].unicode() >= 0x05b0 && str[0].unicode() <= 0x05c2)
 		str = ' ' + str;
--- ../math_metricsinfo.h	2002-10-02 08:38:50.000000000 +0200
+++ src/mathed/math_metricsinfo.h	2004-12-13 16:26:56.187710700 +0100
@@ -41,10 +41,10 @@
 };
 
 
-struct MathMetricsInfo {
+class MathMetricsInfo {
+	public:
 	///
 	MathMetricsInfo();
-
 	///
 	MathMetricsBase base;
 	///
@@ -52,7 +52,8 @@
 };
 
 
-struct MathPainterInfo {
+class MathPainterInfo {
+	public:
 	///
 	MathPainterInfo(Painter & pain);
 	///
@@ -65,7 +66,7 @@
 };
 
 
-struct TextMetricsInfo {};
+class TextMetricsInfo {};
 
 
 // Generic base for temporarily changing things.
--- ../math_replace.h	2002-09-11 11:14:56.000000000 +0200
+++ src/mathed/math_replace.h	2004-12-13 16:34:58.210825900 +0100
@@ -7,7 +7,8 @@
 
 #include "math_data.h"
 
-struct ReplaceData {
+class ReplaceData {
+	public:
 	///
 	MathArray from;
 	///
Index: src/paragraph.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/paragraph.C,v
retrieving revision 1.235.2.1
diff -u -r1.235.2.1 paragraph.C
--- src/paragraph.C	2003/02/12 21:01:18	1.235.2.1
+++ src/paragraph.C	2004/11/09 20:45:14
@@ -55,7 +55,7 @@
 // this is a bad idea, but how can Paragraph find its buffer to get
 // parameters? (JMarc)
 
-extern string bibitemWidest(Buffer const *);
+extern string const bibitemWidest(Buffer const *);
 
 // this is a minibuffer
 
Index: boost/boost/format/format_class.hpp
===================================================================
RCS file: /cvs/lyx/lyx-devel/boost/boost/format/format_class.hpp,v
retrieving revision 1.1
diff -u -r1.1 format_class.hpp
--- boost/boost/format/format_class.hpp	2002/11/20 17:20:54	1.1
+++ boost/boost/format/format_class.hpp	2004/11/09 20:44:54
@@ -20,6 +20,8 @@
 #ifndef BOOST_FORMAT_CLASS_HPP
 #define BOOST_FORMAT_CLASS_HPP
 
+#  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+
 #include <vector>
 #include <sstream>
 #include <string>
Index: boost/boost/regex/config.hpp
===================================================================
RCS file: /cvs/lyx/lyx-devel/boost/boost/regex/config.hpp,v
retrieving revision 1.3.2.3
diff -u -r1.3.2.3 config.hpp
--- boost/boost/regex/config.hpp	2003/02/20 16:08:40	1.3.2.3
+++ boost/boost/regex/config.hpp	2004/11/09 20:44:55
@@ -247,10 +247,10 @@
 
 #if defined(BOOST_REGEX_HAS_DLL_RUNTIME) && !defined(BOOST_REGEX_STATIC_LINK)
 #  if defined(BOOST_REGEX_SOURCE)
-#     define BOOST_REGEX_DECL __declspec(dllexport)
+//#     define BOOST_REGEX_DECL __declspec(dllexport)
 #     define BOOST_REGEX_BUILD_DLL
 #  else
-#     define BOOST_REGEX_DECL __declspec(dllimport)
+//#     define BOOST_REGEX_DECL __declspec(dllimport)
 #  endif
 #endif
 
Index: boost/libs/regex/src/w32_regex_traits.cpp
===================================================================
RCS file: /cvs/lyx/lyx-devel/boost/libs/regex/src/w32_regex_traits.cpp,v
retrieving revision 1.2
diff -u -r1.2 w32_regex_traits.cpp
--- boost/libs/regex/src/w32_regex_traits.cpp	2002/06/18 15:39:27	1.2
+++ boost/libs/regex/src/w32_regex_traits.cpp	2004/11/09 20:44:59
@@ -159,10 +159,6 @@
 
 std::list<syntax_map_t>* syntax;
 
-#endif
-
-std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, unsigned id);
-
 std::size_t BOOST_REGEX_CALL get_message(wchar_t* buf, std::size_t len, unsigned id)
 {
    std::size_t size = _re_get_message(static_cast<char*>(0), 0, id);
@@ -173,6 +169,10 @@
    size = boost::w32_regex_traits<wchar_t>::strwiden(buf, len, cb.get());
    return size;
 }
+
+#endif
+
+std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, unsigned id);
 
 inline std::size_t BOOST_REGEX_CALL get_message(char* buf, std::size_t len, unsigned id)
 {