diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2021-01-06 16:01:17 +0100 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2021-01-06 20:12:39 +0000 |
| commit | 730dd687d5da090cbc34ba448ca581a235b239c3 (patch) | |
| tree | 163f0b8013ca1837042e798bbb9afe9847c3c08d | |
| parent | d305168964a45e93b98413b944a6ba1761cf4e40 (diff) | |
Port away from deprecated non-namespaced stream modifiers
Use the namespaced Qt:: equivalent instead.
Change-Id: I3b82febee77a8cce55a1a17ac65018999e51fd43
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | app/perfelfmap.cpp | 8 | ||||
| -rw-r--r-- | app/perfkallsyms.cpp | 2 | ||||
| -rw-r--r-- | app/perfsymboltable.cpp | 4 | ||||
| -rw-r--r-- | app/perfunwind.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/perfelfmap.cpp b/app/perfelfmap.cpp index 5fad1ee..4284368 100644 --- a/app/perfelfmap.cpp +++ b/app/perfelfmap.cpp @@ -30,13 +30,13 @@ QDebug operator<<(QDebug stream, const PerfElfMap::ElfInfo& info) << "isFile=" << info.isFile() << ", " << "originalFileName=" << info.originalFileName << ", " << "originalPath=" << info.originalPath << ", " - << "addr=" << hex << info.addr << ", " - << "len=" << hex << info.length << ", " - << "pgoff=" << hex << info.pgoff << ", " + << "addr=" << Qt::hex << info.addr << ", " + << "len=" << Qt::hex << info.length << ", " + << "pgoff=" << Qt::hex << info.pgoff << ", " << "baseAddr="; if (info.hasBaseAddr()) - stream << hex << info.baseAddr; + stream << Qt::hex << info.baseAddr; else stream << "n/a"; diff --git a/app/perfkallsyms.cpp b/app/perfkallsyms.cpp index 0ef016e..6330357 100644 --- a/app/perfkallsyms.cpp +++ b/app/perfkallsyms.cpp @@ -47,7 +47,7 @@ bool PerfKallsyms::parseMapping(const QString &path) char type = 0; char eol = '\n'; - stream >> address >> ws >> type >> ws >> entry.symbol >> eol; + stream >> address >> Qt::ws >> type >> Qt::ws >> entry.symbol >> eol; if (address.isEmpty()) break; diff --git a/app/perfsymboltable.cpp b/app/perfsymboltable.cpp index d5320e3..7fb19ec 100644 --- a/app/perfsymboltable.cpp +++ b/app/perfsymboltable.cpp @@ -130,7 +130,7 @@ static bool memoryRead(Dwfl *, Dwarf_Addr addr, Dwarf_Word *result, void *arg) /* Check overflow. */ if (addr + sizeof(Dwarf_Word) < addr) { - qDebug() << "Invalid memory read requested by dwfl" << hex << addr; + qDebug() << "Invalid memory read requested by dwfl" << Qt::hex << addr; ui->firstGuessedFrame = ui->frames.length(); return false; } @@ -146,7 +146,7 @@ static bool memoryRead(Dwfl *, Dwarf_Addr addr, Dwarf_Word *result, void *arg) // not stack, try reading from ELF if (ui->unwind->ipIsInKernelSpace(addr)) { // DWARF unwinding is not done for the kernel - qWarning() << "DWARF unwind tried to access kernel space" << hex << addr; + qWarning() << "DWARF unwind tried to access kernel space" << Qt::hex << addr; return false; } if (!accessDsoMem(ui, addr, result, wordWidth)) { diff --git a/app/perfunwind.cpp b/app/perfunwind.cpp index 0fdad1a..d3ca3ca 100644 --- a/app/perfunwind.cpp +++ b/app/perfunwind.cpp @@ -471,7 +471,7 @@ void PerfUnwind::resolveCallchain() } break; default: - qWarning() << "invalid callchain context" << hex << ip; + qWarning() << "invalid callchain context" << Qt::hex << ip; return; } } else { |