aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authormathias <mathias>2006-10-30 19:31:15 (GMT)
committermathias <mathias>2006-10-30 19:31:15 (GMT)
commite5e76e7761f52ba7c0deca75bcecae4fbd3e2ff5 (patch)
treec84838a84802805e9b1463045e86200b7cef917f /src/fluxbox.cc
parent426c12c25c2ef095a882619ad7424684b88465b8 (diff)
downloadfluxbox_pavel-e5e76e7761f52ba7c0deca75bcecae4fbd3e2ff5.zip
fluxbox_pavel-e5e76e7761f52ba7c0deca75bcecae4fbd3e2ff5.tar.bz2
Cosmetic patch from Slava Semushin
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc32
1 files changed, 23 insertions, 9 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 59859ad..b23ab70 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -154,7 +154,21 @@ class Toolbar { };
154#include <algorithm> 154#include <algorithm>
155#include <typeinfo> 155#include <typeinfo>
156 156
157using namespace std; 157using std::cerr;
158using std::endl;
159using std::string;
160using std::vector;
161using std::list;
162using std::pair;
163using std::bind2nd;
164using std::mem_fun;
165using std::equal_to;
166
167#ifdef DEBUG
168using std::hex;
169using std::dec;
170#endif // DEBUG
171
158using namespace FbTk; 172using namespace FbTk;
159 173
160namespace { 174namespace {
@@ -1348,7 +1362,7 @@ BScreen *Fluxbox::searchScreen(Window window) {
1348} 1362}
1349 1363
1350 1364
1351AtomHandler* Fluxbox::getAtomHandler(const std::string &name) { 1365AtomHandler* Fluxbox::getAtomHandler(const string &name) {
1352 if ( name != "" ) { 1366 if ( name != "" ) {
1353 using namespace FbTk; 1367 using namespace FbTk;
1354 AtomHandlerContainerIt it = find_if(m_atomhandler.begin(), 1368 AtomHandlerContainerIt it = find_if(m_atomhandler.begin(),
@@ -1360,7 +1374,7 @@ AtomHandler* Fluxbox::getAtomHandler(const std::string &name) {
1360 } 1374 }
1361 return 0; 1375 return 0;
1362} 1376}
1363void Fluxbox::addAtomHandler(AtomHandler *atomh, const std::string &name) { 1377void Fluxbox::addAtomHandler(AtomHandler *atomh, const string &name) {
1364 m_atomhandler[atomh]= name;; 1378 m_atomhandler[atomh]= name;;
1365} 1379}
1366 1380
@@ -1514,7 +1528,7 @@ string Fluxbox::getRcFilename() {
1514} 1528}
1515 1529
1516/// Provides default filename of data file 1530/// Provides default filename of data file
1517void Fluxbox::getDefaultDataFilename(char *name, std::string &filename) { 1531void Fluxbox::getDefaultDataFilename(char *name, string &filename) {
1518 filename = string(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name); 1532 filename = string(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name);
1519} 1533}
1520 1534
@@ -1607,7 +1621,7 @@ void Fluxbox::load_rc(BScreen &screen) {
1607 sprintf(class_lookup, "Session.Screen%d.imageSearchPath", screen_number); 1621 sprintf(class_lookup, "Session.Screen%d.imageSearchPath", screen_number);
1608 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type, 1622 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
1609 &value) && value.addr) { 1623 &value) && value.addr) {
1610 std::vector<std::string> paths; 1624 vector<string> paths;
1611 StringUtil::stringtok(paths, value.addr, ", "); 1625 StringUtil::stringtok(paths, value.addr, ", ");
1612 for (size_t i = 0; i < paths.size(); ++i) 1626 for (size_t i = 0; i < paths.size(); ++i)
1613 FbTk::Image::addSearchPath(paths[i]); 1627 FbTk::Image::addSearchPath(paths[i]);
@@ -1685,8 +1699,8 @@ BScreen *Fluxbox::findScreen(int id) {
1685} 1699}
1686 1700
1687bool Fluxbox::menuTimestampsChanged() const { 1701bool Fluxbox::menuTimestampsChanged() const {
1688 std::list<MenuTimestamp *>::const_iterator it = m_menu_timestamps.begin(); 1702 list<MenuTimestamp *>::const_iterator it = m_menu_timestamps.begin();
1689 std::list<MenuTimestamp *>::const_iterator it_end = m_menu_timestamps.end(); 1703 list<MenuTimestamp *>::const_iterator it_end = m_menu_timestamps.end();
1690 for (; it != it_end; ++it) { 1704 for (; it != it_end; ++it) {
1691 1705
1692 time_t timestamp = FbTk::FileUtil::getLastStatusChangeTimestamp((*it)->filename.c_str()); 1706 time_t timestamp = FbTk::FileUtil::getLastStatusChangeTimestamp((*it)->filename.c_str());
@@ -1745,8 +1759,8 @@ void Fluxbox::saveMenuFilename(const char *filename) {
1745 1759
1746 bool found = false; 1760 bool found = false;
1747 1761
1748 std::list<MenuTimestamp *>::iterator it = m_menu_timestamps.begin(); 1762 list<MenuTimestamp *>::iterator it = m_menu_timestamps.begin();
1749 std::list<MenuTimestamp *>::iterator it_end = m_menu_timestamps.end(); 1763 list<MenuTimestamp *>::iterator it_end = m_menu_timestamps.end();
1750 for (; it != it_end; ++it) { 1764 for (; it != it_end; ++it) {
1751 if ((*it)->filename == filename) { 1765 if ((*it)->filename == filename) {
1752 found = true; 1766 found = true;