X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=273786aced0a77d2d2dddc84543b36063e749bf8;hb=3ef684e752bb5afdbfdea51d4c3df4afe1461916;hp=03c5db72318e79b7c6329a289d35bcc5d12516f8;hpb=627f2c70fa6d5c75ef4dfe4e7252adc7c141e6f4;p=lyx.git diff --git a/src/Spacing.h b/src/Spacing.h index 03c5db7231..273786aced 100644 --- a/src/Spacing.h +++ b/src/Spacing.h @@ -13,6 +13,10 @@ #define SPACING_H #include +#include + + +namespace lyx { /// @@ -32,9 +36,9 @@ public: Default }; /// - Spacing() : space(Default), value(1.0) {} + Spacing() : space(Default), value("1.0") {} /// - Spacing(Spacing::Space sp, float val = 1.0) { + Spacing(Spacing::Space sp, double val = 1.0) { set(sp, val); } Spacing(Spacing::Space sp, std::string const & val) { @@ -45,13 +49,15 @@ public: return space == Default; } /// - float getValue() const; + std::string const getValueAsString() const; + /// + double getValue() const; /// Spacing::Space getSpace() const { return space; } /// - void set(Spacing::Space sp, float val = 1.0); + void set(Spacing::Space sp, double val = 1.0); /// - void set(Spacing::Space sp, std::string const & val) ; + void set(Spacing::Space sp, std::string const & val); /// void writeFile(std::ostream &, bool para = false) const; /// @@ -63,7 +69,7 @@ private: /// Space space; /// - float value; + std::string value; /// names of line spacing static std::string const spacing_string[]; }; @@ -74,7 +80,7 @@ inline bool operator==(Spacing const & a, Spacing const & b) { return a.getSpace() == b.getSpace() - && a.getValue() == b.getValue(); + && a.getValueAsString() == b.getValueAsString(); } /// @@ -82,5 +88,8 @@ inline bool operator!=(Spacing const & a, Spacing const & b) { return !(a == b); + + +} // namespace lyx } #endif