X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.C;h=832fe8f1e3d1897884a731aadfdb63e5e21ba08d;hb=c90c5e6386ce69c34c99b3594d6fa452e6a13161;hp=f3ad1f66727ce77e460994540611342552045d3f;hpb=b88c49ebd758791f8805d6602901bc4fe15d43cd;p=lyx.git diff --git a/src/Spacing.C b/src/Spacing.C index f3ad1f6672..832fe8f1e3 100644 --- a/src/Spacing.C +++ b/src/Spacing.C @@ -14,14 +14,7 @@ #pragma implementation #endif -#ifdef HAVE_SSTREAM -#include -using std::istringstream; -using std::ostringstream; -#else -#include -#endif - +#include "Lsstream.h" #include "Spacing.h" #include "LString.h" @@ -29,13 +22,16 @@ using std::ios; using std::ostream; /// how can I put this inside of Spacing (class) -static -char const * spacing_string[] = {"single", "onehalf", "double", "other"}; +namespace { + +char const * const spacing_string[] = {"single", "onehalf", "double", "other"}; + +} // namespace anon 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; @@ -50,7 +46,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; @@ -60,14 +56,10 @@ void Spacing::set(Spacing::Space sp, float val) } -void Spacing::set(Spacing::Space sp, char const * val) +void Spacing::set(Spacing::Space sp, string const & val) { float fval; -#ifdef HAVE_SSTREAM - istringstream istr(val); -#else - istrstream istr(val); -#endif + istringstream istr(val.c_str()); istr >> fval; set(sp, fval); } @@ -90,9 +82,9 @@ void Spacing::writeFile(ostream & os, bool para) const } -string Spacing::writeEnvirBegin() const +string const Spacing::writeEnvirBegin() const { - switch(space) { + switch (space) { case Default: break; // do nothing case Single: return "\\begin{singlespace}"; @@ -101,28 +93,20 @@ string 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(); } -string Spacing::writeEnvirEnd() const +string const Spacing::writeEnvirEnd() const { - switch(space) { + switch (space) { case Default: break; // do nothing case Single: return "\\end{singlespace}";