aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2018-09-21 01:26:18 +0300
committerOrgad Shaneh <[email protected]>2018-09-21 06:47:33 +0000
commit8d814facf7e8bb03b26424f4899c2a6c5db19fe8 (patch)
tree9cd7c523823d097e0f54e0c327a015bc7b6a714b
parent6635f85d47289e63a01d85e3fe50541a90fe7bad (diff)
Replace QString::null with default constructed QString
QString::null is deprecated since Qt 5.9. Change-Id: Ib84f338ed8cecaee0c164191fb580c851bd84ab4 Reviewed-by: Eike Ziller <[email protected]>
-rw-r--r--src/libs/modelinglib/qmt/infrastructure/ioexceptions.h2
-rw-r--r--src/libs/qmljs/qmljsrewriter.cpp6
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp2
-rw-r--r--src/plugins/qmljseditor/quicktoolbar.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h
index cba138b0563..fc5eb73917d 100644
--- a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h
+++ b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h
@@ -38,7 +38,7 @@ public:
class FileIOException : public IOException
{
public:
- explicit FileIOException(const QString &errorMsg, const QString &fileName = QString::null,
+ explicit FileIOException(const QString &errorMsg, const QString &fileName = QString(),
int lineNumber = -1);
QString fileName() const { return m_fileName; }
diff --git a/src/libs/qmljs/qmljsrewriter.cpp b/src/libs/qmljs/qmljsrewriter.cpp
index 4e70a26b4a0..b672f8df868 100644
--- a/src/libs/qmljs/qmljsrewriter.cpp
+++ b/src/libs/qmljs/qmljsrewriter.cpp
@@ -220,7 +220,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb
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))
@@ -517,7 +517,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 = 0;
UiObjectMemberList *lastNonObjectDef = 0;
@@ -562,7 +562,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))
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
index b5388afc59f..7777f3202c2 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
@@ -309,7 +309,7 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS
else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member))
orderedMembers[toString(objectBinding->qualifiedId)] = iter;
else if (QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(member))
- orderedMembers[QString::null] = iter;
+ orderedMembers[QString()] = iter;
else if (auto scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(member))
diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp
index 3122c43ceda..41c1bea1146 100644
--- a/src/plugins/qmljseditor/quicktoolbar.cpp
+++ b/src/plugins/qmljseditor/quicktoolbar.cpp
@@ -96,7 +96,7 @@ QuickToolBar::QuickToolBar()
<< QLatin1String("font.italic")
<< QLatin1String("font.underline")
<< QLatin1String("font.strikeout")
- << QString::null
+ << QString()
<< QLatin1String("states")
<< QLatin1String("transitions")
;