couple of LinkedLists converted to STL lists in BScreen

[chaz/openbox] / src / Slit.cc

diff --git a/src/Slit.cc b/src/Slit.cc
index 0da4b11dec03dba86992d123560391c5e7952003..85a7c64d9dcc9c2fe584d1164ea2b242806ebb9a 100644 (file)
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -41,8 +41,9 @@
 #include "Slit.h"
 #include "Toolbar.h"
 
-#include <string>
 #include <strstream>
+#include <string>
+using namespace std;
 
 Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
   openbox(scr.getOpenbox()), config(conf)
@@ -104,7 +105,6 @@ Slit::~Slit() {
 
 
 void Slit::addClient(Window w) {
-  cout << "ADDCLIENT\n";
   openbox.grab();
 
   if (openbox.validateWindow(w)) {
@@ -157,7 +157,6 @@ void Slit::addClient(Window w) {
     XFlush(display);
 
     clientList.push_back(client);
-    cout << "SLIT COUNT " << clientList.size() << endl;
 
     openbox.saveSlitSearch(client->client_window, this);
     openbox.saveSlitSearch(client->icon_window, this);
@@ -213,7 +212,7 @@ void Slit::removeClient(Window w, Bool remap) {
 
 void Slit::setOnTop(bool b) {
   m_ontop = b;
-  std::ostrstream s;
+  ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".slit.onTop" << ends;
   config.setValue(s.str(), m_ontop ? "True" : "False");
   s.rdbuf()->freeze(0);
@@ -221,7 +220,7 @@ void Slit::setOnTop(bool b) {
 
 void Slit::setAutoHide(bool b) {
   m_autohide = b;
-  std::ostrstream s;
+  ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide" << ends;
   config.setValue(s.str(), m_autohide ? "True" : "False");
   s.rdbuf()->freeze(0);
@@ -229,9 +228,9 @@ void Slit::setAutoHide(bool b) {
 
 void Slit::setPlacement(int p) {
   m_placement = p;
-  std::ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".slit.placement" <<
-    ends;
+  ostrstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.placement"
+    << ends;
   const char *placement;
   switch (m_placement) {
   case TopLeft: placement = "TopLeft"; break;
@@ -249,9 +248,9 @@ void Slit::setPlacement(int p) {
 
 void Slit::setDirection(int d) {
   m_direction = d;
-  std::ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".slit.direction" <<
-    ends;
+  ostrstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.direction"
+    << ends;
   config.setValue(s.str(),
                   m_direction == Horizontal ? "Horizontal" : "Vertical");
   s.rdbuf()->freeze(0);
@@ -265,8 +264,8 @@ void Slit::save() {
 }
 
 void Slit::load() {
-  std::ostrstream rscreen, rname, rclass;
-  std::string s;
+  ostrstream rscreen, rname, rclass;
+  string s;
   bool b;
   rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;
 
@@ -293,6 +292,7 @@ void Slit::load() {
     m_placement = CenterRight;
 
   rname.seekp(0); rclass.seekp(0);
+  rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
   rname << rscreen.str() << "slit.direction" << ends;
   rclass << rscreen.str() << "Slit.Direction" << ends;
   if (config.getValue(rname.str(), rclass.str(), s)) {
@@ -304,6 +304,7 @@ void Slit::load() {
     m_direction = Vertical;
  
   rname.seekp(0); rclass.seekp(0);
+  rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
   rname << rscreen.str() << "slit.onTop" << ends;
   rclass << rscreen.str() << "Slit.OnTop" << ends;
   if (config.getValue(rname.str(), rclass.str(), b))
@@ -312,6 +313,7 @@ void Slit::load() {
     m_ontop = false;
 
   rname.seekp(0); rclass.seekp(0);
+  rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
   rname << rscreen.str() << "slit.autoHide" << ends;
   rclass << rscreen.str() << "Slit.AutoHide" << ends;
   if (config.getValue(rname.str(), rclass.str(), b))
@@ -320,8 +322,7 @@ void Slit::load() {
     m_hidden = m_autohide = false;
 
   rscreen.rdbuf()->freeze(0);
-  rname.rdbuf()->freeze(0);
-  rclass.rdbuf()->freeze(0);
+  rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
 }
 
 void Slit::reconfigure(void) {
@@ -369,7 +370,6 @@ void Slit::reconfigure(void) {
 
     break;
   }
-  cout << "SLIT SIZE " << frame.area.w() << "," << frame.area.h() << endl;
 
   reposition();