aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2019-02-18 22:27:45 +0200
committerOrgad Shaneh <orgads@gmail.com>2019-02-19 11:33:11 +0000
commit20608d7fd8d9216f0a1d2204316fcb4f1a3c7229 (patch)
treee27241028c1d33800592a5dc116f4e67b31ce19e
parent0b60866b01ef1c5d3424ca587323627ee8af20c4 (diff)
Remove usages of deprecated QString::null
Change-Id: If126c3b27272386ed513fdfdbf9448ec00019c11 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/lib/corelib/api/qmljsrewriter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/api/qmljsrewriter.cpp b/src/lib/corelib/api/qmljsrewriter.cpp
index 60c384004..baf1f3e2c 100644
--- a/src/lib/corelib/api/qmljsrewriter.cpp
+++ b/src/lib/corelib/api/qmljsrewriter.cpp
@@ -246,7 +246,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb
else if (auto objectBinding = cast<UiObjectBinding*>(member))
orderedMembers[toString(objectBinding->qualifiedId)] = iter;
else if (cast<UiObjectDefinition*>(member))
- orderedMembers[QString::null] = iter;
+ orderedMembers[QString()] = iter;
else if (auto scriptBinding = cast<UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (cast<UiPublicMember*>(member))
@@ -543,7 +543,7 @@ void Rewriter::includeEmptyGroupedProperty(UiObjectDefinition *groupedProperty,
#if 0
UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *members, const QStringList &propertyOrder)
{
- const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString::null);
+ const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString());
UiObjectMemberList *lastObjectDef = nullptr;
UiObjectMemberList *lastNonObjectDef = nullptr;
@@ -588,7 +588,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m
else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member))
orderedMembers[toString(objectBinding->qualifiedId)] = iter;
else if (cast<UiObjectDefinition*>(member))
- orderedMembers[QString::null] = iter;
+ orderedMembers[QString()] = iter;
else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (cast<UiPublicMember*>(member))