remove CXX_WORKING_NAMESPACES

[lyx.git] / src / Spacing.C

diff --git a/src/Spacing.C b/src/Spacing.C
index 635ef1416975c462fbe82206bbf4655777d72a22..3d39cf4e326ec75538fb0f59e830edee3782d019 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -14,18 +14,7 @@
 #pragma implementation
 #endif
 
-#if 0
-#ifdef HAVE_SSTREAM
-#include <sstream>
-using std::istringstream;
-using std::ostringstream;
-#else
-#include <strstream>
-#endif
-#else
 #include "Lsstream.h"
-#endif
-
 #include "Spacing.h"
 #include "LString.h"
 
@@ -39,7 +28,7 @@ char const * spacing_string[] = {"single", "onehalf", "double", "other"};
 
 float Spacing::getValue() const 
 {
-       switch(space) {
+       switch (space) {
        case Default: // nothing special should happen with this...
        case Single: return 1.0;
        case Onehalf: return 1.25;
@@ -54,7 +43,7 @@ void Spacing::set(Spacing::Space sp, float val)
 {
        space = sp;
        if (sp == Other) {
-               switch(int(val * 1000 + 0.5)) {
+               switch (int(val * 1000 + 0.5)) {
                case 1000: space = Single; break;
                case 1250: space = Onehalf; break;
                case 1667: space = Double; break;
@@ -67,11 +56,7 @@ void Spacing::set(Spacing::Space sp, float val)
 void Spacing::set(Spacing::Space sp, string const & val)
 {
        float fval;
-//#ifdef HAVE_SSTREAM
-       istringstream istr(val);
-//#else
-//     istrstream istr(val.c_str());
-//#endif
+       istringstream istr(val.c_str());
        istr >> fval;
        set(sp, fval);
 }
@@ -96,7 +81,7 @@ void Spacing::writeFile(ostream & os, bool para) const
 
 string const Spacing::writeEnvirBegin() const
 {
-       switch(space) {
+       switch (space) {
        case Default: break; // do nothing
        case Single:
                return "\\begin{singlespace}";
@@ -105,22 +90,12 @@ string const Spacing::writeEnvirBegin() const
        case Double:
                return "\\begin{doublespace}";
        case Other:
-//#ifdef HAVE_SSTREAM
        {
                ostringstream ost;
                ost << "\\begin{spacing}{"
                    << getValue() << "}";
                return ost.str().c_str();
        }
-//#else
-//     {
-//             char tmp[512];
-//             ostrstream ost(tmp, 512);
-//             ost << "\\begin{spacing}{"
-//                 << getValue() << "}\0";
-//             return ost.str();
-//     }
-//#endif
        }
        return string();
 }
@@ -128,7 +103,7 @@ string const Spacing::writeEnvirBegin() const
 
 string const Spacing::writeEnvirEnd() const
 {
-       switch(space) {
+       switch (space) {
        case Default: break; // do nothing
        case Single:
                return "\\end{singlespace}";