gcc 3 compatibility, converted strstreams to stringstreams

[chaz/openbox] / src / Slit.cc

diff --git a/src/Slit.cc b/src/Slit.cc
index d9ffc16728c75ede713a693b2befa855eb823cee..9e9073d640bdef78ec78311d74289f013fb74fdd 100644 (file)
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -41,8 +41,11 @@
 #include "Slit.h"
 #include "Toolbar.h"
 
+#ifdef    HAVE_SSTREAM
+#  include <sstream>
+#endif // HAVE_SSTREAM
+
 #include <string>
-#include <strstream>
 
 Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
   openbox(scr.getOpenbox()), config(conf)
@@ -211,25 +214,22 @@ void Slit::removeClient(Window w, Bool remap) {
 
 void Slit::setOnTop(bool b) {
   m_ontop = b;
-  std::ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".slit.onTop" << ends;
+  std::ostringstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.onTop";
   config.setValue(s.str(), m_ontop ? "True" : "False");
-  s.rdbuf()->freeze(0);
 }
 
 void Slit::setAutoHide(bool b) {
   m_autohide = b;
-  std::ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide" << ends;
+  std::ostringstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide";
   config.setValue(s.str(), m_autohide ? "True" : "False");
-  s.rdbuf()->freeze(0);
 }
 
 void Slit::setPlacement(int p) {
   m_placement = p;
-  std::ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".slit.placement" <<
-    ends;
+  std::ostringstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.placement";
   const char *placement;
   switch (m_placement) {
   case TopLeft: placement = "TopLeft"; break;
@@ -242,17 +242,14 @@ void Slit::setPlacement(int p) {
   case CenterRight: default: placement = "CenterRight"; break;
   }
   config.setValue(s.str(), placement);
-  s.rdbuf()->freeze(0);
 }
 
 void Slit::setDirection(int d) {
   m_direction = d;
-  std::ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".slit.direction" <<
-    ends;
+  std::ostringstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.direction";
   config.setValue(s.str(),
                   m_direction == Horizontal ? "Horizontal" : "Vertical");
-  s.rdbuf()->freeze(0);
 }
 
 void Slit::save() {
@@ -263,13 +260,13 @@ void Slit::save() {
 }
 
 void Slit::load() {
-  std::ostrstream rscreen, rname, rclass;
+  std::ostringstream rscreen, rname, rclass;
   std::string s;
   bool b;
-  rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;
+  rscreen << "session.screen" << screen.getScreenNumber() << '.';
 
-  rname << rscreen.str() << "slit.placement" << ends;
-  rclass << rscreen.str() << "Slit.Placement" << ends;
+  rname << rscreen.str() << "slit.placement";
+  rclass << rscreen.str() << "Slit.Placement";
   if (config.getValue(rname.str(), rclass.str(), s)) {
     if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
       m_placement = TopLeft;
@@ -291,8 +288,8 @@ void Slit::load() {
     m_placement = CenterRight;
 
   rname.seekp(0); rclass.seekp(0);
-  rname << rscreen.str() << "slit.direction" << ends;
-  rclass << rscreen.str() << "Slit.Direction" << ends;
+  rname << rscreen.str() << "slit.direction";
+  rclass << rscreen.str() << "Slit.Direction";
   if (config.getValue(rname.str(), rclass.str(), s)) {
     if (0 == strncasecmp(s.c_str(), "Horizontal", s.length()))
       m_direction = Horizontal;
@@ -302,24 +299,20 @@ void Slit::load() {
     m_direction = Vertical;
  
   rname.seekp(0); rclass.seekp(0);
-  rname << rscreen.str() << "slit.onTop" << ends;
-  rclass << rscreen.str() << "Slit.OnTop" << ends;
+  rname << rscreen.str() << "slit.onTop";
+  rclass << rscreen.str() << "Slit.OnTop";
   if (config.getValue(rname.str(), rclass.str(), b))
     m_ontop = b;
   else
     m_ontop = false;
 
   rname.seekp(0); rclass.seekp(0);
-  rname << rscreen.str() << "slit.autoHide" << ends;
-  rclass << rscreen.str() << "Slit.AutoHide" << ends;
+  rname << rscreen.str() << "slit.autoHide";
+  rclass << rscreen.str() << "Slit.AutoHide";
   if (config.getValue(rname.str(), rclass.str(), b))
     m_hidden = m_autohide = b;
   else
     m_hidden = m_autohide = false;
-
-  rscreen.rdbuf()->freeze(0);
-  rname.rdbuf()->freeze(0);
-  rclass.rdbuf()->freeze(0);
 }
 
 void Slit::reconfigure(void) {