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

Debugger: Code cosmetics

Browse Source 
Namespaces, names, ...

Change-Id: Id0b65585b8849e8bb47d63f6eba1c23b9db1a2c2
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-07-14 08:38:42 +02:00
parent 9c7b4f0a89
commit 7b7fb9f6c7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/debuggeritem.cpp
View File

@@ -53,6 +53,8 @@ using namespace Debugger::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace Debugger {
const char DEBUGGER_INFORMATION_COMMAND[] = "Binary"; const char DEBUGGER_INFORMATION_COMMAND[] = "Binary";
const char DEBUGGER_INFORMATION_DISPLAYNAME[] = "DisplayName"; const char DEBUGGER_INFORMATION_DISPLAYNAME[] = "DisplayName";
const char DEBUGGER_INFORMATION_ID[] = "Id"; const char DEBUGGER_INFORMATION_ID[] = "Id";
@@ -67,7 +69,7 @@ const char DEBUGGER_INFORMATION_WORKINGDIRECTORY[] = "WorkingDirectory";
//! Return the configuration of gdb as a list of --key=value //! Return the configuration of gdb as a list of --key=value
//! \note That the list will also contain some output not in this format. //! \note That the list will also contain some output not in this format.
static QString getConfigurationOfGdbCommand(const FilePath &command, const Utils::Environment &sysEnv) static QString getGdbConfiguration(const FilePath &command, const Environment &sysEnv)
{ {
// run gdb with the --configuration opion // run gdb with the --configuration opion
QtcProcess proc; QtcProcess proc;
@@ -94,8 +96,6 @@ static QString extractGdbTargetAbiStringFromGdbOutput(const QString &gdbOutput)
} }
namespace Debugger {
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// DebuggerItem // DebuggerItem
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -151,7 +151,7 @@ static bool isUVisionExecutable(const QFileInfo &fileInfo)
return baseName == "UV4"; return baseName == "UV4";
} }
void DebuggerItem::reinitializeFromFile(const Utils::Environment &sysEnv) void DebuggerItem::reinitializeFromFile(const Environment &sysEnv)
{ {
// CDB only understands the single-dash -version, whereas GDB and LLDB are // CDB only understands the single-dash -version, whereas GDB and LLDB are
// happy with both -version and --version. So use the "working" -version // happy with both -version and --version. So use the "working" -version
@@ -212,7 +212,7 @@ void DebuggerItem::reinitializeFromFile(const Utils::Environment &sysEnv)
const bool unableToFindAVersion = (0 == version); const bool unableToFindAVersion = (0 == version);
const bool gdbSupportsConfigurationFlag = (version >= 70700); const bool gdbSupportsConfigurationFlag = (version >= 70700);
if (gdbSupportsConfigurationFlag || unableToFindAVersion) { if (gdbSupportsConfigurationFlag || unableToFindAVersion) {
const QString gdbConfiguration = getConfigurationOfGdbCommand(m_command, sysEnv); const QString gdbConfiguration = getGdbConfiguration(m_command, sysEnv);
const QString gdbTargetAbiString = const QString gdbTargetAbiString =
extractGdbTargetAbiStringFromGdbOutput(gdbConfiguration); extractGdbTargetAbiStringFromGdbOutput(gdbConfiguration);
if (!gdbTargetAbiString.isEmpty()) { if (!gdbTargetAbiString.isEmpty()) {
@@ -300,11 +300,11 @@ QDateTime DebuggerItem::lastModified() const
QIcon DebuggerItem::decoration() const QIcon DebuggerItem::decoration() const
{ {
if (m_engineType == NoEngineType) if (m_engineType == NoEngineType)
return Utils::Icons::CRITICAL.icon(); return Icons::CRITICAL.icon();
if (!m_command.toFileInfo().isExecutable()) if (!m_command.toFileInfo().isExecutable())
return Utils::Icons::WARNING.icon(); return Icons::WARNING.icon();
if (!m_workingDirectory.isEmpty() && !m_workingDirectory.isDir()) if (!m_workingDirectory.isEmpty() && !m_workingDirectory.isDir())
return Utils::Icons::WARNING.icon(); return Icons::WARNING.icon();
return QIcon(); return QIcon();
} }