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

QmlJS: Avoid deprecation warnings

Browse Source 
Change-Id: Ifeaf0599f0507a0a10dd9683081a48d3232b414a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-07-04 18:05:17 +02:00
parent 9ae2794114
commit 68027ec41b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/qmljs/qmljssimplereader.cpp
View File

@@ -92,7 +92,7 @@ SimpleReaderNode::Ptr SimpleReaderNode::create(const QString &name, WeakPtr pare
Ptr newNode(new SimpleReaderNode(name, parent)); Ptr newNode(new SimpleReaderNode(name, parent));
newNode->m_weakThis = newNode; newNode->m_weakThis = newNode;
if (parent) if (parent)
parent.data()->m_children.append(newNode); parent.toStrongRef().data()->m_children.append(newNode);
return newNode; return newNode;
} }
@@ -323,21 +323,21 @@ void SimpleReader::elementEnd()
{ {
Q_ASSERT(m_currentNode); Q_ASSERT(m_currentNode);
qCDebug(simpleReaderLog) << "elementEnd()" << m_currentNode.data()->name(); qCDebug(simpleReaderLog) << "elementEnd()" << m_currentNode.toStrongRef().data()->name();
m_currentNode = m_currentNode.data()->parent(); m_currentNode = m_currentNode.toStrongRef().data()->parent();
} }
void SimpleReader::propertyDefinition(const QString &name, const QVariant &value) void SimpleReader::propertyDefinition(const QString &name, const QVariant &value)
{ {
Q_ASSERT(m_currentNode); Q_ASSERT(m_currentNode);
qCDebug(simpleReaderLog) << "propertyDefinition()" << m_currentNode.data()->name() << name << value; qCDebug(simpleReaderLog) << "propertyDefinition()" << m_currentNode.toStrongRef().data()->name() << name << value;
if (m_currentNode.data()->propertyNames().contains(name)) if (m_currentNode.toStrongRef().data()->propertyNames().contains(name))
addError(tr("Property is defined twice."), currentSourceLocation()); addError(tr("Property is defined twice."), currentSourceLocation());
m_currentNode.data()->setProperty(name, value); m_currentNode.toStrongRef().data()->setProperty(name, value);
} }
} // namespace QmlJS } // namespace QmlJS