X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt2%2Flengthcombo.C;h=fb4866af8f211edc501c9701b188f58bf89b57fa;hb=1229a2712d3f4fe1392616a6973e1830cf3124ef;hp=736a5eb056c5e55dd66d0edad1b066d6cd4ceb3a;hpb=bb581048a857f8d30941fcd4993a8edbec21791f;p=lyx.git

diff --git a/src/frontends/qt2/lengthcombo.C b/src/frontends/qt2/lengthcombo.C
index 736a5eb056..fb4866af8f 100644
--- a/src/frontends/qt2/lengthcombo.C
+++ b/src/frontends/qt2/lengthcombo.C
@@ -8,14 +8,15 @@
 
 #include <config.h>
 #include "gettext.h"
- 
+
 #include "lengthcombo.h"
- 
-#include <qwhatsthis.h> 
+
+#include <qwhatsthis.h>
 
 LengthCombo::LengthCombo(QWidget * parent, char * name)
 	: QComboBox(parent, name)
 {
+	// FIXME: check these should all be here, I think not
 	insertItem(_("cm"));
 	insertItem(_("in"));
 	insertItem(_("pt"));
@@ -40,7 +41,7 @@ LengthCombo::LengthCombo(QWidget * parent, char * name)
 
 
 LyXLength::UNIT LengthCombo::currentLengthItem() const
-{ 
+{
 	LyXLength::UNIT unit;
 	int i = currentItem();
 	switch (i) {
@@ -57,21 +58,21 @@ LyXLength::UNIT LengthCombo::currentLengthItem() const
 		case 9: unit = LyXLength::DD; break;
 		case 10: unit = LyXLength::CC; break;
 		case 11: unit = LyXLength::MU; break;
-		case 12: unit = LyXLength::PP; break;
-		case 13: unit = LyXLength::PW; break;
-		case 14: unit = LyXLength::PL; break;
-		// FIXME: LyXLength::PE ?
+		case 12: unit = LyXLength::PPW; break;
+		case 13: unit = LyXLength::PCW; break;
+		case 14: unit = LyXLength::PLW; break;
+		// FIXME: LyXLength::PTW ?
 	};
 	return unit;
-} 
- 
+}
+
 
 void LengthCombo::has_activated(int)
 {
 	emit selectionChanged(currentLengthItem());
 }
 
- 
+
 void LengthCombo::setCurrentItem(LyXLength::UNIT unit)
 {
 	int i;
@@ -89,10 +90,10 @@ void LengthCombo::setCurrentItem(LyXLength::UNIT unit)
 		case LyXLength::DD: i = 9; break;
 		case LyXLength::CC: i = 10; break;
 		case LyXLength::MU: i = 11; break;
-		case LyXLength::PP: i = 12; break;
-		case LyXLength::PW: i = 13; break;
-		case LyXLength::PL: i = 14; break;
-		// FIXME: LyXLength::PE ?
+		case LyXLength::PPW: i = 12; break;
+		case LyXLength::PCW: i = 13; break;
+		case LyXLength::PLW: i = 14; break;
+		// FIXME: LyXLength::PTW ?
 	}
 	QComboBox::setCurrentItem(i);
 }