X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.C;h=832fe8f1e3d1897884a731aadfdb63e5e21ba08d;hb=c90c5e6386ce69c34c99b3594d6fa452e6a13161;hp=6014dea5cb5f8a9fadfdf49c747179c0dd949ce5;hpb=4c295014fe141d56fcfd110473ab53c4e86e62d4;p=lyx.git

diff --git a/src/Spacing.C b/src/Spacing.C
index 6014dea5cb..832fe8f1e3 100644
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -22,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;
@@ -43,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;
@@ -56,7 +59,7 @@ void Spacing::set(Spacing::Space sp, float val)
 void Spacing::set(Spacing::Space sp, string const & val)
 {
 	float fval;
-	istringstream istr(val);
+	istringstream istr(val.c_str());
 	istr >> fval;
 	set(sp, fval);
 }
@@ -81,7 +84,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}";
@@ -103,7 +106,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}";