diff options
author | hjk <hjk@qt.io> | 2019-12-17 14:07:53 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-12-18 08:43:18 +0000 |
commit | e109b731ad001ba566289b7184799e91b19fbccb (patch) | |
tree | 133667f71377d5af130b776f97d3f090ef1c8138 /src/plugins/debugger | |
parent | e16876df0cd65c40480fcf7f2ae9f16ab66c991c (diff) | |
download | qt-creator-e109b731ad001ba566289b7184799e91b19fbccb.tar.gz |
Utils: Rename FilePathList to simply FilePaths
The exact storage type does not really matter here.
Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/debugger')
-rw-r--r-- | src/plugins/debugger/debuggerengine.h | 4 | ||||
-rw-r--r-- | src/plugins/debugger/debuggeritemmanager.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 32c8e7481b..25aa4a56aa 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -150,7 +150,7 @@ public: // Used by Android to avoid false positives on warnOnRelease bool skipExecutableValidation = false; bool useTargetAsync = false; - Utils::FilePathList additionalSearchDirectories; + Utils::FilePaths additionalSearchDirectories; // Used by iOS. QString platform; @@ -181,7 +181,7 @@ public: ProjectExplorer::Abi toolChainAbi; Utils::FilePath projectSourceDirectory; - Utils::FilePathList projectSourceFiles; + Utils::FilePaths projectSourceFiles; // Used by Script debugging QString interpreter; diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 270c3851c9..7ec9d6efa6 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -625,7 +625,7 @@ void DebuggerOptionsPage::finish() void DebuggerItemManagerPrivate::autoDetectCdbDebuggers() { - FilePathList cdbs; + FilePaths cdbs; const QStringList programDirs = { QString::fromLocal8Bit(qgetenv("ProgramFiles")), @@ -697,7 +697,7 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers() } } -static Utils::FilePathList searchGdbPathsFromRegistry() +static Utils::FilePaths searchGdbPathsFromRegistry() { if (!HostOsInfo::isWindowsHost()) return {}; @@ -706,7 +706,7 @@ static Utils::FilePathList searchGdbPathsFromRegistry() static const char kRegistryToken[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" \ "Windows\\CurrentVersion\\Uninstall\\"; - Utils::FilePathList searchPaths; + Utils::FilePaths searchPaths; QSettings registry(kRegistryToken, QSettings::NativeFormat); const auto productGroups = registry.childGroups(); @@ -755,7 +755,7 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers() } */ - FilePathList suspects; + FilePaths suspects; if (HostOsInfo::isMacHost()) { SynchronousProcess lldbInfo; @@ -771,7 +771,7 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers() } } - FilePathList path = Utils::filteredUnique( + FilePaths path = Utils::filteredUnique( Environment::systemEnvironment().path() + searchGdbPathsFromRegistry()); QDir dir; |