Rename class utils_execute_command_status
Rename the class to CommandStatus to match the CamelCase naming used for classes in GParted. fgrep class include/*.h
This commit is contained in:
parent
bbc34efd35
commit
30946cb812
14
src/Utils.cc
14
src/Utils.cc
|
@ -402,7 +402,7 @@ int Utils::execute_command( const Glib::ustring & command )
|
||||||
return execute_command( command, dummy, dummy ) ;
|
return execute_command( command, dummy, dummy ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
class utils_execute_command_status
|
class CommandStatus
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
bool running;
|
bool running;
|
||||||
|
@ -415,7 +415,7 @@ public:
|
||||||
void execute_command_eof();
|
void execute_command_eof();
|
||||||
};
|
};
|
||||||
|
|
||||||
void utils_execute_command_status::store_exit_status( GPid pid, int status )
|
void CommandStatus::store_exit_status( GPid pid, int status )
|
||||||
{
|
{
|
||||||
exit_status = status;
|
exit_status = status;
|
||||||
running = false;
|
running = false;
|
||||||
|
@ -432,7 +432,7 @@ void utils_execute_command_status::store_exit_status( GPid pid, int status )
|
||||||
Glib::spawn_close_pid( pid );
|
Glib::spawn_close_pid( pid );
|
||||||
}
|
}
|
||||||
|
|
||||||
void utils_execute_command_status::execute_command_eof()
|
void CommandStatus::execute_command_eof()
|
||||||
{
|
{
|
||||||
if (--pipecount)
|
if (--pipecount)
|
||||||
return; // wait for second pipe to eof
|
return; // wait for second pipe to eof
|
||||||
|
@ -455,7 +455,7 @@ static void set_locale()
|
||||||
|
|
||||||
static void _store_exit_status( GPid pid, gint status, gpointer data )
|
static void _store_exit_status( GPid pid, gint status, gpointer data )
|
||||||
{
|
{
|
||||||
utils_execute_command_status *sp = (utils_execute_command_status *)data;
|
CommandStatus *sp = (CommandStatus *)data;
|
||||||
sp->store_exit_status( pid, status );
|
sp->store_exit_status( pid, status );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -467,7 +467,7 @@ int Utils::execute_command( const Glib::ustring & command,
|
||||||
Glib::Pid pid;
|
Glib::Pid pid;
|
||||||
// set up pipes for capture
|
// set up pipes for capture
|
||||||
int out, err;
|
int out, err;
|
||||||
utils_execute_command_status status;
|
CommandStatus status;
|
||||||
// spawn external process
|
// spawn external process
|
||||||
status.running = true;
|
status.running = true;
|
||||||
status.pipecount = 2;
|
status.pipecount = 2;
|
||||||
|
@ -498,9 +498,9 @@ int Utils::execute_command( const Glib::ustring & command,
|
||||||
PipeCapture outputcapture( out, output );
|
PipeCapture outputcapture( out, output );
|
||||||
PipeCapture errorcapture( err, error );
|
PipeCapture errorcapture( err, error );
|
||||||
outputcapture.eof.connect( sigc::mem_fun(
|
outputcapture.eof.connect( sigc::mem_fun(
|
||||||
status, &utils_execute_command_status::execute_command_eof ));
|
status, &CommandStatus::execute_command_eof ));
|
||||||
errorcapture.eof.connect( sigc::mem_fun(
|
errorcapture.eof.connect( sigc::mem_fun(
|
||||||
status, &utils_execute_command_status::execute_command_eof ));
|
status, &CommandStatus::execute_command_eof ));
|
||||||
outputcapture.connect_signal();
|
outputcapture.connect_signal();
|
||||||
errorcapture.connect_signal();
|
errorcapture.connect_signal();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue