Differential D8512 Diff 21414 kdevplatform/util/commandexecutor.cpp

Changeset View

Standalone View

View Options

kdevplatform/util/commandexecutor.cpp

Show First 20 Lines • Show All 86 Lines • ▼ Show 20 Line(s)86{
87 d->m_env = env; 87​ d->m_env = env;
88} 88​}
89 89​
90void CommandExecutor::setEnvironment( const QStringList& env ) 90​void CommandExecutor::setEnvironment( const QStringList& env )
91{ 91​{
92 QMap<QString,QString> envmap; 92​ QMap<QString,QString> envmap;
93 foreach( const QString& var, env ) 93​ foreach( const QString& var, env )
94 { 94​ {
95 int sep = var.indexOf( '=' ); 95​ int sep = var.indexOf(QLatin1Char('='));
96 envmap.insert( var.left( sep ), var.mid( sep + 1 ) ); 96​ envmap.insert( var.left( sep ), var.mid( sep + 1 ) );
97 } 97​ }
98 d->m_env = envmap; 98​ d->m_env = envmap;
99} 99​}
100 100​
101void CommandExecutor::setArguments( const QStringList& args ) 101​void CommandExecutor::setArguments( const QStringList& args )
102{ 102​{
103 d->m_args = args; 103​ d->m_args = args;
Show All 21 Lines124 {
125 d->m_process->setEnv( it.key(), it.value() ); 125​ d->m_process->setEnv( it.key(), it.value() );
126 } 126​ }
127 d->m_process->setWorkingDirectory( d->m_workDir ); 127​ d->m_process->setWorkingDirectory( d->m_workDir );
128 if( !d->m_useShell ) { 128​ if( !d->m_useShell ) {
129 d->m_process->setProgram( d->m_command, d->m_args ); 129​ d->m_process->setProgram( d->m_command, d->m_args );
130 } else { 130​ } else {
131 QStringList arguments; 131​ QStringList arguments;
132 Q_FOREACH( const QString &a, d->m_args ) arguments << KShell::quoteArg( a ); 132​ Q_FOREACH( const QString &a, d->m_args ) arguments << KShell::quoteArg( a );
133 d->m_process->setShellCommand(d->m_command + ' ' + arguments.join(QLatin1Char(' '))); 133​ d->m_process->setShellCommand(d->m_command + QLatin1Char(' ') + arguments.join(QLatin1Char(' ')));
134 } 134​ }
135 135​
136 d->m_process->start(); 136​ d->m_process->start();
137} 137​}
138 138​
139void CommandExecutor::setCommand( const QString& command ) 139​void CommandExecutor::setCommand( const QString& command )
140{ 140​{
141 d->m_command = command; 141​ d->m_command = command;
Show All 25 Lines