Point fix, earlier forgotten

[lyx.git] / src / Spacing.h

diff --git a/src/Spacing.h b/src/Spacing.h
index 120b14b97a875a06850acd39ee566ab6178e190a..cab426973203cb9e25f1b47719a885107aab96e4 100644 (file)
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -1,21 +1,17 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file Spacing.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef SPACING_H
 #define SPACING_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include <iosfwd>
 
 #include "LString.h"
@@ -37,7 +33,14 @@ public:
                Default
        };
        ///
-       Spacing() : space(Single), value(1.0) {}
+       Spacing() : space(Default), value(1.0) {}
+       ///
+       Spacing(Spacing::Space sp, float val = 1.0) {
+               set(sp, val);
+       }
+       Spacing(Spacing::Space sp, string const & val) {
+               set(sp, val);
+       }
        ///
        bool isDefault() const {
                return space == Default;
@@ -49,25 +52,36 @@ public:
        ///
        void set(Spacing::Space sp, float val = 1.0);
        ///
-       void set(Spacing::Space sp, char const * val) ;
+       void set(Spacing::Space sp, string const & val) ;
        ///
        void writeFile(std::ostream &, bool para = false) const;
        ///
-       string writeEnvirBegin() const;
-       ///
-       string writeEnvirEnd() const;
-       ///
-       friend bool operator==(Spacing const & a, Spacing const & b) {
-               return a.space == b.space && a.getValue() == b.getValue();
-       }
+       string const writeEnvirBegin() const;
        ///
-       friend bool operator!=(Spacing const & a, Spacing const & b) {
-               return !(a == b);
-       }
+       string const writeEnvirEnd() const;
+
 private:
        ///
        Space space;
        ///
        float value;
+       /// names of line spacing
+       static string const spacing_string[];
 };
+
+
+///
+inline
+bool operator==(Spacing const & a, Spacing const & b)
+{
+       return a.getSpace() == b.getSpace()
+               && a.getValue() == b.getValue();
+}
+
+///
+inline
+bool operator!=(Spacing const & a, Spacing const & b)
+{
+       return !(a == b);
+}
 #endif