From 1a0b18b01cf4cf06efb7cd34b350b78cf246c572 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 6 Apr 2000 09:17:40 +0000
Subject: [PATCH] Small changes needed by dec cxx

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@639 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog               | 10 ++++++++++
 po/POTFILES.in          |  2 +-
 src/font.C              |  2 ++
 src/insets/lyxinset.h   |  2 +-
 src/lyxparagraph.h      | 18 +++++++++---------
 src/support/lyxstring.h |  6 +++---
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9191f1437..8e82bbe2e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-04-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/lyxparagraph.h: make strict InsetTable public.
+
+	* src/support/lyxstring.h: change lyxstring::difference_type to be
+	ptrdiff_t. Add std:: modifiers to streams.
+
+	* src/font.C: include the <cctype> header, for islower() and
+	isupper(). 
+
 2000-04-03  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* src/font.[Ch]: new files. Contains the metric functions for
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 38e34d5dc7..ca08ee0832 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,7 +28,6 @@ src/insets/form_graphics.C
 src/insets/form_url.C
 src/insets/insetbib.C
 src/insets/inset.C
-src/insets/inseteditor.C
 src/insets/inseterror.C
 src/insets/insetert.C
 src/insets/insetfoot.C
@@ -84,6 +83,7 @@ src/spellchecker.C
 src/sp_form.C
 src/support/filetools.C
 src/support/getUserName.C
+src/support/path.C
 src/support/path.h
 src/TableLayout.C
 src/text2.C
diff --git a/src/font.C b/src/font.C
index f8cd5c4eb7..1590c72b55 100644
--- a/src/font.C
+++ b/src/font.C
@@ -1,5 +1,7 @@
 #include <config.h>
 
+#include <cctype>
+
 #include "font.h"
 #include "FontLoader.h"
 #include "lyxrc.h"
diff --git a/src/insets/lyxinset.h b/src/insets/lyxinset.h
index 79d7904b09..3a334ab900 100644
--- a/src/insets/lyxinset.h
+++ b/src/insets/lyxinset.h
@@ -131,7 +131,7 @@ public:
 	/** returns the number of rows (\n's) of generated tex code.
 	 fragile != 0 means, that the inset should take care about
 	 fragile commands by adding a \protect before.
-	 If the freee_spc (freespacing) variable is set, then this inset
+	 If the free_spc (freespacing) variable is set, then this inset
 	 is in a free-spacing paragraph.
 	 */
 	virtual int Latex(std::ostream &, signed char fragile,
diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index 5517081fbf..ad8e21484f 100644
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -501,6 +501,15 @@ public:
 	///
 	void SimpleDocBookOneTablePar(std::ostream &, string & extra,
 				      int & desc_on, int depth);
+	///
+	struct InsetTable {
+		///
+		size_type pos;
+		///
+		Inset * inset;
+		///
+		InsetTable(size_type p, Inset * i) { pos = p; inset = i;}
+	};
 private:
 	/** A font entry covers a range of positions. Notice that the
 	  entries in the list are inserted in random order.
@@ -525,15 +534,6 @@ private:
 		LyXFont font;
 	};
 	///
-	struct InsetTable {
-		///
-		size_type pos;
-		///
-		Inset * inset;
-		///
-		InsetTable(size_type p, Inset * i) { pos = p; inset = i;}
-	};
-	///
 	typedef std::list<FontTable> FontList;
 	///
 	FontList fontlist;
diff --git a/src/support/lyxstring.h b/src/support/lyxstring.h
index 27857ae5c2..696acfc63d 100644
--- a/src/support/lyxstring.h
+++ b/src/support/lyxstring.h
@@ -647,8 +647,8 @@ lyxstring operator+(lyxstring const & a, lyxstring::value_type b);
 
 void swap(lyxstring & s1, lyxstring & s2);
 
-istream & operator>>(istream &, lyxstring &);
-ostream & operator<<(ostream &, lyxstring const &);
-istream & getline(istream &, lyxstring &, lyxstring::value_type delim = '\n');
+std::istream & operator>>(std::istream &, lyxstring &);
+std::ostream & operator<<(std::ostream &, lyxstring const &);
+std::istream & getline(std::istream &, lyxstring &, lyxstring::value_type delim = '\n');
 
 #endif