Utils: Merge {synchronous,qtc}process.{h,cpp} file pairs

Mechanical to prepare merging the actual classes.
Adapting #includes.

Change-Id: I77a2c28129287778bc870c30cb890cd26bc2e62b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/android/androidavdmanager.cpp

@@ -22,16 +22,19 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "androidavdmanager.h"
 
 #include "avdmanageroutputparser.h"
 
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/projectexplorerconstants.h>
+
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
-#include <utils/synchronousprocess.h>
 
 #include <QApplication>
 #include <QFileInfo>

src/plugins/android/androidbuildapkstep.cpp

@@ -59,7 +59,6 @@
 #include <utils/infolabel.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
 
 #include <QCheckBox>
 #include <QComboBox>

src/plugins/android/androidconfigurations.cpp

@@ -57,9 +57,9 @@
 #include <utils/hostosinfo.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 
 #include <QApplication>
 #include <QDirIterator>

src/plugins/android/androidcreatekeystorecertificate.cpp

@@ -27,7 +27,7 @@
 #include "androidconfigurations.h"
 #include "ui_androidcreatekeystorecertificate.h"
 
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QFileDialog>
 #include <QRegularExpression>

src/plugins/android/androiddeployqtstep.cpp

@@ -55,7 +55,6 @@
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
 
 #include <QCheckBox>
 #include <QFileDialog>

src/plugins/android/androidmanager.cpp

@@ -53,8 +53,8 @@
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 
 #include <QApplication>
 #include <QDir>

src/plugins/android/androidrunnerworker.cpp

@@ -47,7 +47,6 @@
 #include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 #include <utils/temporaryfile.h>
 #include <utils/url.h>
 

src/plugins/android/androidsdkmanager.cpp

@@ -34,7 +34,6 @@
 #include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 
 #include <QFutureWatcher>
 #include <QLoggingCategory>

src/plugins/android/androidsettingswidget.cpp

@@ -45,7 +45,6 @@
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
 #include <utils/utilsicons.h>
 
 #include <QDesktopServices>

src/plugins/baremetal/iarewtoolchain.cpp

@@ -38,7 +38,6 @@
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
 
 #include <QDebug>
 #include <QDir>

src/plugins/baremetal/keiltoolchain.cpp

@@ -38,7 +38,6 @@
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
 
 #include <QDebug>
 #include <QDir>

src/plugins/baremetal/sdcctoolchain.cpp

@@ -37,7 +37,7 @@
 #include <utils/environment.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QDebug>
 #include <QDir>

src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp

@@ -33,7 +33,7 @@
 
 #include <utils/runextensions.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QDateTime>
 #include <QFile>

src/plugins/beautifier/beautifierplugin.cpp

@@ -53,8 +53,8 @@
 #include <utils/fileutils.h>
 #include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
-#include <utils/synchronousprocess.h>
 #include <utils/temporarydirectory.h>
 #include <utils/textutils.h>
 

src/plugins/beautifier/uncrustify/uncrustifysettings.cpp

@@ -31,7 +31,7 @@
 
 #include <coreplugin/icore.h>
 
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QDateTime>
 #include <QFile>

src/plugins/clangtools/clangtidyclazyrunner.cpp

@@ -34,8 +34,8 @@
 #include <cpptools/compileroptionsbuilder.h>
 #include <cpptools/cpptoolsreuse.h>
 
-#include <utils/synchronousprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QDebug>
 #include <QDir>

src/plugins/clangtools/clangtoolrunner.cpp

@@ -29,7 +29,7 @@
 
 #include <utils/environment.h>
 #include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 #include <utils/temporaryfile.h>
 
 #include <QDebug>

src/plugins/clangtools/clangtoolsutils.cpp

@@ -35,11 +35,10 @@
 #include <cpptools/cpptoolsreuse.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
-#include <utils/qtcprocess.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QFileInfo>
 

src/plugins/clangtools/executableinfo.cpp

@@ -29,7 +29,7 @@
 #include <coreplugin/messagemanager.h>
 
 #include <utils/environment.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QDir>
 #include <QFileInfo>

src/plugins/clearcase/clearcaseplugin.cpp

@@ -60,9 +60,9 @@
 #include <utils/infobar.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 #include <utils/temporarydirectory.h>
 
 #include <vcsbase/basevcseditorfactory.h>

src/plugins/cmakeprojectmanager/cmaketool.h

