Fix remaining SVR4 problems.

lyx/lyx.patch

@@ -1,6 +1,63 @@
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C lyx-1.3.1/src/frontends/qt2/lengthcombo.C
+--- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C	2002-12-17 21:37:11.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/lengthcombo.C	2003-04-29 20:03:52.378340752 +0200
+@@ -35,9 +35,9 @@
+ }
+ 
+ 
+-LyXLength::UNIT LengthCombo::currentLengthItem() const
++LyXLength::LENUNIT LengthCombo::currentLengthItem() const
+ {
+-	return static_cast<LyXLength::UNIT>(currentItem());
++	return static_cast<LyXLength::LENUNIT>(currentItem());
+ }
+ 
+ 
+@@ -47,7 +47,7 @@
+ }
+ 
+ 
+-void LengthCombo::setCurrentItem(LyXLength::UNIT unit)
++void LengthCombo::setCurrentItem(LyXLength::LENUNIT unit)
+ {
+ 	QComboBox::setCurrentItem(int(unit));
+ }
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h lyx-1.3.1/src/frontends/qt2/lengthcombo.h
+--- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h	2002-11-17 12:24:08.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/lengthcombo.h	2003-04-29 20:03:52.378861522 +0200
+@@ -21,7 +21,7 @@
+ #include "vspace.h"
+ 
+ /**
+- * A combo box for selecting LyXLength::UNIT types.
++ * A combo box for selecting LyXLength::LENUNIT types.
+  */
+ class LengthCombo : public QComboBox {
+ 	Q_OBJECT
+@@ -29,9 +29,9 @@
+ 	LengthCombo(QWidget * parent, char * name);
+ 
+ 	/// set the current item
+-	virtual void setCurrentItem(LyXLength::UNIT unit);
++	virtual void setCurrentItem(LyXLength::LENUNIT unit);
+ 	/// get the current item
+-	LyXLength::UNIT currentLengthItem() const;
++	LyXLength::LENUNIT currentLengthItem() const;
+ 	/// enable the widget
+ 	virtual void setEnabled(bool b);
+ 
+@@ -39,7 +39,7 @@
+ 	virtual void has_activated(int index);
+ signals:
+ 	/// the current selection has changed
+-	void selectionChanged(LyXLength::UNIT unit);
++	void selectionChanged(LyXLength::LENUNIT unit);
+ 
+ };
+ 
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QDocument.C lyx-1.3.1/src/frontends/qt2/QDocument.C
---- lyx-1.3.1.orig/src/frontends/qt2/QDocument.C	2003-04-29 10:14:36.487493720 +0200
-+++ lyx-1.3.1/src/frontends/qt2/QDocument.C	2003-04-29 10:17:23.770730673 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/QDocument.C	2003-02-12 16:32:01.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/QDocument.C	2003-04-29 20:03:52.361659250 +0200
 @@ -275,7 +275,7 @@
  		break;
  	case 3:
@@ -20,8 +77,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QDocument.C lyx-1.3.1/src/frontends/
  		case BufferParams::PAPER_DEFAULT: break;
  
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C lyx-1.3.1/src/frontends/qt2/QGraphics.C
---- lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C	2003-04-29 10:14:36.489484058 +0200
-+++ lyx-1.3.1/src/frontends/qt2/QGraphics.C	2003-04-29 10:17:39.566260764 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C	2002-12-17 21:37:10.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/QGraphics.C	2003-04-29 20:03:52.362682905 +0200
 @@ -141,7 +141,7 @@
  	InsetGraphicsParams & igp = controller().params();
  
