From cf4d0a64e9909ff3c989a77f5d297dadc76e58e2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 7 May 2014 14:22:30 +0200 Subject: fix and de-duplicate qprocess apidocs - rectify confusion and outright disinformation about argument quoting - say that open() is an alias for start(), not the other way round, as this is more consistent - apply some trickery to hide mergeable startDetached() overload - rename program -> command where it stands for a joined command line, for consistency - copy less information to the various overloads - misc language fixes and reshuffling Change-Id: I1b9c8dbed003f551ee6855044bbfc0aedddb4757 Reviewed-by: Thiago Macieira Reviewed-by: Jerome Pasion --- src/corelib/io/qprocess.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/corelib/io/qprocess.h') diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 6be267f15f..94359acf00 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -209,12 +209,18 @@ public: bool atEnd() const; static int execute(const QString &program, const QStringList &arguments); - static int execute(const QString &program); + static int execute(const QString &command); - static bool startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, - qint64 *pid = 0); - static bool startDetached(const QString &program, const QStringList &arguments); - static bool startDetached(const QString &program); + static bool startDetached(const QString &program, const QStringList &arguments, + const QString &workingDirectory +#if defined(Q_QDOC) + = QString() +#endif + , qint64 *pid = 0); +#if !defined(Q_QDOC) + static bool startDetached(const QString &program, const QStringList &arguments); // ### Qt6: merge overloads +#endif + static bool startDetached(const QString &command); static QStringList systemEnvironment(); -- cgit v1.2.3