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

Replace QString::null with default constructed QString

Browse Source 
QString::null is deprecated since Qt 5.9.

Change-Id: Ib84f338ed8cecaee0c164191fb580c851bd84ab4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-21 01:26:18 +03:00
committed by Orgad Shaneh
parent 6635f85d47
commit 8d814facf7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/modelinglib/qmt/infrastructure/ioexceptions.h
View File

@@ -38,7 +38,7 @@ public:
class FileIOException : public IOException class FileIOException : public IOException
{ {
public: public:
explicit FileIOException(const QString &errorMsg, const QString &fileName = QString::null, explicit FileIOException(const QString &errorMsg, const QString &fileName = QString(),
int lineNumber = -1); int lineNumber = -1);
QString fileName() const { return m_fileName; } QString fileName() const { return m_fileName; }

6
src/libs/qmljs/qmljsrewriter.cpp
View File

@@ -220,7 +220,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb
else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member)) else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member))
orderedMembers[toString(objectBinding->qualifiedId)] = iter; orderedMembers[toString(objectBinding->qualifiedId)] = iter;
else if (cast<UiObjectDefinition*>(member)) else if (cast<UiObjectDefinition*>(member))
orderedMembers[QString::null] = iter; orderedMembers[QString()] = iter;
else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member)) else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter; orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (cast<UiPublicMember*>(member)) else if (cast<UiPublicMember*>(member))
@@ -517,7 +517,7 @@ void Rewriter::includeEmptyGroupedProperty(UiObjectDefinition *groupedProperty,
#if 0 #if 0
UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *members, const QStringList &propertyOrder) 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 *lastObjectDef = 0;
UiObjectMemberList *lastNonObjectDef = 0; UiObjectMemberList *lastNonObjectDef = 0;
@@ -562,7 +562,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m
else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member)) else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member))
orderedMembers[toString(objectBinding->qualifiedId)] = iter; orderedMembers[toString(objectBinding->qualifiedId)] = iter;
else if (cast<UiObjectDefinition*>(member)) else if (cast<UiObjectDefinition*>(member))
orderedMembers[QString::null] = iter; orderedMembers[QString()] = iter;
else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member)) else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter; orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (cast<UiPublicMember*>(member)) else if (cast<UiPublicMember*>(member))

2
src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
View File

@@ -309,7 +309,7 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS
else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member)) else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member))
orderedMembers[toString(objectBinding->qualifiedId)] = iter; orderedMembers[toString(objectBinding->qualifiedId)] = iter;
else if (QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(member)) 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)) else if (auto scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter; orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(member)) else if (QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(member))

2
src/plugins/qmljseditor/quicktoolbar.cpp
View File

@@ -96,7 +96,7 @@ QuickToolBar::QuickToolBar()
<< QLatin1String("font.italic") << QLatin1String("font.italic")
<< QLatin1String("font.underline") << QLatin1String("font.underline")
<< QLatin1String("font.strikeout") << QLatin1String("font.strikeout")
<< QString::null << QString()
<< QLatin1String("states") << QLatin1String("states")
<< QLatin1String("transitions") << QLatin1String("transitions")
; ;