nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed all 'using namespace std;' calls.

Browse source
This commit is contained in:
Dana Jansens 2002-05-12 21:15:40 +00:00
parent 4969c1b084
commit ebdf25bf67
6 changed files with 41 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Basemenu.cc
View file

@ -43,7 +43,8 @@
#endif // HAVE_STRING_H #endif // HAVE_STRING_H
#include <algorithm> #include <algorithm>
using namespace std; using std::min;
using std::max;
#include "i18n.h" #include "i18n.h"
#include "openbox.h" #include "openbox.h"

3
src/Image.cc
View file

@ -67,7 +67,8 @@ typedef unsigned int u_int32_t;
#endif // HAVE_CTYPE_H #endif // HAVE_CTYPE_H
#include <algorithm> #include <algorithm>
using namespace std; using std::min;
using std::max;
static unsigned long bsqrt(unsigned long x) { static unsigned long bsqrt(unsigned long x) {
if (x <= 0) return 0; if (x <= 0) return 0;

45
src/Screen.cc
View file

@ -1,4 +1,3 @@
#include <iostream.h>
// Screen.cc for Openbox // Screen.cc for Openbox
// Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org> // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@ -105,7 +104,7 @@
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
using namespace std; using std::ends;
static Bool running = True; static Bool running = True;
@ -916,7 +915,7 @@ XFontSet BScreen::createFontSet(const char *fontname) {
void BScreen::setSloppyFocus(bool b) { void BScreen::setSloppyFocus(bool b) {
resource.sloppy_focus = b; resource.sloppy_focus = b;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".focusModel" << ends; s << "session.screen" << getScreenNumber() << ".focusModel" << ends;
config.setValue(s.str(), config.setValue(s.str(),
(resource.sloppy_focus ? (resource.sloppy_focus ?
@ -928,7 +927,7 @@ void BScreen::setSloppyFocus(bool b) {
void BScreen::setAutoRaise(bool a) { void BScreen::setAutoRaise(bool a) {
resource.auto_raise = a; resource.auto_raise = a;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".focusModel" << ends; s << "session.screen" << getScreenNumber() << ".focusModel" << ends;
config.setValue(s.str(), config.setValue(s.str(),
(resource.sloppy_focus ? (resource.sloppy_focus ?
@ -940,7 +939,7 @@ void BScreen::setAutoRaise(bool a) {
void BScreen::setImageDither(bool d, bool reconfig) { void BScreen::setImageDither(bool d, bool reconfig) {
image_control->setDither(d); image_control->setDither(d);
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".imageDither" << ends; s << "session.screen" << getScreenNumber() << ".imageDither" << ends;
config.setValue(s.str(), imageDither()); config.setValue(s.str(), imageDither());
if (reconfig) if (reconfig)
@ -951,7 +950,7 @@ void BScreen::setImageDither(bool d, bool reconfig) {
void BScreen::setOpaqueMove(bool o) { void BScreen::setOpaqueMove(bool o) {
resource.opaque_move = o; resource.opaque_move = o;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".opaqueMove" << ends; s << "session.screen" << getScreenNumber() << ".opaqueMove" << ends;
config.setValue(s.str(), resource.opaque_move); config.setValue(s.str(), resource.opaque_move);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -960,7 +959,7 @@ void BScreen::setOpaqueMove(bool o) {
void BScreen::setFullMax(bool f) { void BScreen::setFullMax(bool f) {
resource.full_max = f; resource.full_max = f;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".fullMaximization" << ends; s << "session.screen" << getScreenNumber() << ".fullMaximization" << ends;
config.setValue(s.str(), resource.full_max); config.setValue(s.str(), resource.full_max);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -969,7 +968,7 @@ void BScreen::setFullMax(bool f) {
void BScreen::setFocusNew(bool f) { void BScreen::setFocusNew(bool f) {
resource.focus_new = f; resource.focus_new = f;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".focusNewWindows" << ends; s << "session.screen" << getScreenNumber() << ".focusNewWindows" << ends;
config.setValue(s.str(), resource.focus_new); config.setValue(s.str(), resource.focus_new);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -978,7 +977,7 @@ void BScreen::setFocusNew(bool f) {
void BScreen::setFocusLast(bool f) { void BScreen::setFocusLast(bool f) {
resource.focus_last = f; resource.focus_last = f;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".focusLastWindow" << ends; s << "session.screen" << getScreenNumber() << ".focusLastWindow" << ends;
config.setValue(s.str(), resource.focus_last); config.setValue(s.str(), resource.focus_last);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -987,7 +986,7 @@ void BScreen::setFocusLast(bool f) {
void BScreen::setWindowZones(int z) { void BScreen::setWindowZones(int z) {
resource.zones = z; resource.zones = z;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".windowZones" << ends; s << "session.screen" << getScreenNumber() << ".windowZones" << ends;
config.setValue(s.str(), resource.zones); config.setValue(s.str(), resource.zones);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -996,7 +995,7 @@ void BScreen::setWindowZones(int z) {
void BScreen::setWorkspaceCount(int w) { void BScreen::setWorkspaceCount(int w) {
resource.workspaces = w; resource.workspaces = w;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".workspaces" << ends; s << "session.screen" << getScreenNumber() << ".workspaces" << ends;
config.setValue(s.str(), resource.workspaces); config.setValue(s.str(), resource.workspaces);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -1005,7 +1004,7 @@ void BScreen::setWorkspaceCount(int w) {
void BScreen::setPlacementPolicy(int p) { void BScreen::setPlacementPolicy(int p) {
resource.placement_policy = p; resource.placement_policy = p;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".windowPlacement" << ends; s << "session.screen" << getScreenNumber() << ".windowPlacement" << ends;
const char *placement; const char *placement;
switch (resource.placement_policy) { switch (resource.placement_policy) {
@ -1024,7 +1023,7 @@ void BScreen::setPlacementPolicy(int p) {
void BScreen::setEdgeSnapThreshold(int t) { void BScreen::setEdgeSnapThreshold(int t) {
resource.edge_snap_threshold = t; resource.edge_snap_threshold = t;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".edgeSnapThreshold" << ends; s << "session.screen" << getScreenNumber() << ".edgeSnapThreshold" << ends;
config.setValue(s.str(), resource.edge_snap_threshold); config.setValue(s.str(), resource.edge_snap_threshold);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -1033,7 +1032,7 @@ void BScreen::setEdgeSnapThreshold(int t) {
void BScreen::setRowPlacementDirection(int d) { void BScreen::setRowPlacementDirection(int d) {
resource.row_direction = d; resource.row_direction = d;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".rowPlacementDirection" << ends; s << "session.screen" << getScreenNumber() << ".rowPlacementDirection" << ends;
config.setValue(s.str(), config.setValue(s.str(),
resource.row_direction == LeftRight ? resource.row_direction == LeftRight ?
@ -1044,7 +1043,7 @@ void BScreen::setRowPlacementDirection(int d) {
void BScreen::setColPlacementDirection(int d) { void BScreen::setColPlacementDirection(int d) {
resource.col_direction = d; resource.col_direction = d;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".colPlacementDirection" << ends; s << "session.screen" << getScreenNumber() << ".colPlacementDirection" << ends;
config.setValue(s.str(), config.setValue(s.str(),
resource.col_direction == TopBottom ? resource.col_direction == TopBottom ?
@ -1072,7 +1071,7 @@ void BScreen::setStrftimeFormat(const char *f) {
delete [] resource.strftime_format; delete [] resource.strftime_format;
resource.strftime_format = bstrdup(f); resource.strftime_format = bstrdup(f);
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".strftimeFormat" << ends; s << "session.screen" << getScreenNumber() << ".strftimeFormat" << ends;
config.setValue(s.str(), resource.strftime_format); config.setValue(s.str(), resource.strftime_format);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -1082,7 +1081,7 @@ void BScreen::setStrftimeFormat(const char *f) {
void BScreen::setDateFormat(int f) { void BScreen::setDateFormat(int f) {
resource.date_format = f; resource.date_format = f;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".dateFormat" << ends; s << "session.screen" << getScreenNumber() << ".dateFormat" << ends;
config.setValue(s.str(), resource.date_format == B_EuropeanDate ? config.setValue(s.str(), resource.date_format == B_EuropeanDate ?
"European" : "American"); "European" : "American");
@ -1092,7 +1091,7 @@ void BScreen::setDateFormat(int f) {
void BScreen::setClock24Hour(Bool c) { void BScreen::setClock24Hour(Bool c) {
resource.clock24hour = c; resource.clock24hour = c;
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".clockFormat" << ends; s << "session.screen" << getScreenNumber() << ".clockFormat" << ends;
config.setValue(s.str(), resource.clock24hour ? 24 : 12); config.setValue(s.str(), resource.clock24hour ? 24 : 12);
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -1106,7 +1105,7 @@ void BScreen::setHideToolbar(bool b) {
getToolbar()->unMapToolbar(); getToolbar()->unMapToolbar();
else else
getToolbar()->mapToolbar(); getToolbar()->mapToolbar();
ostrstream s; std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".hideToolbar" << ends; s << "session.screen" << getScreenNumber() << ".hideToolbar" << ends;
config.setValue(s.str(), resource.hide_toolbar ? "True" : "False"); config.setValue(s.str(), resource.hide_toolbar ? "True" : "False");
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -1114,7 +1113,7 @@ void BScreen::setHideToolbar(bool b) {
void BScreen::saveWorkspaceNames() { void BScreen::saveWorkspaceNames() {
ostrstream rc, names; std::ostrstream rc, names;
wkspList::iterator it; wkspList::iterator it;
wkspList::iterator last = workspacesList.end() - 1; wkspList::iterator last = workspacesList.end() - 1;
@ -1165,7 +1164,7 @@ void BScreen::save() {
void BScreen::load() { void BScreen::load() {
ostrstream rscreen, rname, rclass; std::ostrstream rscreen, rname, rclass;
std::string s; std::string s;
bool b; bool b;
long l; long l;
@ -1251,9 +1250,9 @@ void BScreen::load() {
rname << rscreen.str() << "workspaceNames" << ends; rname << rscreen.str() << "workspaceNames" << ends;
rclass << rscreen.str() << "WorkspaceNames" << ends; rclass << rscreen.str() << "WorkspaceNames" << ends;
if (config.getValue(rname.str(), rclass.str(), s)) { if (config.getValue(rname.str(), rclass.str(), s)) {
string::const_iterator it = s.begin(), end = s.end(); std::string::const_iterator it = s.begin(), end = s.end();
while(1) { while(1) {
string::const_iterator tmp = it;// current string.begin() std::string::const_iterator tmp = it;// current string.begin()
it = std::find(tmp, end, ','); // look for comma between tmp and end it = std::find(tmp, end, ','); // look for comma between tmp and end
std::string name(tmp, it); // name = s[tmp:it] std::string name(tmp, it); // name = s[tmp:it]
addWorkspaceName(name.c_str()); addWorkspaceName(name.c_str());

14
src/Slit.cc
View file

@ -43,7 +43,7 @@
#include <strstream> #include <strstream>
#include <string> #include <string>
using namespace std; using std::ends;
Slit::Slit(BScreen &scr, Resource &conf) : screen(scr), Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
openbox(scr.getOpenbox()), config(conf) openbox(scr.getOpenbox()), config(conf)
@ -212,7 +212,7 @@ void Slit::removeClient(Window w, Bool remap) {
void Slit::setOnTop(bool b) { void Slit::setOnTop(bool b) {
m_ontop = b; m_ontop = b;
ostrstream s; std::ostrstream s;
s << "session.screen" << screen.getScreenNumber() << ".slit.onTop" << ends; s << "session.screen" << screen.getScreenNumber() << ".slit.onTop" << ends;
config.setValue(s.str(), m_ontop ? "True" : "False"); config.setValue(s.str(), m_ontop ? "True" : "False");
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -220,7 +220,7 @@ void Slit::setOnTop(bool b) {
void Slit::setAutoHide(bool b) { void Slit::setAutoHide(bool b) {
m_autohide = b; m_autohide = b;
ostrstream s; std::ostrstream s;
s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide" << ends; s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide" << ends;
config.setValue(s.str(), m_autohide ? "True" : "False"); config.setValue(s.str(), m_autohide ? "True" : "False");
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -228,7 +228,7 @@ void Slit::setAutoHide(bool b) {
void Slit::setPlacement(int p) { void Slit::setPlacement(int p) {
m_placement = p; m_placement = p;
ostrstream s; std::ostrstream s;
s << "session.screen" << screen.getScreenNumber() << ".slit.placement" s << "session.screen" << screen.getScreenNumber() << ".slit.placement"
<< ends; << ends;
const char *placement; const char *placement;
@ -248,7 +248,7 @@ void Slit::setPlacement(int p) {
void Slit::setDirection(int d) { void Slit::setDirection(int d) {
m_direction = d; m_direction = d;
ostrstream s; std::ostrstream s;
s << "session.screen" << screen.getScreenNumber() << ".slit.direction" s << "session.screen" << screen.getScreenNumber() << ".slit.direction"
<< ends; << ends;
config.setValue(s.str(), config.setValue(s.str(),
@ -264,8 +264,8 @@ void Slit::save() {
} }
void Slit::load() { void Slit::load() {
ostrstream rscreen, rname, rclass; std::ostrstream rscreen, rname, rclass;
string s; std::string s;
bool b; bool b;
rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends; rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;

14
src/Toolbar.cc
View file

@ -64,7 +64,7 @@
#include <strstream> #include <strstream>
#include <string> #include <string>
using namespace std; using std::ends;
Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn), Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
openbox(scrn.getOpenbox()), config(conf) openbox(scrn.getOpenbox()), config(conf)
@ -215,7 +215,7 @@ Toolbar::~Toolbar() {
void Toolbar::setOnTop(bool b) { void Toolbar::setOnTop(bool b) {
m_ontop = b; m_ontop = b;
ostrstream s; std::ostrstream s;
s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop" << ends; s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop" << ends;
config.setValue(s.str(), m_ontop ? "True" : "False"); config.setValue(s.str(), m_ontop ? "True" : "False");
s.rdbuf()->freeze(0); s.rdbuf()->freeze(0);
@ -223,7 +223,7 @@ void Toolbar::setOnTop(bool b) {
void Toolbar::setAutoHide(bool b) { void Toolbar::setAutoHide(bool b) {
m_autohide = b; m_autohide = b;
ostrstream s; std::ostrstream s;
s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide" s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide"
<< ends; << ends;
config.setValue(s.str(), m_autohide ? "True" : "False"); config.setValue(s.str(), m_autohide ? "True" : "False");
@ -232,7 +232,7 @@ void Toolbar::setAutoHide(bool b) {
void Toolbar::setWidthPercent(int w) { void Toolbar::setWidthPercent(int w) {
m_width_percent = w; m_width_percent = w;
ostrstream s; std::ostrstream s;
s << "session.screen" << screen.getScreenNumber() << ".toolbar.widthPercent" s << "session.screen" << screen.getScreenNumber() << ".toolbar.widthPercent"
<< ends; << ends;
config.setValue(s.str(), m_width_percent); config.setValue(s.str(), m_width_percent);
@ -241,7 +241,7 @@ void Toolbar::setWidthPercent(int w) {
void Toolbar::setPlacement(int p) { void Toolbar::setPlacement(int p) {
m_placement = p; m_placement = p;
ostrstream s; std::ostrstream s;
s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement" s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement"
<< ends; << ends;
const char *placement; const char *placement;
@ -265,8 +265,8 @@ void Toolbar::save() {
} }
void Toolbar::load() { void Toolbar::load() {
ostrstream rscreen, rname, rclass; std::ostrstream rscreen, rname, rclass;
string s; std::string s;
bool b; bool b;
long l; long l;
rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends; rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;

10
src/Window.cc
View file

@ -56,9 +56,6 @@
#endif // SLIT #endif // SLIT
#include "Util.h" #include "Util.h"
#include <iostream>
using namespace std;
/* /*
* Initializes the class with default values/the window's set initial values. * Initializes the class with default values/the window's set initial values.
*/ */
@ -2208,7 +2205,6 @@ void OpenboxWindow::redrawCloseButton(Bool pressed) {
void OpenboxWindow::mapRequestEvent(XMapRequestEvent *re) { void OpenboxWindow::mapRequestEvent(XMapRequestEvent *re) {
cout << "MAP REQUEST " << client.window << " " << client.title << endl;
if (re->window == client.window) { if (re->window == client.window) {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, i18n->getMessage(WindowSet, WindowMapRequest, fprintf(stderr, i18n->getMessage(WindowSet, WindowMapRequest,
@ -2797,7 +2793,6 @@ void OpenboxWindow::startMove(int x, int y) {
} }
frame.grab_x = x - frame.x - frame.border_w; frame.grab_x = x - frame.x - frame.border_w;
frame.grab_y = y - frame.y - frame.border_w; frame.grab_y = y - frame.y - frame.border_w;
cout << "START MOVE " << client.window << " " << client.title << endl;
} }
@ -2891,7 +2886,6 @@ void OpenboxWindow::endMove() {
// cause problems // cause problems
XEvent e; XEvent e;
while (XCheckTypedWindowEvent(display, frame.window, MotionNotify, &e)); while (XCheckTypedWindowEvent(display, frame.window, MotionNotify, &e));
cout << "END MOVE " << client.window << " " << client.title << endl;
} }
@ -2910,7 +2904,6 @@ void OpenboxWindow::motionNotifyEvent(XMotionEvent *me) {
Bool left = resize_zone & ZoneLeft; Bool left = resize_zone & ZoneLeft;
if (! flags.resizing) { if (! flags.resizing) {
cout << "START RESIZE " << client.window << " " << client.title << endl;
Cursor cursor; Cursor cursor;
if (resize_zone & ZoneTop) if (resize_zone & ZoneTop)
cursor = (resize_zone & ZoneLeft) ? cursor = (resize_zone & ZoneLeft) ?
@ -2984,8 +2977,7 @@ void OpenboxWindow::motionNotifyEvent(XMotionEvent *me) {
screen->showGeometry(gx, gy); screen->showGeometry(gx, gy);
} }
} else }
cout << "MOTION " << client.window << " " << client.title << endl;
} }