Change to use preffered calling of Boost.Function

[lyx.git] / src / Spacing.C

diff --git a/src/Spacing.C b/src/Spacing.C
index 1bbb945f9f48e51ad0f743c3d2c349c9ca4f1f3b..8c5d26a155b2c5d626cc3e97bc75fb327e5a2533 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -1,25 +1,27 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file Spacing.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "Lsstream.h"
 #include "Spacing.h"
-#include "LString.h"
+
+#include <sstream>
+#include <string>
 
 using std::ios;
+using std::istringstream;
 using std::ostream;
+using std::ostringstream;
+using std::string;
+
 
 string const Spacing::spacing_string[]
        = {"single", "onehalf", "double", "other"};
@@ -54,7 +56,7 @@ void Spacing::set(Spacing::Space sp, float val)
 void Spacing::set(Spacing::Space sp, string const & val)
 {
        float fval = 0.0;
-       istringstream istr(val.c_str());
+       istringstream istr(val);
        istr >> fval;
        set(sp, fval);
 }
@@ -70,9 +72,9 @@ void Spacing::writeFile(ostream & os, bool para) const
                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";
+               os << cmd << spacing_string[getSpace()] << "\n";
        }
 }
 
@@ -91,8 +93,8 @@ string const Spacing::writeEnvirBegin() const
        {
                ostringstream ost;
                ost << "\\begin{spacing}{"
-                   << getValue() << "}";
-               return ost.str().c_str();
+                   << getValue() << '}';
+               return ost.str();
        }
        }
        return string();