@@ -32,7 +32,7 @@
 #include <utils/fileutils.h>
 #include <utils/id.h>
 #include <utils/optional.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 QT_FORWARD_DECLARE_CLASS(QProcess)
 

src/plugins/coreplugin/plugininstallwizard.cpp

@@ -36,8 +36,8 @@
 #include <utils/infolabel.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
-#include <utils/synchronousprocess.h>
 #include <utils/temporarydirectory.h>
 #include <utils/wizard.h>
 #include <utils/wizardpage.h>

src/plugins/cvs/cvsplugin.cpp

@@ -42,9 +42,9 @@
 
 #include <texteditor/textdocument.h>
 
-#include <utils/synchronousprocess.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
 
 #include <coreplugin/icore.h>

src/plugins/debugger/debuggeritem.cpp

@@ -35,8 +35,8 @@
 #include <utils/hostosinfo.h>
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 #include <utils/utilsicons.h>
 #include <utils/winutils.h>
 

src/plugins/debugger/debuggeritemmanager.cpp

@@ -43,7 +43,7 @@
 #include <utils/pathchooser.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 #include <utils/treemodel.h>
 #include <utils/winutils.h>
 

src/plugins/debugger/gdb/gdbengine.cpp

@@ -64,7 +64,6 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 #include <utils/temporaryfile.h>
 
 #include <QDirIterator>

src/plugins/git/gerrit/gerritserver.cpp

@@ -31,8 +31,9 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/shellcommand.h>
+
 #include <utils/hostosinfo.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QFile>
 #include <QJsonDocument>

src/plugins/git/gitclient.cpp

@@ -50,7 +50,6 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 #include <utils/temporaryfile.h>
 #include <utils/theme/theme.h>
 

src/plugins/git/gitgrep.cpp

@@ -39,8 +39,8 @@
 #include <utils/filesearch.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
-#include <utils/synchronousprocess.h>
 #include <utils/textfileformat.h>
 
 #include <QCheckBox>

src/plugins/ios/iosconfigurations.cpp

@@ -31,10 +31,7 @@
 #include "iosprobe.h"
 
 #include <coreplugin/icore.h>
-#include <utils/algorithm.h>
-#include <utils/synchronousprocess.h>
-#include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
+
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
@@ -42,14 +39,20 @@
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/gcctoolchain.h>
 #include <projectexplorer/projectexplorerconstants.h>
+
 #include <debugger/debuggeritemmanager.h>
 #include <debugger/debuggeritem.h>
 #include <debugger/debuggerkitinformation.h>
+
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/qtversionfactory.h>
 
+#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
+
 #include <QDir>
 #include <QDomDocument>
 #include <QFileInfo>

src/plugins/ios/iosprobe.cpp

@@ -26,7 +26,7 @@
 #include "iosprobe.h"
 
 #include <utils/algorithm.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QDir>
 #include <QFileInfo>

src/plugins/ios/iostoolhandler.cpp

@@ -29,12 +29,14 @@
 #include "iossimulator.h"
 #include "simulatorcontrol.h"
 
-#include "debugger/debuggerconstants.h"
 #include <coreplugin/icore.h>
-#include <utils/qtcassert.h>
+
+#include <debugger/debuggerconstants.h>
+
 #include <utils/fileutils.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
-#include <utils/synchronousprocess.h>
 
 #include <QCoreApplication>
 #include <QDir>

src/plugins/ios/simulatorcontrol.cpp

@@ -29,7 +29,7 @@
 #include <utils/algorithm.h>
 #include <utils/runextensions.h>
 #include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #ifdef Q_OS_MAC
 #include <CoreFoundation/CoreFoundation.h>

src/plugins/languageclient/client.cpp

@@ -34,6 +34,8 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/messagemanager.h>
+#include <coreplugin/progressmanager/progressmanager.h>
+
 #include <languageserverprotocol/completion.h>
 #include <languageserverprotocol/diagnostics.h>
 #include <languageserverprotocol/languagefeatures.h>
@@ -41,8 +43,10 @@
 #include <languageserverprotocol/servercapabilities.h>
 #include <languageserverprotocol/workspace.h>
 #include <languageserverprotocol/progresssupport.h>
+
 #include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
+
 #include <texteditor/codeassist/documentcontentcompletion.h>
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/ioutlinewidget.h>
@@ -52,10 +56,10 @@
 #include <texteditor/texteditor.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
