minor cleanup

This commit is contained in:
Mathias Gumz 2010-09-09 15:33:34 +02:00
parent 534db1d409
commit 2b9a38cba5
3 changed files with 7 additions and 6 deletions

View file

@ -253,10 +253,7 @@ RestartFluxboxCmd::RestartFluxboxCmd(const string &cmd):m_cmd(cmd){
}
void RestartFluxboxCmd::execute() {
if (m_cmd.empty())
Fluxbox::instance()->restart();
else
Fluxbox::instance()->restart(m_cmd.c_str());
Fluxbox::instance()->restart(m_cmd.c_str());
}
REGISTER_COMMAND(reconfigure, FbCommands::ReconfigureFluxboxCmd, void);

View file

@ -170,6 +170,8 @@ void SizeHints::reset(const XSizeHints &sizehint) {
min_height = base_height;
}
namespace {
void closestPointToAspect(unsigned int &ret_x, unsigned int &ret_y,
unsigned int point_x, unsigned int point_y,
unsigned int aspect_x, unsigned int aspect_y) {
@ -187,7 +189,9 @@ unsigned int increaseToMultiple(unsigned int val, unsigned int inc) {
unsigned int decreaseToMultiple(unsigned int val, unsigned int inc) {
return val % inc ? val - (val % inc) : val;
}
} // end of anonymous namespace
/**
* Changes width and height to the nearest (lower) value
* that conforms to it's size hints.

View file

@ -1216,7 +1216,7 @@ void Fluxbox::restart(const char *prog) {
m_restarting = true;
if (prog) {
if (prog && *prog != '\0') {
m_restart_argument = prog;
}
}