X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.h;h=92ae53231921fe919f4e2c881f4f9f16a6ed63d5;hb=946895278050e4a464c9591e99232a72f5f4dec9;hp=546ae3a11791bc1117fd7a188be08c15d83ca5aa;hpb=c52895023e231587208b5c9257ae7825dc493ef0;p=lyx.git

diff --git a/src/vspace.h b/src/vspace.h
index 546ae3a117..92ae532319 100644
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -61,6 +61,7 @@ public:
 	LyXLength(float v, LyXLength::UNIT u) : val(v), uni(u) {}
 
 	/** "data" must be a decimal number, followed by a unit. */
+	explicit
         LyXLength(string const & data);
 	//@}
 	
@@ -72,9 +73,6 @@ public:
 	LyXLength::UNIT unit() const { return uni; };
 	//@}
 
-	///
-        bool operator== (LyXLength const &) const;
-
 	/// conversion
 	virtual string asString() const;
 	///
@@ -93,6 +91,15 @@ protected:
 	LyXLength::UNIT uni;
 };
 
+
+inline
+bool operator==(LyXLength const & l1, LyXLength const & l2)
+{
+	return l1.value() == l2.value()
+		&& l1.unit() == l2.unit();
+}
+	
+
 extern LyXLength::UNIT unitFromString (string const & data);
 extern bool isValidLength(string const & data, LyXLength * result);
 
@@ -102,9 +109,12 @@ public:
 	//@Man: constructors
 	//@{
 	///
-	LyXGlueLength(float v,      LyXLength::UNIT u, 
-		      float pv= 0.0, LyXLength::UNIT pu= LyXLength::UNIT_NONE, 
-		      float mv= 0.0, LyXLength::UNIT mu= LyXLength::UNIT_NONE) 
+	LyXGlueLength(float v,
+		      LyXLength::UNIT u, 
+		      float pv = 0.0,
+		      LyXLength::UNIT pu = LyXLength::UNIT_NONE, 
+		      float mv = 0.0,
+		      LyXLength::UNIT mu = LyXLength::UNIT_NONE) 
 		: LyXLength (v, u), 
 		  plus_val(pv), minus_val(mv), 
 		  plus_uni(pu), minus_uni(mu) {}
@@ -115,6 +125,7 @@ public:
 	  1.2 cm  //  4mm +2pt  //  2cm -4mm +2mm  //  4+0.1-0.2cm
 	  The traditional Latex format is also accepted, like  
 	  4cm plus 10pt minus 10pt */
+	explicit
         LyXGlueLength(string const & data);
 	//@}
 	
@@ -130,9 +141,6 @@ public:
 	LyXLength::UNIT minusUnit() const { return minus_uni; };
 	//@}
 
-	///
-        bool operator == (LyXGlueLength const &) const;
-
 	/// conversion
 	virtual string asString() const;
 	///
@@ -151,6 +159,20 @@ protected:
 	LyXLength::UNIT plus_uni, minus_uni;
 };
 
+///
+inline
+bool operator==(LyXGlueLength const & l1, LyXGlueLength const & l2)
+{
+	return l1.value() == l2.value()
+		&& l1.unit() == l2.unit()
+		&& l1.plusValue() == l2.plusValue()
+		&& l1.plusUnit() == l2.plusUnit()
+		&& l1.minusValue() == l2.minusValue()
+		&& l1.minusUnit() == l2.minusUnit();
+}
+
+
+
 extern bool isValidGlueLength(string const & data, LyXGlueLength * result);
 
 ///  VSpace class
@@ -160,28 +182,33 @@ public:
 	enum vspace_kind { NONE, DEFSKIP, 
 			   SMALLSKIP, MEDSKIP, BIGSKIP, 
 			   VFILL, LENGTH };
-	// constructors
+	/// constructors
 	VSpace() : 
 		kin (NONE), 
 		len(0.0, LyXLength::PT),
                 kp (false) {}
-
+	///
+	explicit
 	VSpace(vspace_kind k) : 
 		kin (k), 
 		len (0.0, LyXLength::PT),
 	        kp (false) {}
-
+	///
+	explicit
 	VSpace(LyXGlueLength l) :
 		kin (LENGTH),
 		len (l),
 	        kp (false) {}
 
+	///
+	explicit
 	VSpace(float v, LyXLength::UNIT u) : 
 		kin (LENGTH), 
 		len (v, u),
 	        kp (false) {}
 
 	/// this constructor is for reading from a .lyx file
+	explicit
 	VSpace(string const & data);
 	
 	// access functions
@@ -203,6 +230,8 @@ public:
 	string asLatexCommand(BufferParams const & params) const;
 	///
 	int inPixels(BufferView * bv) const;
+	///
+	int inPixels(int default_height, int default_skip) const;
 private:
 	///
 	vspace_kind  kin;