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

Debugger: Handle some Qt deprecation warnings

Browse Source 
Change-Id: I93c9f91642bc5f5bd43ebb80cb489782978db327
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-06-09 13:15:11 +02:00
parent 27762d2dcf
commit d0cf49db47
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -879,7 +879,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result,
item->appendChild(child); item->appendChild(child);
} }
} else if (result.type() == QVariant::List) { } else if (result.typeId() == QVariant::List) {
if (key.isEmpty()) if (key.isEmpty())
text = "List"; text = "List";
else else
@@ -1354,9 +1354,9 @@ void QmlEnginePrivate::scripts(int types, const QList<int> ids, bool includeSour
if (includeSource) if (includeSource)
cmd.arg(INCLUDESOURCE, includeSource); cmd.arg(INCLUDESOURCE, includeSource);
if (filter.type() == QVariant::String) if (filter.typeId() == QVariant::String)
cmd.arg(FILTER, filter.toString()); cmd.arg(FILTER, filter.toString());
else if (filter.type() == QVariant::Int) else if (filter.typeId() == QVariant::Int)
cmd.arg(FILTER, filter.toInt()); cmd.arg(FILTER, filter.toInt());
else else
QTC_CHECK(!filter.isValid()); QTC_CHECK(!filter.isValid());
@@ -2039,7 +2039,7 @@ StackFrame QmlEnginePrivate::extractStackFrame(const QVariant &bodyVal)
} }
auto extractString = [this](const QVariant &item) { auto extractString = [this](const QVariant &item) {
return ((item.type() == QVariant::String) ? item : extractData(item).value).toString(); return (item.typeId() == QVariant::String ? item : extractData(item).value).toString();
}; };
stackFrame.function = extractString(body.value("func")); stackFrame.function = extractString(body.value("func"));

4
src/plugins/debugger/watchhandler.cpp
View File

@@ -2517,9 +2517,9 @@ void WatchModel::showEditValue(const WatchItem *item)
else if (format == DisplayUtf8String) else if (format == DisplayUtf8String)
str = QString::fromUtf8(ba.constData(), ba.size()); str = QString::fromUtf8(ba.constData(), ba.size());
else if (format == DisplayUtf16String) else if (format == DisplayUtf16String)
str = QString::fromUtf16((ushort *)ba.constData(), ba.size() / 2); str = QString::fromUtf16(reinterpret_cast<const char16_t *>(ba.constData()), ba.size() / 2);
else if (format == DisplayUcs4String) else if (format == DisplayUcs4String)
str = QString::fromUcs4((uint *)ba.constData(), ba.size() / 4); str = QString::fromUcs4(reinterpret_cast<const char32_t *>(ba.constData()), ba.size() / 4);
m_separatedView->prepareObject<TextEdit>(item)->setPlainText(str); m_separatedView->prepareObject<TextEdit>(item)->setPlainText(str);
} else if (format == DisplayPlotData) { } else if (format == DisplayPlotData) {
// Plots // Plots