Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / Spacing.h

diff --git a/src/Spacing.h b/src/Spacing.h
index 5c9d2c653492e32930432d8bb561bee6245c3d1c..7761bbf9aa7c29027473ed845e118303407ba3a0 100644 (file)
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -12,10 +12,16 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#include <iosfwd>
+#ifdef TEX2LYX
+#include "tex2lyx/Spacing.h"
+#else
+
+#include "support/strfwd.h"
 #include <string>
 
 
+namespace lyx {
+
 ///
 class Spacing {
 public:
@@ -35,16 +41,11 @@ public:
        ///
        Spacing() : space(Default), value("1.0") {}
        ///
-       Spacing(Spacing::Space sp, float val = 1.0) {
-               set(sp, val);
-       }
-       Spacing(Spacing::Space sp, std::string const & val) {
-               set(sp, val);
-       }
+       Spacing(Spacing::Space sp, double val = 1.0) { set(sp, val); }
+       ///
+       Spacing(Spacing::Space sp, std::string const & val) { set(sp, val); }
        ///
-       bool isDefault() const {
-               return space == Default;
-       }
+       bool isDefault() const { return space == Default; }
        ///
        std::string const getValueAsString() const;
        ///
@@ -52,7 +53,7 @@ public:
        ///
        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);
        ///
@@ -86,4 +87,8 @@ bool operator!=(Spacing const & a, Spacing const & b)
 {
        return !(a == b);
 }
-#endif
+
+} // namespace lyx
+
+#endif // TEX2LYX
+#endif // SPACING_H