+
 #include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
-#include <coreplugin/progressmanager/progressmanager.h>
+
 
 #include <QDebug>
 #include <QLoggingCategory>

src/plugins/mercurial/mercurialclient.cpp

@@ -35,10 +35,11 @@
 #include <vcsbase/vcsbaseeditor.h>
 #include <vcsbase/vcsbaseeditorconfig.h>
 #include <vcsbase/vcsbasediffeditorcontroller.h>
-#include <utils/synchronousprocess.h>
+
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QDateTime>
 #include <QDir>

src/plugins/perforce/perforceplugin.cpp

@@ -41,11 +41,13 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/locator/commandlocator.h>
+
 #include <texteditor/textdocument.h>
+
 #include <utils/fileutils.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 #include <utils/temporarydirectory.h>
 
 #include <vcsbase/basevcseditorfactory.h>

src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp

@@ -29,7 +29,7 @@
 
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 #include <utils/temporarydirectory.h>
 
 #include <QFileInfo>

src/plugins/projectexplorer/gcctoolchain.cpp

@@ -37,11 +37,9 @@
 #include <utils/algorithm.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
-#include <utils/synchronousprocess.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
 
 #include <QBuffer>
 #include <QComboBox>

src/plugins/projectexplorer/msvctoolchain.cpp

@@ -40,7 +40,6 @@
 #include <utils/optional.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
 #include <utils/runextensions.h>
 #include <utils/temporarydirectory.h>
 #include <utils/pathchooser.h>

src/plugins/python/pythonsettings.cpp

@@ -28,7 +28,7 @@
 #include "pythonconstants.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include "coreplugin/icore.h"
+#include <coreplugin/icore.h>
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
@@ -37,7 +37,7 @@
 #include <utils/listmodel.h>
 #include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 #include <utils/treemodel.h>
 
 #include <QDir>

src/plugins/python/pythonutils.cpp

@@ -48,7 +48,6 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
-#include <utils/synchronousprocess.h>
 
 #include <QDir>
 #include <QFutureWatcher>

src/plugins/subversion/subversionclient.cpp

@@ -28,20 +28,22 @@
 #include "subversionplugin.h"
 #include "subversionsettings.h"
 
+#include <coreplugin/editormanager/editormanager.h>
+
 #include <vcsbase/vcscommand.h>
 #include <vcsbase/vcsbaseconstants.h>
 #include <vcsbase/vcsbasediffeditorcontroller.h>
 #include <vcsbase/vcsbaseeditor.h>
 #include <vcsbase/vcsbaseeditorconfig.h>
 #include <vcsbase/vcsbaseplugin.h>
-#include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
+
 #include <diffeditor/diffeditorcontroller.h>
 #include <diffeditor/diffutils.h>
-#include <coreplugin/editormanager/editormanager.h>
 
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QDir>
 #include <QFileInfo>

src/plugins/subversion/subversionplugin.cpp

@@ -57,8 +57,8 @@
 #include <utils/hostosinfo.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 
 #include <QDebug>
 #include <QDir>

src/plugins/texteditor/formattexteditor.cpp

@@ -32,11 +32,11 @@
 #include <coreplugin/messagemanager.h>
 
 #include <utils/differ.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
-#include <utils/synchronousprocess.h>
 #include <utils/temporarydirectory.h>
 #include <utils/textutils.h>
-#include <utils/qtcassert.h>
 
 #include <QFileInfo>
 #include <QFutureWatcher>

src/plugins/texteditor/highlightersettings.cpp

@@ -31,8 +31,8 @@
 
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
-#include <utils/synchronousprocess.h>
 
 #include <QSettings>
 #include <QLatin1String>

src/plugins/vcsbase/vcsbaseclient.cpp

@@ -36,7 +36,7 @@
 
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
-#include <utils/synchronousprocess.h>
+
 #include <vcsbase/vcsbaseeditor.h>
 #include <vcsbase/vcsoutputwindow.h>
 #include <vcsbase/vcsbaseplugin.h>

src/plugins/vcsbase/vcsbaseclient.h

@@ -31,7 +31,7 @@
 
 #include <utils/fileutils.h>
 #include <utils/id.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QObject>
 #include <QStringList>

src/plugins/vcsbase/vcsbaseplugin.cpp

@@ -38,7 +38,7 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
 #include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QDebug>
 #include <QDir>