@@ -41,8 +98,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C lyx-1.3.1/src/frontends/
  	dialog_->heightUnit->setCurrentItem(unit_);
  
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C lyx-1.3.1/src/frontends/qt2/QMinipage.C
---- lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C	2003-04-29 10:14:36.492430471 +0200
-+++ lyx-1.3.1/src/frontends/qt2/QMinipage.C	2003-04-29 10:17:57.366972496 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C	2002-12-17 21:37:10.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/QMinipage.C	2003-04-29 20:03:52.363209925 +0200
 @@ -56,7 +56,7 @@
  void QMinipage::apply()
  {
@@ -53,8 +110,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C lyx-1.3.1/src/frontends/
  		unit = LyXLength::UNIT_NONE;
  
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C lyx-1.3.1/src/frontends/qt2/qt_helpers.C
---- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C	2003-04-29 10:14:36.508465835 +0200
-+++ lyx-1.3.1/src/frontends/qt2/qt_helpers.C	2003-04-29 10:18:14.033381605 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C	2002-12-17 21:37:11.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/qt_helpers.C	2003-04-29 20:03:52.363693126 +0200
 @@ -67,14 +67,14 @@
  	if (isValidGlueLength(fromqstr(length)))
  		return fromqstr(length);
@@ -73,8 +130,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C lyx-1.3.1/src/frontends
  	if (len.empty()) {
  		// no length (UNIT_NONE)
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h lyx-1.3.1/src/frontends/qt2/qt_helpers.h
---- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h	2003-04-29 10:14:36.508316627 +0200
-+++ lyx-1.3.1/src/frontends/qt2/qt_helpers.h	2003-04-29 10:18:25.972214609 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h	2002-12-17 21:37:11.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/qt_helpers.h	2003-04-29 20:03:52.364154800 +0200
 @@ -35,7 +35,7 @@
   
  /// method to set widgets from a LyXLength
@@ -85,8 +142,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h lyx-1.3.1/src/frontends
  /**
   * toqstr - convert char * into unicode
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QTabular.C lyx-1.3.1/src/frontends/qt2/QTabular.C
---- lyx-1.3.1.orig/src/frontends/qt2/QTabular.C	2003-04-29 10:14:36.502484876 +0200
-+++ lyx-1.3.1/src/frontends/qt2/QTabular.C	2003-04-29 10:18:36.772529236 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/QTabular.C	2003-02-07 15:31:40.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/QTabular.C	2003-04-29 20:03:52.364906771 +0200
 @@ -165,7 +165,7 @@
  	bool const isReadonly = bc().bp().isReadOnly();
  	dialog_->specialAlignmentED->setEnabled(!isReadonly);
@@ -97,8 +154,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QTabular.C lyx-1.3.1/src/frontends/q
  		dialog_->widthED->setText(toqstr(tostr(pwidth.value())));
  		dialog_->widthUnit->setCurrentItem(pwidth.unit());
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QWrap.C lyx-1.3.1/src/frontends/qt2/QWrap.C
---- lyx-1.3.1.orig/src/frontends/qt2/QWrap.C	2003-04-29 10:14:36.505016784 +0200
-+++ lyx-1.3.1/src/frontends/qt2/QWrap.C	2003-04-29 10:18:48.057925307 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/QWrap.C	2002-12-17 21:37:10.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/QWrap.C	2003-04-29 20:03:52.365432794 +0200
 @@ -56,7 +56,7 @@
  void QWrap::apply()
  {
@@ -109,8 +166,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QWrap.C lyx-1.3.1/src/frontends/qt2/
  		unit = LyXLength::UNIT_NONE;
  
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/ClassModuleBase.ui
---- lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui	2003-04-29 10:14:36.530736311 +0200
-+++ lyx-1.3.1/src/frontends/qt2/ui/ClassModuleBase.ui	2003-04-29 10:19:00.507553445 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui	2003-02-18 15:02:18.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/ui/ClassModuleBase.ui	2003-04-29 20:03:52.366169585 +0200
 @@ -322,7 +322,7 @@
              <verdata>5</verdata>
          </sizepolicy>
@@ -121,8 +178,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui lyx-1.3.1/src/
  </customwidgets>
  <images>
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/MarginsModuleBase.ui
---- lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui	2003-04-29 10:14:36.531483639 +0200
-+++ lyx-1.3.1/src/frontends/qt2/ui/MarginsModuleBase.ui	2003-04-29 10:19:10.504091112 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui	2003-02-18 15:02:18.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/ui/MarginsModuleBase.ui	2003-04-29 20:03:52.366987455 +0200
 @@ -401,7 +401,7 @@
              <verdata>5</verdata>
          </sizepolicy>
@@ -133,8 +190,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui lyx-1.3.1/sr
  </customwidgets>
  <images>
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/PaperModuleBase.ui
---- lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui	2003-04-29 10:14:36.532370372 +0200
-+++ lyx-1.3.1/src/frontends/qt2/ui/PaperModuleBase.ui	2003-04-29 10:19:18.879282050 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui	2003-01-23 17:23:39.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/ui/PaperModuleBase.ui	2003-04-29 20:03:52.367739413 +0200
 @@ -286,7 +286,7 @@
              <verdata>5</verdata>
          </sizepolicy>
@@ -145,8 +202,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui lyx-1.3.1/src/
  </customwidgets>
  <images>
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QGraphicsDialogBase.ui
---- lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui	2003-04-29 10:14:36.540505812 +0200
-+++ lyx-1.3.1/src/frontends/qt2/ui/QGraphicsDialogBase.ui	2003-04-29 10:19:26.681562509 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui	2003-01-23 17:23:40.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/ui/QGraphicsDialogBase.ui	2003-04-29 20:03:52.370563925 +0200
 @@ -1212,7 +1212,7 @@
              <verdata>5</verdata>
          </sizepolicy>
@@ -157,8 +214,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui lyx-1.3.1/
  </customwidgets>
  <images>
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QMinipageDialogBase.ui
---- lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui	2003-04-29 10:14:36.545443862 +0200
-+++ lyx-1.3.1/src/frontends/qt2/ui/QMinipageDialogBase.ui	2003-04-29 10:19:54.955951154 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui	2003-02-25 15:10:05.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/ui/QMinipageDialogBase.ui	2003-04-29 20:03:52.371717175 +0200
 @@ -346,7 +346,7 @@
              <verdata>5</verdata>
          </sizepolicy>
@@ -178,8 +235,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui lyx-1.3.1/
          <slot>change_adaptor()</slot>
      </connection>
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QTabularDialogBase.ui
---- lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui	2003-04-29 10:14:36.558619619 +0200
-+++ lyx-1.3.1/src/frontends/qt2/ui/QTabularDialogBase.ui	2003-04-29 10:20:24.883229624 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui	2003-01-23 17:23:40.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/ui/QTabularDialogBase.ui	2003-04-29 20:03:52.374644549 +0200
 @@ -1356,7 +1356,7 @@
              <verdata>5</verdata>
          </sizepolicy>
@@ -199,8 +256,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui lyx-1.3.1/s
          <slot>width_changed()</slot>
      </connection>
 diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QWrapDialogBase.ui
---- lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui	2003-04-29 10:14:36.561297002 +0200
-+++ lyx-1.3.1/src/frontends/qt2/ui/QWrapDialogBase.ui	2003-04-29 10:20:39.279541103 +0200
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui	2003-01-13 11:33:23.000000000 +0100
++++ lyx-1.3.1/src/frontends/qt2/ui/QWrapDialogBase.ui	2003-04-29 20:03:52.375768392 +0200
 @@ -340,7 +340,7 @@
              <verdata>5</verdata>
          </sizepolicy>
@@ -220,8 +277,8 @@ diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui lyx-1.3.1/src/
          <slot>change_adaptor()</slot>
      </connection>
 diff -Naur lyx-1.3.1.orig/src/lengthcommon.C lyx-1.3.1/src/lengthcommon.C
---- lyx-1.3.1.orig/src/lengthcommon.C	2003-04-29 10:14:36.267553251 +0200
-+++ lyx-1.3.1/src/lengthcommon.C	2003-04-29 10:20:58.940480513 +0200
+--- lyx-1.3.1.orig/src/lengthcommon.C	2002-11-25 02:15:10.000000000 +0100
++++ lyx-1.3.1/src/lengthcommon.C	2003-04-29 20:03:52.376260266 +0200
 @@ -45,10 +45,10 @@
  //	N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"),
  //	N_("theight%"), N_("pheight%") };
@@ -236,8 +293,8 @@ diff -Naur lyx-1.3.1.orig/src/lengthcommon.C lyx-1.3.1/src/lengthcommon.C
 +	return static_cast<LyXLength::LENUNIT>(i);
  }
 diff -Naur lyx-1.3.1.orig/src/lengthcommon.h lyx-1.3.1/src/lengthcommon.h
---- lyx-1.3.1.orig/src/lengthcommon.h	2003-04-29 10:14:36.267695290 +0200
-+++ lyx-1.3.1/src/lengthcommon.h	2003-04-29 10:21:09.266821769 +0200
+--- lyx-1.3.1.orig/src/lengthcommon.h	2002-11-17 12:24:08.000000000 +0100
++++ lyx-1.3.1/src/lengthcommon.h	2003-04-29 20:03:52.376643680 +0200
 @@ -19,7 +19,7 @@
  extern char const * unit_name_ltx[];
  
@@ -248,8 +305,8 @@ diff -Naur lyx-1.3.1.orig/src/lengthcommon.h lyx-1.3.1/src/lengthcommon.h
  
  #endif // LENGTH_COMMON_H
 diff -Naur lyx-1.3.1.orig/src/lyxlength.C lyx-1.3.1/src/lyxlength.C
---- lyx-1.3.1.orig/src/lyxlength.C	2003-04-29 10:14:36.274763602 +0200
-+++ lyx-1.3.1/src/lyxlength.C	2003-04-29 10:21:26.441919128 +0200
+--- lyx-1.3.1.orig/src/lyxlength.C	2002-12-04 03:57:14.000000000 +0100
++++ lyx-1.3.1/src/lyxlength.C	2003-04-29 20:09:34.116688131 +0200
 @@ -31,7 +31,7 @@
  {}
  
@@ -277,18 +334,44 @@ diff -Naur lyx-1.3.1.orig/src/lyxlength.C lyx-1.3.1/src/lyxlength.C
  {
  	unit_ = u;
  }
-diff -Naur lyx-1.3.1.orig/src/lyxlength.h lyx-1.3.1.mod/src/lyxlength.h
---- lyx-1.3.1.orig/src/lyxlength.h	2003-04-29 10:14:36.274901323 +0200
-+++ lyx-1.3.1.mod/src/lyxlength.h	2003-04-29 11:00:35.626055720 +0200
-@@ -23,7 +23,7 @@
+@@ -156,7 +156,7 @@
+ 	double result = 0.0;
+ 
+ 	switch (unit_) {
+-	case LyXLength::SP:
++	case LyXLength::LYX_SP:
+ 		// Scaled point: sp = 1/65536 pt
+ 		result = zoom * dpi * val_
+ 			/ (72.27 * 65536); // 4736286.7
+@@ -181,7 +181,7 @@
+ 		result = zoom * dpi * val_
+ 			/ 25.4; // 25.4
+ 		break;
+-	case LyXLength::PC:
++	case LyXLength::LYX_PC:
+ 		// Pica: 1 pc = 12 pt
+ 		result = zoom * dpi * val_
+ 			/ (72.27 / 12); // 6.0225
+diff -Naur lyx-1.3.1.orig/src/lyxlength.h lyx-1.3.1/src/lyxlength.h
+--- lyx-1.3.1.orig/src/lyxlength.h	2002-12-04 03:57:14.000000000 +0100
++++ lyx-1.3.1/src/lyxlength.h	2003-04-29 20:05:52.608542869 +0200
+@@ -23,13 +23,13 @@
  class LyXLength {
  public:
  	/// length units
 -	enum UNIT {
+-		SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit.
 +	enum LENUNIT {
- 		SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit.
++		LYX_SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit.
  		PT, ///< Point = 1/72.27in = 0.351mm
  		BP, ///< Big point (72bp = 1in), also PostScript point
+ 		DD, ///< Didot point = 1/72 of a French inch, = 0.376mm
+ 		MM, ///< Millimeter = 2.845pt
+-		PC, ///< Pica = 12pt = 4.218mm
++		LYX_PC, ///< Pica = 12pt = 4.218mm
+ 		CC, ///< Cicero = 12dd = 4.531mm
+ 		CM, ///< Centimeter = 10mm = 2.371pc
+ 		IN, ///< Inch = 25.4mm = 72.27pt = 6.022pc
 @@ -48,7 +48,7 @@
  	///
  	LyXLength();
@@ -321,66 +404,9 @@ diff -Naur lyx-1.3.1.orig/src/lyxlength.h lyx-1.3.1.mod/src/lyxlength.h
  };
  
  ///
-diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C lyx-1.3.1/src/frontends/qt2/lengthcombo.C
---- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C	Tue Dec 17 21:37:11 2002
-+++ lyx-1.3.1/src/frontends/qt2/lengthcombo.C	Tue Apr 29 13:21:19 2003
-@@ -35,9 +35,9 @@
- }
- 
- 
--LyXLength::UNIT LengthCombo::currentLengthItem() const
-+LyXLength::LENUNIT LengthCombo::currentLengthItem() const
- {
--	return static_cast<LyXLength::UNIT>(currentItem());
-+	return static_cast<LyXLength::LENUNIT>(currentItem());
- }
- 
- 
-@@ -47,7 +47,7 @@
- }
- 
- 
--void LengthCombo::setCurrentItem(LyXLength::UNIT unit)
-+void LengthCombo::setCurrentItem(LyXLength::LENUNIT unit)
- {
- 	QComboBox::setCurrentItem(int(unit));
- }
-diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h lyx-1.3.1/src/frontends/qt2/lengthcombo.h
---- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h	Sun Nov 17 12:24:08 2002
-+++ lyx-1.3.1/src/frontends/qt2/lengthcombo.h	Tue Apr 29 12:43:22 2003
-@@ -21,7 +21,7 @@
- #include "vspace.h"
- 
- /**
-- * A combo box for selecting LyXLength::UNIT types.
-+ * A combo box for selecting LyXLength::LENUNIT types.
-  */
- class LengthCombo : public QComboBox {
- 	Q_OBJECT
-@@ -29,9 +29,9 @@
- 	LengthCombo(QWidget * parent, char * name);
- 
- 	/// set the current item
--	virtual void setCurrentItem(LyXLength::UNIT unit);
-+	virtual void setCurrentItem(LyXLength::LENUNIT unit);
- 	/// get the current item
--	LyXLength::UNIT currentLengthItem() const;
-+	LyXLength::LENUNIT currentLengthItem() const;
- 	/// enable the widget
- 	virtual void setEnabled(bool b);
- 
-@@ -39,7 +39,7 @@
- 	virtual void has_activated(int index);
- signals:
- 	/// the current selection has changed
--	void selectionChanged(LyXLength::UNIT unit);
-+	void selectionChanged(LyXLength::LENUNIT unit);
- 
- };
- 
 diff -Naur lyx-1.3.1.orig/src/vspace.C lyx-1.3.1/src/vspace.C
---- lyx-1.3.1.orig/src/vspace.C	Sun Dec  1 23:59:17 2002
-+++ lyx-1.3.1/src/vspace.C	Tue Apr 29 12:32:10 2003
+--- lyx-1.3.1.orig/src/vspace.C	2002-12-01 23:59:17.000000000 +0100
++++ lyx-1.3.1/src/vspace.C	2003-04-29 20:03:52.379626127 +0200
 @@ -32,7 +32,7 @@
  /// used to return numeric values in parsing vspace
  double number[4] = { 0, 0, 0, 0 };