AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QProcess: Add accessors for program and arguments.

Browse Source 
Task-number: QTBUG-24550

Change-Id: I1ce26e584e39b0b58b1c9f78d8027b2479f2d92c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Christian Kandeler 2012-05-23 11:00:04 +02:00 committed by Qt by Nokia
parent 0dfbb2f553
commit 046c31988e
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/corelib/io/qprocess.cpp
View File

@ -1997,14 +1997,14 @@ static QStringList parseCombinedArgString(const QString &program)
/*!
\overload
Starts the program \a program in a new process, if one is not already
running. \a program is a single string of text containing both the
Starts the command \a command in a new process, if one is not already
running. \a command is a single string of text containing both the
program name and its arguments. The arguments are separated by one or
more spaces. For example:
\snippet code/src_corelib_io_qprocess.cpp 5
The \a program string can also contain quotes, to ensure that arguments
The \a command string can also contain quotes, to ensure that arguments
containing spaces are correctly supplied to the new process. For example:
\snippet code/src_corelib_io_qprocess.cpp 6
@ -2021,9 +2021,9 @@ static QStringList parseCombinedArgString(const QString &program)
The OpenMode is set to \a mode.
*/
void QProcess::start(const QString &program, OpenMode mode)
void QProcess::start(const QString &command, OpenMode mode)
{
QStringList args = parseCombinedArgString(program);
QStringList args = parseCombinedArgString(command);
if (args.isEmpty()) {
Q_D(QProcess);
d->processError = QProcess::FailedToStart;
@ -2038,6 +2038,28 @@ void QProcess::start(const QString &program, OpenMode mode)
start(prog, args, mode);
}
/*!
Returns the program the process was last started with.
\sa start()
*/
QString QProcess::program() const
{
Q_D(const QProcess);
return d->program;
}
/*!
Returns the command line arguments the process was last started with.
\sa start()
*/
QStringList QProcess::arguments() const
{
Q_D(const QProcess);
return d->arguments;
}
/*!
Attempts to terminate the process.

4
src/corelib/io/qprocess.h
View File

@ -133,7 +133,9 @@ public:
virtual ~QProcess();
void start(const QString &program, const QStringList &arguments, OpenMode mode = ReadWrite);
void start(const QString &program, OpenMode mode = ReadWrite);
void start(const QString &command, OpenMode mode = ReadWrite);
QString program() const;
QStringList arguments() const;
ProcessChannelMode readChannelMode() const;
void setReadChannelMode(ProcessChannelMode mode);