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>
2021-05-05 18:21:22 +02:00
parent 040d0cc1ef
commit c23cdd9262
61 changed files with 767 additions and 822 deletions
--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
+++ b/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>
--- a/src/plugins/clangtools/clangtoolrunner.cpp
+++ b/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>
--- a/src/plugins/clangtools/clangtoolsutils.cpp
+++ b/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>

--- a/src/plugins/clangtools/executableinfo.cpp
+++ b/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>