Remove deprecated QProcess methods

Add default parameter for arguments in start, startDetached, and
execute for better source compatibility with Qt 5.15. This has the risk
of then hiding incorrect calls to the previous overload taking a single
"command" strings if code is ported from pre-5.15 or ignores deprecation
warnings. This is acceptable, given that the alternative is that all
calls to these functions would require a default constructed QStringList
as the second parameter.

Change-Id: I1ba4df97ac4894d007da5083c8359015d784ddbb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 3 insertions, 34 deletions

diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index ee83c93cf8..f43dfad840 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -158,16 +158,7 @@ public:
     explicit QProcess(QObject *parent = nullptr);
     virtual ~QProcess();
 
-    void start(const QString &program, const QStringList &arguments, OpenMode mode = ReadWrite);
-#if !defined(QT_NO_PROCESS_COMBINED_ARGUMENT_START)
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X(
-        "Use QProcess::start(const QString &program, const QStringList &arguments,"
-        "OpenMode mode = ReadWrite) instead"
-    )
-    void start(const QString &command, OpenMode mode = ReadWrite);
-#endif
-#endif
+    void start(const QString &program, const QStringList &arguments = {}, OpenMode mode = ReadWrite);
     void start(OpenMode mode = ReadWrite);
     bool startDetached(qint64 *pid = nullptr);
     bool open(OpenMode mode = ReadWrite) override;
@@ -178,12 +169,6 @@ public:
     QStringList arguments() const;
     void setArguments(const QStringList & arguments);
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use QProcess::processChannelMode() instead")
-    ProcessChannelMode readChannelMode() const;
-    QT_DEPRECATED_X("Use QProcess::setProcessChannelMode() instead")
-    void setReadChannelMode(ProcessChannelMode mode);
-#endif
     ProcessChannelMode processChannelMode() const;
     void setProcessChannelMode(ProcessChannelMode mode);
     InputChannelMode inputChannelMode() const;
@@ -252,21 +237,9 @@ public:
     bool isSequential() const override;
     void close() override;
 
-    static int execute(const QString &program, const QStringList &arguments);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X(
-        "Use QProcess::execute(const QString &program, const QStringList &arguments) instead"
-    )
-    static int execute(const QString &command);
-#endif
-    static bool startDetached(const QString &program, const QStringList &arguments,
+    static int execute(const QString &program, const QStringList &arguments = {});
+    static bool startDetached(const QString &program, const QStringList &arguments = {},
                               const QString &workingDirectory = QString(), qint64 *pid = nullptr);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X(
-        "Use QProcess::startDetached(const QString &program, const QStringList &arguments) instead"
-    )
-    static bool startDetached(const QString &command);
-#endif
 
     static QStringList systemEnvironment();
 
@@ -281,10 +254,6 @@ public Q_SLOTS:
 Q_SIGNALS:
     void started(QPrivateSignal);
     void finished(int exitCode, QProcess::ExitStatus exitStatus = NormalExit);
-#if QT_DEPRECATED_SINCE(5, 6)
-    QT_DEPRECATED_X("Use QProcess::errorOccurred(QProcess::ProcessError) instead")
-    void error(QProcess::ProcessError error);
-#endif
     void errorOccurred(QProcess::ProcessError error);
     void stateChanged(QProcess::ProcessState state, QPrivateSignal);