feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use ProcessInfo instead of DeviceProcessItem

Browse Source 
Remove DeviceProcessItem class.

Change-Id: I2fcac473dc12b47f50c329645f27d60619304e77
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2022-02-24 18:42:47 +01:00
parent 87154986d2
commit 4bb4bc2a99
18 changed files with 108 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/unstartedappwatcherdialog.cpp
View File

@@ -51,6 +51,7 @@
#include <QFileDialog>
using namespace ProjectExplorer;
using namespace Utils;
namespace Debugger {
namespace Internal {
@@ -224,7 +225,7 @@ void UnstartedAppWatcherDialog::startWatching()
}
}
void UnstartedAppWatcherDialog::pidFound(const DeviceProcessItem &p)
void UnstartedAppWatcherDialog::pidFound(const ProcessInfo &p)
{
setWaitingState(FoundState);
startStopTimer(false);
@@ -256,16 +257,17 @@ void UnstartedAppWatcherDialog::startStopTimer(bool start)
void UnstartedAppWatcherDialog::findProcess()
{
const QString &appName = m_pathChooser->filePath().normalizedPathName().toString();
DeviceProcessItem fallback;
foreach (const DeviceProcessItem &p, DeviceProcessList::localProcesses()) {
if (Utils::FileUtils::normalizedPathName(p.exe) == appName) {
pidFound(p);
ProcessInfo fallback;
const QList<ProcessInfo> processInfoList = ProcessInfo::processInfoList();
for (const ProcessInfo &processInfo : processInfoList) {
if (Utils::FileUtils::normalizedPathName(processInfo.executable) == appName) {
pidFound(processInfo);
return;
}
if (p.cmdLine.startsWith(appName))
fallback = p;
if (processInfo.commandLine.startsWith(appName))
fallback = processInfo;
}
if (fallback.pid != 0)
if (fallback.processId != 0)
pidFound(fallback);
}
@@ -302,7 +304,7 @@ Kit *UnstartedAppWatcherDialog::currentKit() const
return m_kitChooser->currentKit();
}
DeviceProcessItem UnstartedAppWatcherDialog::currentProcess() const
ProcessInfo UnstartedAppWatcherDialog::currentProcess() const
{
return m_process;
}