include sys/time.h

[lyx.git] / src / Spacing.C

diff --git a/src/Spacing.C b/src/Spacing.C
index 90d73d52f7ed9b7786b20fc9269d3a9471bfc3cc..cebf350dc7ae0ca87641ee616b4c87b13c0b0f18 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -10,10 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "Lsstream.h"
 #include "Spacing.h"
 #include "LString.h"
@@ -21,15 +17,10 @@
 using std::ios;
 using std::ostream;
 
-/// how can I put this inside of Spacing (class)
-namespace {
-
-char const * const spacing_string[] = {"single", "onehalf", "double", "other"};
-
-} // namespace anon
+string const Spacing::spacing_string[]
+       = {"single", "onehalf", "double", "other"};
 
-
-float Spacing::getValue() const 
+float Spacing::getValue() const
 {
        switch (space) {
        case Default: // nothing special should happen with this...
@@ -68,17 +59,17 @@ void Spacing::set(Spacing::Space sp, string const & val)
 void Spacing::writeFile(ostream & os, bool para) const
 {
        if (space == Default) return;
-       
+
        string cmd = para ? "\\paragraph_spacing " : "\\spacing ";
-       
+
        if (getSpace() == Spacing::Other) {
                os.setf(ios::showpoint|ios::fixed);
                os.precision(2);
                os << cmd << spacing_string[getSpace()]
-                  << " " << getValue() << " \n";
+                  << ' ' << getValue() << " \n";
        } else {
                os << cmd << spacing_string[getSpace()] << " \n";
-       }       
+       }
 }
 
 
@@ -96,8 +87,8 @@ string const Spacing::writeEnvirBegin() const
        {
                ostringstream ost;
                ost << "\\begin{spacing}{"
-                   << getValue() << "}";
-               return ost.str().c_str();
+                   << getValue() << '}';
+               return STRCONV(ost.str());
        }
        }
        return string();