diff options
Diffstat (limited to 'src/plugins/qmldesigner/designercore')
90 files changed, 475 insertions, 583 deletions
diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp index e106c2fe93..b0482ddc97 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp @@ -126,9 +126,7 @@ if (s_shouldAssert) Q_ASSERT_X(false, _function, QString(QStringLiteral("%1:%2 - %3")).arg(m_file).arg(m_line).arg(m_function).toUtf8()); } -Exception::~Exception() -{ -} +Exception::~Exception() = default; /*! Returns the unmangled backtrace of this exception as a string. diff --git a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp index 898ce22bcb..94e1cbaa0f 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp @@ -45,10 +45,10 @@ AddArrayMemberVisitor::AddArrayMemberVisitor(TextModifier &modifier, void AddArrayMemberVisitor::findArrayBindingAndInsert(const QString &propertyName, QmlJS::AST::UiObjectMemberList *ast) { for (QmlJS::AST::UiObjectMemberList *iter = ast; iter; iter = iter->next) { - if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(iter->member)) { + if (auto arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(iter->member)) { if (toString(arrayBinding->qualifiedId) == propertyName) insertInto(arrayBinding); - } else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(iter->member)) { + } else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(iter->member)) { if (toString(objectBinding->qualifiedId) == propertyName && willConvertObjectBindingIntoArrayBinding()) convertAndAdd(objectBinding); } @@ -80,7 +80,7 @@ bool AddArrayMemberVisitor::visit(QmlJS::AST::UiObjectDefinition *ast) // FIXME: duplicate code in the QmlJS::Rewriter class, remove this void AddArrayMemberVisitor::insertInto(QmlJS::AST::UiArrayBinding *arrayBinding) { - QmlJS::AST::UiObjectMember *lastMember = 0; + QmlJS::AST::UiObjectMember *lastMember = nullptr; for (QmlJS::AST::UiArrayMemberList *iter = arrayBinding->members; iter; iter = iter->next) if (iter->member) lastMember = iter->member; diff --git a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h index d414e24664..3498068fbc 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h @@ -45,8 +45,8 @@ public: { m_convertObjectBindingIntoArrayBinding = convertObjectBindingIntoArrayBinding; } protected: - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: void findArrayBindingAndInsert(const QString &propertyName, QmlJS::AST::UiObjectMemberList *ast); diff --git a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h index 2b869cbc50..dc1dd66e36 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h @@ -39,8 +39,8 @@ public: const PropertyNameList &propertyOrder); protected: - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: void insertInto(QmlJS::AST::UiObjectInitializer *ast); diff --git a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp index 7628c6b828..70e2f8463e 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp @@ -83,7 +83,7 @@ void AddPropertyVisitor::addInMembers(QmlJS::AST::UiObjectInitializer *initializ QmlJS::AST::SourceLocation startOfNextMember; unsigned depth; - if (insertAfter == 0 || insertAfter->member == 0) { + if (insertAfter == nullptr || insertAfter->member == nullptr) { // insert as first member endOfPreviousMember = initializer->lbraceToken; @@ -108,7 +108,7 @@ void AddPropertyVisitor::addInMembers(QmlJS::AST::UiObjectInitializer *initializ bool needsTrailingSemicolon = false; if (isOneLiner) { - if (insertAfter == 0) { // we're inserting after an lbrace + if (insertAfter == nullptr) { // we're inserting after an lbrace if (initializer->members) { // we're inserting before a member (and not the rbrace) needsTrailingSemicolon = m_propertyType == QmlRefactoring::ScriptBinding; } diff --git a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h index 9da136d82c..f6f92de125 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h @@ -44,8 +44,8 @@ public: const TypeName &dynamicTypeName); protected: - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; private: void addInMembers(QmlJS::AST::UiObjectInitializer *initializer); diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp index f5b5a42e30..a35ff98ef4 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp @@ -70,7 +70,7 @@ bool ChangeImportsVisitor::remove(QmlJS::AST::UiProgram *ast, const Import &impo return false; for (QmlJS::AST::UiHeaderItemList *iter = ast->headers; iter; iter = iter->next) { - QmlJS::AST::UiImport *iterImport = QmlJS::AST::cast<QmlJS::AST::UiImport *>(iter->headerItem); + auto iterImport = QmlJS::AST::cast<QmlJS::AST::UiImport *>(iter->headerItem); if (equals(iterImport, import)) { int start = iterImport->firstSourceLocation().begin(); int end = iterImport->lastSourceLocation().end(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h index 474f83b944..9c25c35c5c 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h @@ -38,8 +38,8 @@ public: const QString &newType); protected: - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; private: void replaceType(QmlJS::AST::UiQualifiedId *typeId); diff --git a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp index eadd48dc7f..b6ed184f9d 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp @@ -113,7 +113,7 @@ void ChangePropertyVisitor::replaceInMembers(UiObjectInitializer *initializer, break; // for grouped properties: } else if (!prefix.isEmpty()) { - if (UiObjectDefinition *def = cast<UiObjectDefinition *>(member)) { + if (auto def = cast<UiObjectDefinition *>(member)) { if (toString(def->qualifiedTypeNameId) == prefix) replaceInMembers(def->initializer, suffix); } @@ -127,16 +127,16 @@ void ChangePropertyVisitor::replaceMemberValue(UiObjectMember *propertyMember, b QString replacement = m_value; int startOffset = -1; int endOffset = -1; - if (UiObjectBinding *objectBinding = AST::cast<UiObjectBinding *>(propertyMember)) { + if (auto objectBinding = AST::cast<UiObjectBinding *>(propertyMember)) { startOffset = objectBinding->qualifiedTypeNameId->identifierToken.offset; endOffset = objectBinding->initializer->rbraceToken.end(); - } else if (UiScriptBinding *scriptBinding = AST::cast<UiScriptBinding *>(propertyMember)) { + } else if (auto scriptBinding = AST::cast<UiScriptBinding *>(propertyMember)) { startOffset = scriptBinding->statement->firstSourceLocation().offset; endOffset = scriptBinding->statement->lastSourceLocation().end(); - } else if (UiArrayBinding *arrayBinding = AST::cast<UiArrayBinding *>(propertyMember)) { + } else if (auto arrayBinding = AST::cast<UiArrayBinding *>(propertyMember)) { startOffset = arrayBinding->lbracketToken.offset; endOffset = arrayBinding->rbracketToken.end(); - } else if (UiPublicMember *publicMember = AST::cast<UiPublicMember*>(propertyMember)) { + } else if (auto publicMember = AST::cast<UiPublicMember*>(propertyMember)) { if (publicMember->statement) { startOffset = publicMember->statement->firstSourceLocation().offset; if (publicMember->semicolonToken.isValid()) @@ -165,13 +165,13 @@ void ChangePropertyVisitor::replaceMemberValue(UiObjectMember *propertyMember, b bool ChangePropertyVisitor::isMatchingPropertyMember(const QString &propName, UiObjectMember *member) { - if (UiObjectBinding *objectBinding = AST::cast<UiObjectBinding *>(member)) + if (auto objectBinding = AST::cast<UiObjectBinding *>(member)) return propName == toString(objectBinding->qualifiedId); - else if (UiScriptBinding *scriptBinding = AST::cast<UiScriptBinding *>(member)) + else if (auto scriptBinding = AST::cast<UiScriptBinding *>(member)) return propName == toString(scriptBinding->qualifiedId); - else if (UiArrayBinding *arrayBinding = AST::cast<UiArrayBinding *>(member)) + else if (auto arrayBinding = AST::cast<UiArrayBinding *>(member)) return propName == toString(arrayBinding->qualifiedId); - else if (UiPublicMember *publicMember = AST::cast<UiPublicMember *>(member)) + else if (auto publicMember = AST::cast<UiPublicMember *>(member)) return propName == publicMember->name; else return false; @@ -192,7 +192,7 @@ void ChangePropertyVisitor::insertIntoArray(QmlJS::AST::UiArrayBinding *ast) if (!ast) return; - UiObjectMember *lastMember = 0; + UiObjectMember *lastMember = nullptr; for (UiArrayMemberList *iter = ast->members; iter; iter = iter->next) { lastMember = iter->member; } diff --git a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h index f97eea0a37..d4a9c50a9a 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h @@ -41,8 +41,8 @@ public: QmlRefactoring::PropertyType propertyType); protected: - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; private: void replaceInMembers(QmlJS::AST::UiObjectInitializer *initializer, diff --git a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp index dec17c5e1b..76ecb59f30 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp @@ -54,7 +54,7 @@ FirstDefinitionFinder::FirstDefinitionFinder(const QString &text): qint32 FirstDefinitionFinder::operator()(quint32 offset) { m_offset = offset; - m_firstObjectDefinition = 0; + m_firstObjectDefinition = nullptr; QmlJS::AST::Node::accept(m_doc->qmlProgram(), this); @@ -70,7 +70,7 @@ void FirstDefinitionFinder::extractFirstObjectDefinition(QmlJS::AST::UiObjectIni return; for (QmlJS::AST::UiObjectMemberList *iter = ast->members; iter; iter = iter->next) { - if (QmlJS::AST::UiObjectDefinition *def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(iter->member)) + if (auto def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(iter->member)) m_firstObjectDefinition = def; } } diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp index 0ec53a7452..3be5de5bc9 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp @@ -53,8 +53,8 @@ MoveObjectBeforeObjectVisitor::MoveObjectBeforeObjectVisitor(TextModifier &modif bool MoveObjectBeforeObjectVisitor::operator ()(QmlJS::AST::UiProgram *ast) { - movingObject = 0; - beforeObject = 0; + movingObject = nullptr; + beforeObject = nullptr; movingObjectParents.clear(); QMLRewriter::operator ()(ast); @@ -102,14 +102,14 @@ void MoveObjectBeforeObjectVisitor::doMove() TextModifier::MoveInfo moveInfo; QmlJS::AST::Node *parent = movingObjectParent(); - QmlJS::AST::UiArrayMemberList *arrayMember = 0, *otherArrayMember = 0; + QmlJS::AST::UiArrayMemberList *arrayMember = nullptr, *otherArrayMember = nullptr; QString separator; if (!inDefaultProperty) { - QmlJS::AST::UiArrayBinding *initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent); + auto initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent); Q_ASSERT(initializer); - otherArrayMember = 0; + otherArrayMember = nullptr; for (QmlJS::AST::UiArrayMemberList *cur = initializer->members; cur; cur = cur->next) { if (cur->member == movingObject) { arrayMember = cur; @@ -166,7 +166,7 @@ QmlJS::AST::Node *MoveObjectBeforeObjectVisitor::movingObjectParent() const if (movingObjectParents.size() > 1) return movingObjectParents.at(movingObjectParents.size() - 2); else - return 0; + return nullptr; } QmlJS::AST::SourceLocation MoveObjectBeforeObjectVisitor::lastParentLocation() const @@ -174,9 +174,9 @@ QmlJS::AST::SourceLocation MoveObjectBeforeObjectVisitor::lastParentLocation() c dump(movingObjectParents); QmlJS::AST::Node *parent = movingObjectParent(); - if (QmlJS::AST::UiObjectInitializer *initializer = QmlJS::AST::cast<QmlJS::AST::UiObjectInitializer*>(parent)) + if (auto initializer = QmlJS::AST::cast<QmlJS::AST::UiObjectInitializer*>(parent)) return initializer->rbraceToken; - else if (QmlJS::AST::UiArrayBinding *initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent)) + else if (auto initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent)) return initializer->rbracketToken; else return QmlJS::AST::SourceLocation(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h index 7b5f39d175..922d9fe40a 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h @@ -43,17 +43,17 @@ public: quint32 beforeObjectLocation, bool inDefaultProperty); - bool operator ()(QmlJS::AST::UiProgram *ast); + bool operator ()(QmlJS::AST::UiProgram *ast) override; protected: - virtual bool preVisit(QmlJS::AST::Node *ast); - virtual void postVisit(QmlJS::AST::Node *ast); + bool preVisit(QmlJS::AST::Node *ast) override; + void postVisit(QmlJS::AST::Node *ast) override; - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: bool foundEverything() const - { return movingObject != 0 && !movingObjectParents.isEmpty() && (toEnd || beforeObject != 0); } + { return movingObject != nullptr && !movingObjectParents.isEmpty() && (toEnd || beforeObject != nullptr); } void doMove(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp index 949c89cda0..e0e820ac8f 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp @@ -100,7 +100,7 @@ private: for (UiObjectMemberList *iter = ast->members; iter; iter = iter->next) { UiObjectMember *member = iter->member; - if (UiArrayBinding *arrayBinding = cast<UiArrayBinding*>(member)) { + if (auto arrayBinding = cast<UiArrayBinding*>(member)) { if (toString(arrayBinding->qualifiedId) == QString::fromUtf8(targetPropertyName)) { appendToArray(arrayBinding); @@ -128,7 +128,7 @@ private: void appendToArray(UiArrayBinding *ast) { - UiObjectMember *lastMember = 0; + UiObjectMember *lastMember = nullptr; for (UiArrayMemberList *iter = ast->members; iter; iter = iter->next) { if (iter->member) @@ -179,7 +179,7 @@ bool MoveObjectVisitor::visit(UiArrayBinding *ast) if (didRewriting()) return false; - UiArrayMemberList *currentMember = 0; + UiArrayMemberList *currentMember = nullptr; for (UiArrayMemberList *it = ast->members; it; it = it->next) { if (it->member->firstSourceLocation().offset == objectLocation) { diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h index cc6d44825d..b3b8b1ab1c 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h @@ -40,12 +40,12 @@ public: quint32 targetParentObjectLocation, const PropertyNameList &propertyOrder); - bool operator ()(QmlJS::AST::UiProgram *ast); + bool operator ()(QmlJS::AST::UiProgram *ast) override; protected: - virtual bool visit(QmlJS::AST::UiArrayBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiArrayBinding *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: void doMove(const TextModifier::MoveInfo &moveInfo); diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp index 6247f98697..b5388afc59 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp @@ -153,7 +153,7 @@ QString QMLRewriter::removeIndentation(const QString &text, unsigned depth) QmlJS::AST::SourceLocation QMLRewriter::calculateLocation(QmlJS::AST::UiQualifiedId *id) { - Q_ASSERT(id != 0); + Q_ASSERT(id != nullptr); const QmlJS::AST::SourceLocation startLocation = id->identifierToken; @@ -169,7 +169,7 @@ QmlJS::AST::SourceLocation QMLRewriter::calculateLocation(QmlJS::AST::UiQualifie bool QMLRewriter::isMissingSemicolon(QmlJS::AST::UiObjectMember *member) { - QmlJS::AST::UiScriptBinding *binding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding *>(member); + auto binding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding *>(member); if (binding) return isMissingSemicolon(binding->statement); else @@ -178,14 +178,14 @@ bool QMLRewriter::isMissingSemicolon(QmlJS::AST::UiObjectMember *member) bool QMLRewriter::isMissingSemicolon(QmlJS::AST::Statement *stmt) { - if (QmlJS::AST::ExpressionStatement *eStmt = QmlJS::AST::cast<QmlJS::AST::ExpressionStatement *>(stmt)) { + if (auto eStmt = QmlJS::AST::cast<QmlJS::AST::ExpressionStatement *>(stmt)) { return !eStmt->semicolonToken.isValid(); - } else if (QmlJS::AST::IfStatement *iStmt = QmlJS::AST::cast<QmlJS::AST::IfStatement *>(stmt)) { + } else if (auto iStmt = QmlJS::AST::cast<QmlJS::AST::IfStatement *>(stmt)) { if (iStmt->elseToken.isValid()) return isMissingSemicolon(iStmt->ko); else return isMissingSemicolon(iStmt->ok); - } else if (QmlJS::AST::DebuggerStatement *dStmt = QmlJS::AST::cast<QmlJS::AST::DebuggerStatement *>(stmt)) { + } else if (auto dStmt = QmlJS::AST::cast<QmlJS::AST::DebuggerStatement *>(stmt)) { return !dStmt->semicolonToken.isValid(); } else { return false; @@ -263,8 +263,8 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS { const int objectDefinitionInsertionPoint = propertyOrder.indexOf(PropertyName()); // XXX ???? - QmlJS::AST::UiObjectMemberList *lastObjectDef = 0; - QmlJS::AST::UiObjectMemberList *lastNonObjectDef = 0; + QmlJS::AST::UiObjectMemberList *lastObjectDef = nullptr; + QmlJS::AST::UiObjectMemberList *lastNonObjectDef = nullptr; for (QmlJS::AST::UiObjectMemberList *iter = members; iter; iter = iter->next) { QmlJS::AST::UiObjectMember *member = iter->member; @@ -272,11 +272,11 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS if (QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(member)) lastObjectDef = iter; - else if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(member)) + else if (auto arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(member)) idx = propertyOrder.indexOf(toString(arrayBinding->qualifiedId).toUtf8()); - else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member)) + else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member)) idx = propertyOrder.indexOf(toString(objectBinding->qualifiedId).toUtf8()); - else if (QmlJS::AST::UiScriptBinding *scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member)) + else if (auto scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member)) idx = propertyOrder.indexOf(toString(scriptBinding->qualifiedId).toUtf8()); else if (QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(member)) idx = propertyOrder.indexOf("property"); @@ -297,20 +297,20 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS const QmlDesigner::PropertyNameList &propertyOrder) { if (!members) - return 0; // empty members + return nullptr; // empty members QHash<QString, QmlJS::AST::UiObjectMemberList *> orderedMembers; for (QmlJS::AST::UiObjectMemberList *iter = members; iter; iter = iter->next) { QmlJS::AST::UiObjectMember *member = iter->member; - if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(member)) + if (auto arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(member)) orderedMembers[toString(arrayBinding->qualifiedId)] = iter; - else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member)) + 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; - else if (QmlJS::AST::UiScriptBinding *scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member)) + 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)) orderedMembers[QStringLiteral("property")] = iter; @@ -325,11 +325,11 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS for (; idx > 0; --idx) { const QString prop = QString::fromLatin1(propertyOrder.at(idx - 1)); QmlJS::AST::UiObjectMemberList *candidate = orderedMembers.value(prop, 0); - if (candidate != 0) + if (candidate != nullptr) return candidate; } - return 0; + return nullptr; } void QMLRewriter::dump(const ASTPath &path) diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h index af54ba8c13..062710ef4c 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h @@ -39,7 +39,7 @@ namespace Internal { class QMLRewriter: protected QmlJS::AST::Visitor { public: - typedef QStack<QmlJS::AST::Node *> ASTPath; + using ASTPath = QStack<QmlJS::AST::Node *>; public: QMLRewriter(QmlDesigner::TextModifier &textModifier); diff --git a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp index 20b0e4342b..a61acd0254 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp @@ -81,7 +81,7 @@ void RemovePropertyVisitor::removeFrom(QmlJS::AST::UiObjectInitializer *ast) removeMember(member); // check for grouped properties: } else if (!prefix.isEmpty()) { - if (QmlJS::AST::UiObjectDefinition *def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition *>(member)) { + if (auto def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition *>(member)) { if (toString(def->qualifiedTypeNameId) == prefix) removeGroupedProperty(def); } @@ -98,7 +98,7 @@ void RemovePropertyVisitor::removeGroupedProperty(QmlJS::AST::UiObjectDefinition const QString propName = propertyName.mid(dotIdx + 1); - QmlJS::AST::UiObjectMember *wanted = 0; + QmlJS::AST::UiObjectMember *wanted = nullptr; unsigned memberCount = 0; for (QmlJS::AST::UiObjectMemberList *it = ast->initializer->members; it; it = it->next) { ++memberCount; @@ -131,13 +131,13 @@ void RemovePropertyVisitor::removeMember(QmlJS::AST::UiObjectMember *member) // FIXME: duplicate code in the QmlJS::Rewriter class, remove this bool RemovePropertyVisitor::memberNameMatchesPropertyName(const QString &propertyName, QmlJS::AST::UiObjectMember *ast) { - if (QmlJS::AST::UiPublicMember *publicMember = QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(ast)) + if (auto publicMember = QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(ast)) return publicMember->name == propertyName; - else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(ast)) + else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(ast)) return toString(objectBinding->qualifiedId) == propertyName; - else if (QmlJS::AST::UiScriptBinding *scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(ast)) + else if (auto scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(ast)) return toString(scriptBinding->qualifiedId) == propertyName; - else if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(ast)) + else if (auto arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(ast)) return toString(arrayBinding->qualifiedId) == propertyName; else return false; diff --git a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h index 7eb8b53fd9..61d5f86241 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h @@ -40,8 +40,8 @@ public: const QString &name); protected: - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: void removeFrom(QmlJS::AST::UiObjectInitializer *ast); diff --git a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp index 06fb1b3087..a7036b25c7 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp @@ -95,7 +95,7 @@ QmlJS::AST::UiArrayBinding *RemoveUIObjectMemberVisitor::containingArray() const return QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parents[parents.size() - 3]); } - return 0; + return nullptr; } // FIXME: duplicate code in the QmlJS::Rewriter class, remove this @@ -104,7 +104,7 @@ void RemoveUIObjectMemberVisitor::extendToLeadingOrTrailingComma(QmlJS::AST::UiA int &start, int &end) const { - QmlJS::AST::UiArrayMemberList *currentMember = 0; + QmlJS::AST::UiArrayMemberList *currentMember = nullptr; for (QmlJS::AST::UiArrayMemberList *it = parentArray->members; it; it = it->next) { if (it->member == ast) { currentMember = it; diff --git a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h index 6fc4d1d0b3..6f92e927ce 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h @@ -39,15 +39,15 @@ public: quint32 objectLocation); protected: - virtual bool preVisit(QmlJS::AST::Node *ast); - virtual void postVisit(QmlJS::AST::Node *); + bool preVisit(QmlJS::AST::Node *ast) override; + void postVisit(QmlJS::AST::Node *) override; - virtual bool visit(QmlJS::AST::UiPublicMember *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); - virtual bool visit(QmlJS::AST::UiSourceElement *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiScriptBinding *ast); - virtual bool visit(QmlJS::AST::UiArrayBinding *ast); + bool visit(QmlJS::AST::UiPublicMember *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; + bool visit(QmlJS::AST::UiSourceElement *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiScriptBinding *ast) override; + bool visit(QmlJS::AST::UiArrayBinding *ast) override; private: bool visitObjectMember(QmlJS::AST::UiObjectMember *ast); diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h index 65f3f666be..75cb024ccd 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h @@ -38,9 +38,9 @@ namespace QmlDesigner { class InternalNode; class InternalProperty; - typedef QSharedPointer<InternalNode> InternalNodePointer; - typedef QSharedPointer<InternalProperty> InternalPropertyPointer; - typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; + using InternalNodePointer = QSharedPointer<InternalNode>; + using InternalPropertyPointer = QSharedPointer<InternalProperty>; + using InternalNodeWeakPointer = QWeakPointer<InternalNode>; } class Model; diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 610d137acc..4eb4f05666 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -47,8 +47,8 @@ QT_END_NAMESPACE namespace QmlDesigner { namespace Internal { class InternalNode; - typedef QSharedPointer<InternalNode> InternalNodePointer; - typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; + using InternalNodePointer = QSharedPointer<InternalNode>; + using InternalNodeWeakPointer = QWeakPointer<InternalNode>; } } @@ -69,13 +69,11 @@ class WidgetInfo { public: class ToolBarWidgetFactoryInterface { public: - ToolBarWidgetFactoryInterface() - {} + ToolBarWidgetFactoryInterface() = default; virtual QList<QToolButton*> createToolBarWidgets() = 0; - virtual ~ToolBarWidgetFactoryInterface() - {} + virtual ~ToolBarWidgetFactoryInterface() = default; }; template <class T> diff --git a/src/plugins/qmldesigner/designercore/include/forwardview.h b/src/plugins/qmldesigner/designercore/include/forwardview.h index d317bec793..8d4406b6d2 100644 --- a/src/plugins/qmldesigner/designercore/include/forwardview.h +++ b/src/plugins/qmldesigner/designercore/include/forwardview.h @@ -40,37 +40,37 @@ template <class ViewType> class ForwardView : public AbstractView { public: - typedef QPointer<ForwardView> Pointer; - typedef typename ViewType::Pointer ViewTypePointer; + using Pointer = QPointer<ForwardView<ViewType> >; + using ViewTypePointer = typename ViewType::Pointer; ForwardView(QObject *parent); - void modelAttached(Model *model); - void modelAboutToBeDetached(Model *model); - - void nodeCreated(const ModelNode &createdNode); - void nodeAboutToBeRemoved(const ModelNode &removedNode); - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange); - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId); - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList); - void propertiesRemoved(const QList<AbstractProperty>& propertyList); - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange); - void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange); - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange); - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion); + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; + + void nodeCreated(const ModelNode &createdNode) override; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; + void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; + void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override; + void propertiesRemoved(const QList<AbstractProperty>& propertyList) override; + void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override; + void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList); + const QList<ModelNode> &lastSelectedNodeList) override; - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl); + void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) override; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports); + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; protected: void appendView(ViewType *view); diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h index 9cca2ceb7e..aed724e50f 100644 --- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h +++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h @@ -71,7 +71,7 @@ public: ItemLibraryEntry(const ItemLibraryEntry &other); ItemLibraryEntry& operator=(const ItemLibraryEntry &other); - typedef QmlDesigner::PropertyContainer Property; + using Property = QmlDesigner::PropertyContainer; QList<Property> properties() const; QHash<QString, QString> hints() const; diff --git a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h index f85ad1e144..4b27e104af 100644 --- a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h +++ b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h @@ -34,7 +34,7 @@ namespace QmlDesigner { class IWidgetPlugin { public: - virtual ~IWidgetPlugin() {} + virtual ~IWidgetPlugin() = default; virtual QString metaInfo() const = 0; virtual QString pluginName() const = 0; diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h index 90d94c324a..cc4e8c1ed0 100644 --- a/src/plugins/qmldesigner/designercore/include/metainfo.h +++ b/src/plugins/qmldesigner/designercore/include/metainfo.h @@ -43,7 +43,7 @@ namespace Internal { class MetaInfoPrivate; class ModelPrivate; class SubComponentManagerPrivate; - typedef QSharedPointer<MetaInfoPrivate> MetaInfoPrivatePointer; + using MetaInfoPrivatePointer = QSharedPointer<MetaInfoPrivate>; } QMLDESIGNERCORE_EXPORT bool operator==(const MetaInfo &first, const MetaInfo &second); diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h index 2f07c2a3d3..efa6731d85 100644 --- a/src/plugins/qmldesigner/designercore/include/model.h +++ b/src/plugins/qmldesigner/designercore/include/model.h @@ -59,7 +59,7 @@ class RewriterView; class NodeInstanceView; class TextModifier; -typedef QList<QPair<PropertyName, QVariant> > PropertyListType; +using PropertyListType = QList<QPair<PropertyName, QVariant> >; class QMLDESIGNERCORE_EXPORT Model : public QObject { diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index 0f07221fab..c48f079204 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -42,9 +42,9 @@ namespace Internal { class InternalNode; class InternalProperty; - typedef QSharedPointer<InternalNode> InternalNodePointer; - typedef QSharedPointer<InternalProperty> InternalPropertyPointer; - typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; + using InternalNodePointer = QSharedPointer<InternalNode>; + using InternalPropertyPointer = QSharedPointer<InternalProperty>; + using InternalNodeWeakPointer = QWeakPointer<InternalNode>; } class NodeMetaInfo; class AbstractProperty; @@ -60,7 +60,7 @@ class ModelNode; QMLDESIGNERCORE_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList); -typedef QList<QPair<PropertyName, QVariant> > PropertyListType; +using PropertyListType = QList<QPair<PropertyName, QVariant> >; class QMLDESIGNERCORE_EXPORT ModelNode { diff --git a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h index fa0460f771..1386b4265e 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h @@ -31,7 +31,7 @@ namespace QmlDesigner { namespace Internal { class InternalNodeAbstractProperty; - typedef QSharedPointer<InternalNodeAbstractProperty> InternalNodeAbstractPropertyPointer; + using InternalNodeAbstractPropertyPointer = QSharedPointer<InternalNodeAbstractProperty>; } class QMLDESIGNERCORE_EXPORT NodeAbstractProperty : public AbstractProperty diff --git a/src/plugins/qmldesigner/designercore/include/nodeanchors.h b/src/plugins/qmldesigner/designercore/include/nodeanchors.h index efa20cc1a3..cb791f76c3 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeanchors.h +++ b/src/plugins/qmldesigner/designercore/include/nodeanchors.h @@ -38,11 +38,11 @@ namespace QmlDesigner { namespace Internal { class InternalNode; - typedef QSharedPointer<InternalNode> InternalNodePointer; - typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; + using InternalNodePointer = QSharedPointer<InternalNode>; + using InternalNodeWeakPointer = QWeakPointer<InternalNode>; class InternalNodeState; - typedef QSharedPointer<InternalNodeState> InternalNodeStatePointer; + using InternalNodeStatePointer = QSharedPointer<InternalNodeState>; class TextToModelMerger; } diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index 12f5430cd6..c0e0b41537 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -75,7 +75,7 @@ class QMLDESIGNERCORE_EXPORT NodeInstanceView : public AbstractView, public Node friend class NodeInstance; public: - typedef QWeakPointer<NodeInstanceView> Pointer; + using Pointer = QWeakPointer<NodeInstanceView>; explicit NodeInstanceView(QObject *parent = nullptr, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus); ~NodeInstanceView() override; diff --git a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h index 94af238bef..dc1967efec 100644 --- a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h @@ -36,7 +36,7 @@ namespace QmlDesigner { namespace Internal { class ModelPrivate; class InternalNodeListProperty; - typedef QSharedPointer<InternalNodeListProperty> InternalNodeListPropertyPointer; + using InternalNodeListPropertyPointer = QSharedPointer<InternalNodeListProperty>; } diff --git a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h index 8362c39d44..0872c547c8 100644 --- a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h +++ b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h @@ -36,11 +36,11 @@ # define QMLDESIGNERCORE_EXPORT Q_DECL_IMPORT #endif namespace QmlDesigner { -typedef QByteArray PropertyName; -typedef QList<PropertyName> PropertyNameList; -typedef QByteArray TypeName; -typedef QList<PropertyName> PropertyTypeList; -typedef QByteArray IdName; +using PropertyName = QByteArray; +using PropertyNameList = QList<PropertyName>; +using TypeName = QByteArray; +using PropertyTypeList = QList<PropertyName>; +using IdName = QByteArray; enum AnchorLineType { AnchorLineInvalid = 0x0, diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h index 150545e7e8..617d0b9b7b 100644 --- a/src/plugins/qmldesigner/designercore/include/textmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h @@ -58,7 +58,7 @@ public: }; public: - TextModifier() {} + TextModifier() = default; ~TextModifier() override = 0; virtual void replace(int offset, int length, const QString& replacement) = 0; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp index 6589ceb875..f857ccf2b3 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp @@ -87,9 +87,7 @@ public: QHash<PropertyName, QPair<PropertyName, qint32> > anchors; }; -NodeInstance::NodeInstance() -{ -} +NodeInstance::NodeInstance() = default; NodeInstance::NodeInstance(ProxyNodeInstanceData *dPointer) : d(dPointer) @@ -98,27 +96,18 @@ NodeInstance::NodeInstance(ProxyNodeInstanceData *dPointer) NodeInstance NodeInstance::create(const ModelNode &node) { - ProxyNodeInstanceData *d = new ProxyNodeInstanceData; + auto d = new ProxyNodeInstanceData; d->modelNode = node; return NodeInstance(d); } -NodeInstance::~NodeInstance() -{ -} +NodeInstance::~NodeInstance() = default; -NodeInstance::NodeInstance(const NodeInstance &other) - : d(other.d) -{ -} +NodeInstance::NodeInstance(const NodeInstance &other) = default; -NodeInstance &NodeInstance::operator=(const NodeInstance &other) -{ - d = other.d; - return *this; -} +NodeInstance &NodeInstance::operator=(const NodeInstance &other) = default; ModelNode NodeInstance::modelNode() const { diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index cadd15c47c..c75c8a6401 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -337,7 +337,7 @@ QString NodeInstanceServerProxy::qrcMappingString() const if (rewriterView) { QString mappingString; - typedef QPair<QString, QString> StringPair; + using StringPair = QPair<QString, QString>; foreach (const StringPair &pair, rewriterView->qrcMapping()) { if (!mappingString.isEmpty()) @@ -406,7 +406,7 @@ void NodeInstanceServerProxy::writeCommand(const QVariant &command) void NodeInstanceServerProxy::processFinished(int exitCode, QProcess::ExitStatus exitStatus) { - QProcess* finishedProcess = qobject_cast<QProcess*>(sender()); + auto finishedProcess = qobject_cast<QProcess*>(sender()); if (finishedProcess) qWarning() << "Process" << (exitStatus == QProcess::CrashExit ? "crashed:" : "finished:") << finishedProcess->arguments() << "exitCode:" << exitCode; else diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 6c3becde43..6829933cfe 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -121,7 +121,7 @@ NodeInstanceView::~NodeInstanceView() { removeAllInstanceNodeRelationships(); delete nodeInstanceServer(); - m_currentKit = 0; + m_currentKit = nullptr; } //\{ diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 91533db5c8..8962310ffb 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -144,7 +144,7 @@ bool PuppetCreator::useOnlyFallbackPuppet() const if (!m_kit || !m_kit->isValid()) qWarning() << "Invalid kit for QML puppet"; return m_designerSettings.value(DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET - ).toBool() || m_kit == 0 || !m_kit->isValid(); + ).toBool() || m_kit == nullptr || !m_kit->isValid(); #else return true; #endif diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index 4183af4b1f..0d6015e97c 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -59,10 +59,7 @@ public: // ItemLibraryEntry // -ItemLibraryEntry::ItemLibraryEntry(const ItemLibraryEntry &other) - : m_data(other.m_data) -{ -} +ItemLibraryEntry::ItemLibraryEntry(const ItemLibraryEntry &other) = default; ItemLibraryEntry& ItemLibraryEntry::operator=(const ItemLibraryEntry &other) { @@ -97,9 +94,7 @@ ItemLibraryEntry::ItemLibraryEntry() : m_data(new Internal::ItemLibraryEntryData m_data->name.clear(); } -ItemLibraryEntry::~ItemLibraryEntry() -{ -} +ItemLibraryEntry::~ItemLibraryEntry() = default; QString ItemLibraryEntry::name() const { diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp index aca9535055..14f1982b72 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp @@ -120,10 +120,7 @@ properties. /*! Constructs a copy of \a metaInfo. */ -MetaInfo::MetaInfo(const MetaInfo &metaInfo) : - m_p(metaInfo.m_p) -{ -} +MetaInfo::MetaInfo(const MetaInfo &metaInfo) = default; /*! Creates a meta information object with just the QML types registered statically. @@ -138,19 +135,13 @@ MetaInfo::MetaInfo() : { } -MetaInfo::~MetaInfo() -{ -} +MetaInfo::~MetaInfo() = default; /*! Assigns \a other to this meta information and returns a reference to this meta information. */ -MetaInfo& MetaInfo::operator=(const MetaInfo &other) -{ - m_p = other.m_p; - return *this; -} +MetaInfo& MetaInfo::operator=(const MetaInfo &other) = default; ItemLibraryInfo *MetaInfo::itemLibraryInfo() const { diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 40c9063a1b..a7f151d6e9 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -77,7 +77,7 @@ namespace Internal { using namespace QmlJS; -typedef QPair<PropertyName, TypeName> PropertyInfo; +using PropertyInfo = QPair<PropertyName, TypeName>; QVector<PropertyInfo> getObjectTypes(const ObjectValue *ov, const ContextPtr &context, bool local = false, int rec = 0); @@ -350,7 +350,7 @@ static inline bool isValueType(const QString &type) const CppComponentValue *findQmlPrototype(const ObjectValue *ov, const ContextPtr &context) { if (!ov) - return 0; + return nullptr; const CppComponentValue * qmlValue = value_cast<CppComponentValue>(ov); if (qmlValue) @@ -517,9 +517,9 @@ QVector<PropertyInfo> getObjectTypes(const ObjectValue *objectValue, const Conte class NodeMetaInfoPrivate { public: - typedef QSharedPointer<NodeMetaInfoPrivate> Pointer; + using Pointer = QSharedPointer<NodeMetaInfoPrivate>; NodeMetaInfoPrivate() = default; - ~NodeMetaInfoPrivate() {} + ~NodeMetaInfoPrivate() = default; bool isValid() const; bool isFileComponent() const; @@ -723,7 +723,7 @@ const CppComponentValue *NodeMetaInfoPrivate::getCppComponentValue() const { const QList<TypeName> nameComponents = m_qualfiedTypeName.split('.'); if (nameComponents.size() < 2) - return 0; + return nullptr; const TypeName &type = nameComponents.constLast(); TypeName module; @@ -784,14 +784,14 @@ ContextPtr NodeMetaInfoPrivate::context() const { if (m_model && m_model->rewriterView() && m_model->rewriterView()->scopeChain()) return m_model->rewriterView()->scopeChain()->context(); - return ContextPtr(0); + return ContextPtr(nullptr); } const Document *NodeMetaInfoPrivate::document() const { if (m_model && m_model->rewriterView()) return m_model->rewriterView()->document(); - return 0; + return nullptr; } void NodeMetaInfoPrivate::setupLocalPropertyInfo(const QVector<PropertyInfo> &localPropertyInfos) @@ -963,7 +963,7 @@ QString NodeMetaInfoPrivate::propertyEnumScope(const PropertyName &propertyName) const CppComponentValue *qmlObjectValue = getNearestCppComponentValue(); if (!qmlObjectValue) return QString(); - const CppComponentValue *definedIn = 0; + const CppComponentValue *definedIn = nullptr; qmlObjectValue->getEnum(QString::fromUtf8(propertyType(propertyName)), &definedIn); if (definedIn) { QString nonCppPackage; @@ -1322,14 +1322,9 @@ NodeMetaInfo::NodeMetaInfo(Model *model, TypeName type, int maj, int min) : m_pr } -NodeMetaInfo::~NodeMetaInfo() -{ -} +NodeMetaInfo::~NodeMetaInfo() = default; -NodeMetaInfo::NodeMetaInfo(const NodeMetaInfo &other) - : m_privateData(other.m_privateData) -{ -} +NodeMetaInfo::NodeMetaInfo(const NodeMetaInfo &other) = default; NodeMetaInfo &NodeMetaInfo::operator=(const NodeMetaInfo &other) { diff --git a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp index 40a9d75776..c6602a3bc7 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp @@ -79,27 +79,11 @@ AbstractProperty::AbstractProperty(const AbstractProperty &property, AbstractVie } -AbstractProperty::~AbstractProperty() -{ -} +AbstractProperty::~AbstractProperty() = default; -AbstractProperty::AbstractProperty(const AbstractProperty &other) - : m_propertyName(other.m_propertyName), - m_internalNode(other.m_internalNode), - m_model(other.m_model), - m_view(other.m_view) -{ -} +AbstractProperty::AbstractProperty(const AbstractProperty &other) = default; -AbstractProperty& AbstractProperty::operator=(const AbstractProperty &other) -{ - m_propertyName = other.m_propertyName; - m_internalNode = other.m_internalNode; - m_model = other.m_model; - m_view = other.m_view; - - return *this; -} +AbstractProperty& AbstractProperty::operator=(const AbstractProperty &other) = default; Internal::InternalNodePointer AbstractProperty::internalNode() const { diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index ab7195a940..9c4b768535 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -68,7 +68,7 @@ AbstractView::~AbstractView() */ void AbstractView::setModel(Model *model) { - Q_ASSERT(model != 0); + Q_ASSERT(model != nullptr); if (model == m_model.data()) return; @@ -525,7 +525,7 @@ NodeInstanceView *AbstractView::nodeInstanceView() const if (model()) return model()->d->nodeInstanceView(); else - return 0; + return nullptr; } RewriterView *AbstractView::rewriterView() const @@ -533,7 +533,7 @@ RewriterView *AbstractView::rewriterView() const if (model()) return model()->d->rewriterView(); else - return 0; + return nullptr; } void AbstractView::resetView() diff --git a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp index 6204d670b5..17babff675 100644 --- a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp @@ -47,7 +47,7 @@ void BaseTextEditModifier::indentLines(int startLine, int endLine) { if (startLine < 0) return; - TextEditor::TextEditorWidget *baseTextEditorWidget = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit()); + auto baseTextEditorWidget = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit()); if (!baseTextEditorWidget) return; @@ -82,7 +82,7 @@ void BaseTextEditModifier::indent(int offset, int length) int BaseTextEditModifier::indentDepth() const { - if (TextEditor::TextEditorWidget *bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) + if (auto bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) return bte->textDocument()->tabSettings().m_indentSize; else return 0; @@ -90,9 +90,8 @@ int BaseTextEditModifier::indentDepth() const bool BaseTextEditModifier::renameId(const QString &oldId, const QString &newId) { - if (TextEditor::TextEditorWidget *bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) { - if (QmlJSEditor::QmlJSEditorDocument *document - = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) { + if (auto bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) { + if (auto document = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) { Utils::ChangeSet changeSet; foreach (const QmlJS::AST::SourceLocation &loc, document->semanticInfo().idLocations.value(oldId)) { @@ -108,7 +107,7 @@ bool BaseTextEditModifier::renameId(const QString &oldId, const QString &newId) static QmlJS::AST::UiObjectDefinition *getObjectDefinition(QList<QmlJS::AST::Node *> path, QmlJS::AST::UiQualifiedId *qualifiedId) { - QmlJS::AST::UiObjectDefinition *object = 0; + QmlJS::AST::UiObjectDefinition *object = nullptr; for (int i = path.size() - 1; i >= 0; --i) { auto node = path.at(i); if (auto objDef = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition *>(node)) { @@ -121,11 +120,11 @@ static QmlJS::AST::UiObjectDefinition *getObjectDefinition(QList<QmlJS::AST::Nod bool BaseTextEditModifier::moveToComponent(int nodeOffset) { - if (TextEditor::TextEditorWidget *bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) { - if (QmlJSEditor::QmlJSEditorDocument *document + if (auto bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) { + if (auto document = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) { - auto *qualifiedId = QmlJS::AST::cast<QmlJS::AST::UiQualifiedId *>(document->semanticInfo().astNodeAt(nodeOffset)); + auto qualifiedId = QmlJS::AST::cast<QmlJS::AST::UiQualifiedId *>(document->semanticInfo().astNodeAt(nodeOffset)); QList<QmlJS::AST::Node *> path = document->semanticInfo().rangePath(nodeOffset); QmlJS::AST::UiObjectDefinition *object = getObjectDefinition(path, qualifiedId); @@ -141,8 +140,8 @@ bool BaseTextEditModifier::moveToComponent(int nodeOffset) QStringList BaseTextEditModifier::autoComplete(QTextDocument *textDocument, int position, bool explicitComplete) { - if (TextEditor::TextEditorWidget *bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) - if (QmlJSEditor::QmlJSEditorDocument *document + if (auto bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) + if (auto document = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) return QmlJSEditor::qmlJSAutoComplete(textDocument, position, diff --git a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp index fe8ebe1729..ebd3c7c709 100644 --- a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp @@ -43,9 +43,7 @@ bool compareBindingProperties(const QmlDesigner::BindingProperty &bindingPropert return true; } -BindingProperty::BindingProperty() -{ -} +BindingProperty::BindingProperty() = default; BindingProperty::BindingProperty(const BindingProperty &property, AbstractView *view) : AbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp index f104842995..1d500b8496 100644 --- a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp @@ -39,9 +39,7 @@ ComponentTextModifier::ComponentTextModifier(TextModifier *originalModifier, int connect(m_originalModifier, &TextModifier::moved, this, &TextModifier::moved); } -ComponentTextModifier::~ComponentTextModifier() -{ -} +ComponentTextModifier::~ComponentTextModifier() = default; void ComponentTextModifier::replace(int offset, int length, const QString& replacement) { diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp index 0ea54ef983..7b9c2c56c4 100644 --- a/src/plugins/qmldesigner/designercore/model/import.cpp +++ b/src/plugins/qmldesigner/designercore/model/import.cpp @@ -29,9 +29,7 @@ namespace QmlDesigner { -Import::Import() -{ -} +Import::Import() = default; Import Import::createLibraryImport(const QString &url, const QString &version, const QString &alias, const QStringList &importPaths) { diff --git a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp index df054b152f..4853c8a626 100644 --- a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp @@ -36,7 +36,7 @@ InternalBindingProperty::InternalBindingProperty(const PropertyName &name, const InternalBindingProperty::Pointer InternalBindingProperty::create(const PropertyName &name, const InternalNodePointer &propertyOwner) { - InternalBindingProperty *newPointer(new InternalBindingProperty(name, propertyOwner)); + auto newPointer(new InternalBindingProperty(name, propertyOwner)); InternalBindingProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h index 5cb82205fa..c1d772b9ac 100644 --- a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h @@ -33,11 +33,11 @@ namespace Internal { class InternalBindingProperty : public InternalProperty { public: - typedef QSharedPointer<InternalBindingProperty> Pointer; + using Pointer = QSharedPointer<InternalBindingProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; + bool isValid() const override; QString expression() const; void setExpression(const QString &expression); @@ -45,7 +45,7 @@ public: void setDynamicExpression(const TypeName &type, const QString &expression); - bool isBindingProperty() const; + bool isBindingProperty() const override; protected: InternalBindingProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); diff --git a/src/plugins/qmldesigner/designercore/model/internalnode.cpp b/src/plugins/qmldesigner/designercore/model/internalnode.cpp index 7e11ab6c3f..1f8b622765 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnode.cpp @@ -61,7 +61,7 @@ InternalNode::InternalNode(const TypeName &typeName,int majorVersion, int minorV InternalNode::Pointer InternalNode::create(const TypeName &type,int majorVersion, int minorVersion, qint32 internalId) { - InternalNode *newPointer(new InternalNode(type, majorVersion, minorVersion, internalId)); + auto newPointer(new InternalNode(type, majorVersion, minorVersion, internalId)); InternalNode::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalnode_p.h b/src/plugins/qmldesigner/designercore/model/internalnode_p.h index 0997c5a4ff..f31039ffc2 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode_p.h +++ b/src/plugins/qmldesigner/designercore/model/internalnode_p.h @@ -45,16 +45,16 @@ namespace Internal { class InternalProperty; class InternalNode; -typedef QSharedPointer<InternalNode> InternalNodePointer; -typedef QSharedPointer<InternalProperty> InternalPropertyPointer; -typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; +using InternalNodePointer = QSharedPointer<InternalNode>; +using InternalPropertyPointer = QSharedPointer<InternalProperty>; +using InternalNodeWeakPointer = QWeakPointer<InternalNode>; class InternalNode { friend class InternalProperty; public: - typedef QSharedPointer<InternalNode> Pointer; - typedef QWeakPointer<InternalNode> WeakPointer; + using Pointer = QSharedPointer<InternalNode>; + using WeakPointer = QWeakPointer<InternalNode>; explicit InternalNode(); diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h index 0ea7d49eff..ee80cc42da 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h @@ -36,10 +36,10 @@ class InternalNodeAbstractProperty : public InternalProperty friend class InternalNode; public: - typedef QSharedPointer<InternalNodeAbstractProperty> Pointer; - typedef QWeakPointer<InternalNodeAbstractProperty> WeakPointer; + using Pointer = QSharedPointer<InternalNodeAbstractProperty>; + using WeakPointer = QWeakPointer<InternalNodeAbstractProperty>; - bool isNodeAbstractProperty() const; + bool isNodeAbstractProperty() const override; virtual QList<InternalNodePointer> allSubNodes() const = 0; virtual QList<InternalNodePointer> directSubNodes() const = 0; @@ -48,7 +48,7 @@ public: virtual int count() const = 0; virtual int indexOf(const InternalNodePointer &node) const = 0; - virtual bool isValid() const; + bool isValid() const override; using InternalProperty::remove; // keep the virtual remove(...) function around diff --git a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp index 5d4103b5d8..51f6b3421b 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp @@ -37,7 +37,7 @@ InternalNodeListProperty::InternalNodeListProperty(const PropertyName &name, con InternalNodeListProperty::Pointer InternalNodeListProperty::create(const PropertyName &name, const InternalNodePointer &propertyOwner) { - InternalNodeListProperty *newPointer(new InternalNodeListProperty(name, propertyOwner)); + auto newPointer(new InternalNodeListProperty(name, propertyOwner)); InternalProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer.toWeakRef()); diff --git a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h index d58e44d08c..b50a144491 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h @@ -36,28 +36,28 @@ namespace Internal { class InternalNodeListProperty : public InternalNodeAbstractProperty { public: - typedef QSharedPointer<InternalNodeListProperty> Pointer; + using Pointer = QSharedPointer<InternalNodeListProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; + bool isValid() const override; - bool isEmpty() const; - int count() const; - int indexOf(const InternalNodePointer &node) const; + bool isEmpty() const override; + int count() const override; + int indexOf(const InternalNodePointer &node) const override; InternalNodePointer at(int index) const; - bool isNodeListProperty() const; + bool isNodeListProperty() const override; - QList<InternalNodePointer> allSubNodes() const; - QList<InternalNodePointer> directSubNodes() const; + QList<InternalNodePointer> allSubNodes() const override; + QList<InternalNodePointer> directSubNodes() const override; const QList<InternalNodePointer> &nodeList() const; void slide(int from, int to); protected: InternalNodeListProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); - void add(const InternalNodePointer &node); - void remove(const InternalNodePointer &node); + void add(const InternalNodePointer &node) override; + void remove(const InternalNodePointer &node) override; private: QList<InternalNodePointer> m_nodeList; diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp index c2daf83680..7965561344 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp @@ -36,7 +36,7 @@ InternalNodeProperty::InternalNodeProperty(const PropertyName &name, const Inter InternalNodeProperty::Pointer InternalNodeProperty::create(const PropertyName &name, const InternalNode::Pointer &propertyOwner) { - InternalNodeProperty *newPointer = new InternalNodeProperty(name, propertyOwner); + auto newPointer = new InternalNodeProperty(name, propertyOwner); InternalNodeProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h index 7da520b011..a7bfe58300 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h @@ -33,26 +33,26 @@ namespace Internal { class InternalNodeProperty : public InternalNodeAbstractProperty { public: - typedef QSharedPointer<InternalNodeProperty> Pointer; + using Pointer = QSharedPointer<InternalNodeProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; - bool isEmpty() const; - int count() const; - int indexOf(const InternalNodePointer &node) const; - bool isNodeProperty() const; + bool isValid() const override; + bool isEmpty() const override; + int count() const override; + int indexOf(const InternalNodePointer &node) const override; + bool isNodeProperty() const override; - QList<InternalNodePointer> allSubNodes() const; - QList<InternalNodePointer> directSubNodes() const; + QList<InternalNodePointer> allSubNodes() const override; + QList<InternalNodePointer> directSubNodes() const override; InternalNodePointer node() const; protected: InternalNodeProperty(const PropertyName &name, const InternalNodePointer &node); - void add(const InternalNodePointer &node); - void remove(const InternalNodePointer &node); + void add(const InternalNodePointer &node) override; + void remove(const InternalNodePointer &node) override; private: InternalNodePointer m_node; diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalproperty.cpp index e439435fde..df2e2a2275 100644 --- a/src/plugins/qmldesigner/designercore/model/internalproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalproperty.cpp @@ -36,13 +36,9 @@ namespace QmlDesigner { namespace Internal { // Creates invalid InternalProperty -InternalProperty::InternalProperty() -{ -} +InternalProperty::InternalProperty() = default; -InternalProperty::~InternalProperty() -{ -} +InternalProperty::~InternalProperty() = default; InternalProperty::InternalProperty(const PropertyName &name, const InternalNode::Pointer &propertyOwner) : m_name(name), diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.h b/src/plugins/qmldesigner/designercore/model/internalproperty.h index df6896bf9a..a8eb5b940c 100644 --- a/src/plugins/qmldesigner/designercore/model/internalproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalproperty.h @@ -42,15 +42,14 @@ class InternalNodeProperty; class InternalNodeAbstractProperty; class InternalNode; -typedef QSharedPointer<InternalNode> InternalNodePointer; -typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; +using InternalNodePointer = QSharedPointer<InternalNode>; +using InternalNodeWeakPointer = QWeakPointer<InternalNode>; class QMLDESIGNERCORE_EXPORT InternalProperty { public: - typedef QSharedPointer<InternalProperty> Pointer; - typedef QWeakPointer<InternalProperty> WeakPointer; - + using Pointer = QSharedPointer<InternalProperty>; + using WeakPointer = QWeakPointer<InternalProperty>; InternalProperty(); virtual ~InternalProperty(); diff --git a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.cpp index c4c7e91131..08ce26a4c8 100644 --- a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.cpp @@ -36,7 +36,7 @@ InternalSignalHandlerProperty::InternalSignalHandlerProperty(const PropertyName InternalSignalHandlerProperty::Pointer InternalSignalHandlerProperty::create(const PropertyName &name, const InternalNodePointer &propertyOwner) { - InternalSignalHandlerProperty *newPointer(new InternalSignalHandlerProperty(name, propertyOwner)); + auto newPointer(new InternalSignalHandlerProperty(name, propertyOwner)); InternalSignalHandlerProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h index c0875f7e5b..9ecf424a54 100644 --- a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h @@ -33,16 +33,16 @@ namespace Internal { class InternalSignalHandlerProperty : public InternalProperty { public: - typedef QSharedPointer<InternalSignalHandlerProperty> Pointer; + using Pointer = QSharedPointer<InternalSignalHandlerProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; + bool isValid() const override; QString source() const; void setSource(const QString &source); - bool isSignalHandlerProperty() const; + bool isSignalHandlerProperty() const override; protected: InternalSignalHandlerProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); diff --git a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp index ac02030b50..3354a6312d 100644 --- a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp @@ -35,7 +35,7 @@ InternalVariantProperty::InternalVariantProperty(const PropertyName &name, const InternalVariantProperty::Pointer InternalVariantProperty::create(const PropertyName &name, const InternalNodePointer &propertyOwner) { - InternalVariantProperty *newPointer(new InternalVariantProperty(name, propertyOwner)); + auto newPointer(new InternalVariantProperty(name, propertyOwner)); InternalVariantProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h index 6edfe7a492..481770d15e 100644 --- a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h @@ -33,18 +33,18 @@ namespace Internal { class InternalVariantProperty : public InternalProperty { public: - typedef QSharedPointer<InternalVariantProperty> Pointer; + using Pointer = QSharedPointer<InternalVariantProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; + bool isValid() const override; QVariant value() const; void setValue(const QVariant &value); void setDynamicValue(const TypeName &type, const QVariant &value); - bool isVariantProperty() const; + bool isVariantProperty() const override; protected: InternalVariantProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 5f5798b01e..f8cb347ba6 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -113,7 +113,7 @@ void ModelPrivate::detachAllViews() Model *ModelPrivate::create(const TypeName &type, int major, int minor, Model *metaInfoPropxyModel) { - Model *model = new Model; + auto model = new Model; model->d->m_metaInfoProxyModel = metaInfoPropxyModel; model->d->rootNode()->setType(type); @@ -229,7 +229,7 @@ InternalNode::Pointer ModelPrivate::createNode(const TypeName &typeName, InternalNode::Pointer newInternalNodePointer = InternalNode::create(typeName, majorVersion, minorVersion, internalId); newInternalNodePointer->setNodeSourceType(nodeSourceType); - typedef QPair<PropertyName, QVariant> PropertyPair; + using PropertyPair = QPair<PropertyName, QVariant>; foreach (const PropertyPair &propertyPair, propertyList) { newInternalNodePointer->addVariantProperty(propertyPair.first); @@ -368,7 +368,7 @@ void ModelPrivate::notifyAuxiliaryDataChanged(const InternalNodePointer &interna } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode node(internalNode, model(), view.data()); view->auxiliaryDataChanged(node, name, data); @@ -399,7 +399,7 @@ void ModelPrivate::notifyNodeSourceChanged(const InternalNodePointer &internalNo } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode node(internalNode, model(), view.data()); view->nodeSourceChanged(node, newNodeSource); @@ -431,7 +431,7 @@ void ModelPrivate::notifyRootNodeTypeChanged(const QString &type, int majorVersi nodeInstanceView()->rootNodeTypeChanged(type, majorVersion, minorVersion); foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->rootNodeTypeChanged(type, majorVersion, minorVersion); } @@ -444,9 +444,9 @@ void ModelPrivate::notifyInstancePropertyChange(const QList<QPair<ModelNode, Pro { // no need to notify the rewriter or the instance view - typedef QPair<ModelNode, PropertyName> ModelNodePropertyPair; + using ModelNodePropertyPair = QPair<ModelNode, PropertyName>; foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); QList<QPair<ModelNode, PropertyName> > adaptedPropertyList; foreach (const ModelNodePropertyPair &propertyPair, propertyPairList) { @@ -464,7 +464,7 @@ void ModelPrivate::notifyInstanceErrorChange(const QVector<qint32> &instanceIds) QVector<ModelNode> errorNodeList; foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); foreach (qint32 instanceId, instanceIds) errorNodeList.append(ModelNode(model()->d->nodeForInternalId(instanceId), model(), view)); view->instanceErrorChanged(errorNodeList); @@ -487,7 +487,7 @@ void ModelPrivate::notifyInstancesCompleted(const QVector<ModelNode> &nodeVector } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesCompleted(toModelNodeVector(internalVector, view.data())); } @@ -525,7 +525,7 @@ void ModelPrivate::notifyInstancesInformationsChange(const QMultiHash<ModelNode, } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instanceInformationsChanged(convertModelNodeInformationHash(informationChangeHash, view.data())); } @@ -552,7 +552,7 @@ void ModelPrivate::notifyInstancesRenderImageChanged(const QVector<ModelNode> &n } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesRenderImageChanged(toModelNodeVector(internalVector, view.data())); } @@ -579,7 +579,7 @@ void ModelPrivate::notifyInstancesPreviewImageChanged(const QVector<ModelNode> & } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesPreviewImageChanged(toModelNodeVector(internalVector, view.data())); } @@ -606,7 +606,7 @@ void ModelPrivate::notifyInstancesChildrenChanged(const QVector<ModelNode> &node } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesChildrenChanged(toModelNodeVector(internalVector, view.data())); } @@ -633,7 +633,7 @@ void ModelPrivate::notifyCurrentStateChanged(const ModelNode &node) } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->currentStateChanged(ModelNode(node.internalNode(), model(), view.data())); } @@ -660,7 +660,7 @@ void ModelPrivate::notifyCurrentTimelineChanged(const ModelNode &node) } for (const QPointer<AbstractView> &view : m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->currentTimelineChanged(ModelNode(node.internalNode(), model(), view.data())); } @@ -685,7 +685,7 @@ void ModelPrivate::notifyRewriterBeginTransaction() } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->rewriterBeginTransaction(); } @@ -710,7 +710,7 @@ void ModelPrivate::notifyRewriterEndTransaction() } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->rewriterEndTransaction(); } @@ -738,7 +738,7 @@ void ModelPrivate::notifyInstanceToken(const QString &token, int number, const Q } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesToken(token, number, toModelNodeVector(internalVector, view.data())); } @@ -765,7 +765,7 @@ void ModelPrivate::notifyCustomNotification(const AbstractView *senderView, cons } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->customNotification(senderView, identifier, toModelNodeList(internalList, view.data()), data); } @@ -809,7 +809,7 @@ void ModelPrivate::notifyPropertiesRemoved(const QList<PropertyPair> &propertyPa foreach (const QPointer<AbstractView> &view, m_viewList) { QList<AbstractProperty> propertyList; - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); foreach (const PropertyPair &propertyPair, propertyPairList) { AbstractProperty newProperty(propertyPair.second, propertyPair.first, model(), view.data()); propertyList.append(newProperty); @@ -844,7 +844,7 @@ void ModelPrivate::notifyPropertiesAboutToBeRemoved(const QList<InternalProperty foreach (const QPointer<AbstractView> &view, m_viewList) { QList<AbstractProperty> propertyList; - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); foreach (const InternalProperty::Pointer &property, internalPropertyList) { AbstractProperty newProperty(property->name(), property->propertyOwner(), model(), view.data()); propertyList.append(newProperty); @@ -932,7 +932,7 @@ void ModelPrivate::notifyNodeCreated(const InternalNode::Pointer &newInternalNod } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode createdNode(newInternalNodePointer, model(), view.data()); view->nodeCreated(createdNode); } @@ -957,7 +957,7 @@ void ModelPrivate::notifyNodeAboutToBeRemoved(const InternalNode::Pointer &inter } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode modelNode(internalNodePointer, model(), view.data()); view->nodeAboutToBeRemoved(modelNode); } @@ -997,7 +997,7 @@ void ModelPrivate::notifyNodeRemoved(const InternalNodePointer &internalNodePoin } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode modelNode(internalNodePointer, model(), view.data()); NodeAbstractProperty parentProperty(parentPropertyName, parentNodePointer, model(), view.data()); view->nodeRemoved(modelNode, parentProperty, propertyChange); @@ -1024,7 +1024,7 @@ void ModelPrivate::notifyNodeTypeChanged(const InternalNodePointer &internalNode } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode modelNode(internalNodePointer, model(), view.data()); view->nodeTypeChanged(modelNode, type, majorVersion, minorVersion); } @@ -1055,7 +1055,7 @@ void ModelPrivate::notifyNodeIdChanged(const InternalNode::Pointer& internalNode } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode modelNode(internalNodePointer, model(), view.data()); view->nodeIdChanged(modelNode, newId, oldId); } @@ -1089,7 +1089,7 @@ void ModelPrivate::notifyBindingPropertiesChanged(const QList<InternalBindingPro } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); QList<BindingProperty> propertyList; foreach (const InternalBindingPropertyPointer &bindingProperty, internalPropertyList) { propertyList.append(BindingProperty(bindingProperty->name(), bindingProperty->propertyOwner(), model(), view.data())); @@ -1130,7 +1130,7 @@ void ModelPrivate::notifySignalHandlerPropertiesChanged(const QVector<InternalSi } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); QVector<SignalHandlerProperty> propertyList; foreach (const InternalSignalHandlerPropertyPointer &signalHandlerProperty, internalPropertyList) { propertyList.append(SignalHandlerProperty(signalHandlerProperty->name(), signalHandlerProperty->propertyOwner(), model(), view.data())); @@ -1172,7 +1172,7 @@ void ModelPrivate::notifyScriptFunctionsChanged(const InternalNodePointer &inter } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode node(internalNodePointer, model(), view.data()); view->scriptFunctionsChanged(node, scriptFunctionList); @@ -1210,7 +1210,7 @@ void ModelPrivate::notifyVariantPropertiesChanged(const InternalNodePointer &int foreach (const QPointer<AbstractView> &view, m_viewList) { QList<VariantProperty> propertyList; - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); foreach (const PropertyName &propertyName, propertyNameList) { VariantProperty property(propertyName, internalNodePointer, model(), view.data()); propertyList.append(property); @@ -1470,7 +1470,7 @@ void ModelPrivate::changeSelectedNodes(const QList<InternalNode::Pointer> &newSe const QList<InternalNode::Pointer> &oldSelectedNodeList) { foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->selectedNodesChanged(toModelNodeList(newSelectedNodeList, view.data()), toModelNodeList(oldSelectedNodeList, view.data())); } } @@ -2094,7 +2094,7 @@ The view is informed that it has been registered within the model by a call to A void Model::attachView(AbstractView *view) { // Internal::WriteLocker locker(d); - RewriterView *castedRewriterView = qobject_cast<RewriterView*>(view); + auto castedRewriterView = qobject_cast<RewriterView*>(view); if (castedRewriterView) { if (rewriterView() == castedRewriterView) return; @@ -2103,7 +2103,7 @@ void Model::attachView(AbstractView *view) return; } - NodeInstanceView *nodeInstanceView = qobject_cast<NodeInstanceView*>(view); + auto nodeInstanceView = qobject_cast<NodeInstanceView*>(view); if (nodeInstanceView) return; @@ -2123,11 +2123,11 @@ void Model::detachView(AbstractView *view, ViewNotification emitDetachNotify) // Internal::WriteLocker locker(d); bool emitNotify = (emitDetachNotify == NotifyView); - RewriterView *rewriterView = qobject_cast<RewriterView*>(view); + auto rewriterView = qobject_cast<RewriterView*>(view); if (rewriterView) return; - NodeInstanceView *nodeInstanceView = qobject_cast<NodeInstanceView*>(view); + auto nodeInstanceView = qobject_cast<NodeInstanceView*>(view); if (nodeInstanceView) return; diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h index 08c6507630..dd29d25e51 100644 --- a/src/plugins/qmldesigner/designercore/model/model_p.h +++ b/src/plugins/qmldesigner/designercore/model/model_p.h @@ -56,15 +56,14 @@ class InternalVariantProperty; class InternalNodeAbstractProperty; class InternalNodeListProperty; -typedef QSharedPointer<InternalNode> InternalNodePointer; -typedef QSharedPointer<InternalProperty> InternalPropertyPointer; -typedef QSharedPointer<InternalBindingProperty> InternalBindingPropertyPointer; -typedef QSharedPointer<InternalSignalHandlerProperty> InternalSignalHandlerPropertyPointer; -typedef QSharedPointer<InternalVariantProperty> InternalVariantPropertyPointer; -typedef QSharedPointer<InternalNodeAbstractProperty> InternalNodeAbstractPropertyPointer; -typedef QSharedPointer<InternalNodeListProperty> InternalNodeListPropertyPointer; -typedef QPair<InternalNodePointer, PropertyName> PropertyPair; - +using InternalNodePointer = QSharedPointer<InternalNode>; +using InternalPropertyPointer = QSharedPointer<InternalProperty>; +using InternalBindingPropertyPointer = QSharedPointer<InternalBindingProperty>; +using InternalSignalHandlerPropertyPointer = QSharedPointer<InternalSignalHandlerProperty>; +using InternalVariantPropertyPointer = QSharedPointer<InternalVariantProperty>; +using InternalNodeAbstractPropertyPointer = QSharedPointer<InternalNodeAbstractProperty>; +using InternalNodeListPropertyPointer = QSharedPointer<InternalNodeListProperty>; +using PropertyPair = QPair<InternalNodePointer, PropertyName>; class ModelPrivate; @@ -88,7 +87,7 @@ class ModelPrivate : public QObject { public: ModelPrivate(Model *model); - ~ModelPrivate(); + ~ModelPrivate() override; static Model *create(const TypeName &type, int major, int minor, Model *metaInfoPropxyModel); diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 7a80390d85..e6610102b7 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -103,27 +103,13 @@ ModelNode::ModelNode(): } -ModelNode::ModelNode(const ModelNode &other): - m_internalNode(other.m_internalNode), - m_model(other.m_model), - m_view(other.m_view) -{ -} +ModelNode::ModelNode(const ModelNode &other) = default; -ModelNode& ModelNode::operator=(const ModelNode &other) -{ - this->m_model = other.m_model; - this->m_internalNode = other.m_internalNode; - this->m_view = other.m_view; - - return *this; -} +ModelNode& ModelNode::operator=(const ModelNode &other) = default; /*! \brief does nothing */ -ModelNode::~ModelNode() -{ -} +ModelNode::~ModelNode() = default; /*! \brief returns the name of node which is a short cut to a property like objectName \return name of the node diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h index 582a78542f..98dd7c7a90 100644 --- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h +++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h @@ -36,7 +36,7 @@ namespace Internal { class ModelToTextMerger { - typedef AbstractView::PropertyChangeFlags PropertyChangeFlags; + using PropertyChangeFlags = AbstractView::PropertyChangeFlags; public: ModelToTextMerger(RewriterView *reWriterView); diff --git a/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp index 27b5a5c746..b9c1fb7075 100644 --- a/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp @@ -35,9 +35,7 @@ namespace QmlDesigner { -NodeAbstractProperty::NodeAbstractProperty() -{ -} +NodeAbstractProperty::NodeAbstractProperty() = default; NodeAbstractProperty::NodeAbstractProperty(const NodeAbstractProperty &property, AbstractView *view) : AbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp index d4735160c5..84864e5e51 100644 --- a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp @@ -36,8 +36,7 @@ namespace QmlDesigner { -NodeListProperty::NodeListProperty() -{} +NodeListProperty::NodeListProperty() = default; NodeListProperty::NodeListProperty(const NodeListProperty &property, AbstractView *view) : NodeAbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp index 2d262c2ab6..d33af251d1 100644 --- a/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp @@ -33,9 +33,7 @@ namespace QmlDesigner { -NodeProperty::NodeProperty() -{ -} +NodeProperty::NodeProperty() = default; NodeProperty::NodeProperty(const PropertyName &propertyName, const Internal::InternalNodePointer &internalNode, Model* model, AbstractView *view) : NodeAbstractProperty(propertyName, internalNode, model, view) diff --git a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp index f6aa4caf1c..f87dc73a2c 100644 --- a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp @@ -36,7 +36,7 @@ using namespace Utils; using namespace QmlDesigner; PlainTextEditModifier::PlainTextEditModifier(QPlainTextEdit *textEdit): - m_changeSet(0), + m_changeSet(nullptr), m_textEdit(textEdit), m_changeSignalsEnabled(true), m_pendingChangeSignal(false), @@ -48,9 +48,7 @@ PlainTextEditModifier::PlainTextEditModifier(QPlainTextEdit *textEdit): this, &PlainTextEditModifier::textEditChanged); } -PlainTextEditModifier::~PlainTextEditModifier() -{ -} +PlainTextEditModifier::~PlainTextEditModifier() = default; void PlainTextEditModifier::replace(int offset, int length, const QString &replacement) { @@ -135,7 +133,7 @@ void PlainTextEditModifier::commitGroup() if (m_changeSet) { runRewriting(m_changeSet); delete m_changeSet; - m_changeSet = 0; + m_changeSet = nullptr; } textCursor().endEditBlock(); diff --git a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp index e2b80bae0f..ae62b4d0e6 100644 --- a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp @@ -35,9 +35,7 @@ using namespace QmlDesigner::Internal; // Creates invalid PropertyContainer -PropertyContainer::PropertyContainer() -{ -} +PropertyContainer::PropertyContainer() = default; PropertyContainer::PropertyContainer(const PropertyName &name, const QString &type, const QVariant &value) : m_name(name), m_type(type), m_value(value) diff --git a/src/plugins/qmldesigner/designercore/model/propertynode.cpp b/src/plugins/qmldesigner/designercore/model/propertynode.cpp index 5d1f502c24..d616c0ac70 100644 --- a/src/plugins/qmldesigner/designercore/model/propertynode.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertynode.cpp @@ -27,8 +27,6 @@ namespace QmlDesigner { -PropertyNode::PropertyNode() -{ -} +PropertyNode::PropertyNode() = default; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index f05826945c..0805a437ef 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -69,7 +69,7 @@ static QmlItemNode createQmlItemNodeFromSource(AbstractView *view, const QString textEdit.setPlainText(source); NotIndentingTextEditModifier modifier(&textEdit); - QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, 0)); + QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, nullptr)); rewriterView->setCheckSemanticErrors(false); rewriterView->setTextModifier(&modifier); inputModel->setRewriterView(rewriterView.data()); @@ -113,7 +113,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary int minorVersion = metaInfo.minorVersion(); int majorVersion = metaInfo.majorVersion(); - typedef QPair<PropertyName, QString> PropertyBindingEntry; + using PropertyBindingEntry = QPair<PropertyName, QString>; QList<PropertyBindingEntry> propertyBindingList; if (itemLibraryEntry.qmlSource().isEmpty()) { QList<QPair<PropertyName, QVariant> > propertyPairList; diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp index c63e56a22d..5c02c94676 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp @@ -36,7 +36,7 @@ AbstractView *QmlModelNodeFacade::view() const if (modelNode().isValid()) return modelNode().view(); else - return 0; + return nullptr; } NodeInstanceView *QmlModelNodeFacade::nodeInstanceView(const ModelNode &modelNode) @@ -53,8 +53,7 @@ NodeInstanceView *QmlModelNodeFacade::nodeInstanceView() const QmlModelNodeFacade::QmlModelNodeFacade(const ModelNode &modelNode) : m_modelNode(modelNode) {} -QmlModelNodeFacade::~QmlModelNodeFacade() -{} +QmlModelNodeFacade::~QmlModelNodeFacade() = default; QmlModelNodeFacade::operator ModelNode() const { diff --git a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp b/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp index 462604e82d..14f18327fe 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp @@ -40,10 +40,7 @@ namespace QmlDesigner { -QmlTimeline::QmlTimeline() -{ - -} +QmlTimeline::QmlTimeline() = default; QmlTimeline::QmlTimeline(const ModelNode &modelNode) : QmlModelNodeFacade(modelNode) { diff --git a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp b/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp index 86f3815014..9e0b755807 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp @@ -38,10 +38,7 @@ namespace QmlDesigner { -QmlTimelineKeyframeGroup::QmlTimelineKeyframeGroup() -{ - -} +QmlTimelineKeyframeGroup::QmlTimelineKeyframeGroup() = default; QmlTimelineKeyframeGroup::QmlTimelineKeyframeGroup(const ModelNode &modelNode) : QmlModelNodeFacade(modelNode) { diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.h b/src/plugins/qmldesigner/designercore/model/rewriteaction.h index 4c461e8aea..a4a6a82adc 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteaction.h +++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.h @@ -50,25 +50,24 @@ public: virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) = 0; virtual QString info() const = 0; - virtual AddImportRewriteAction *asAddImportRewriteAction() { return 0; } - virtual AddPropertyRewriteAction *asAddPropertyRewriteAction() { return 0; } - virtual ChangeIdRewriteAction *asChangeIdRewriteAction() { return 0; } - virtual ChangePropertyRewriteAction *asChangePropertyRewriteAction() { return 0; } - virtual ChangeTypeRewriteAction *asChangeTypeRewriteAction() { return 0; } - virtual RemoveImportRewriteAction * asRemoveImportRewriteAction() { return 0; } - virtual RemoveNodeRewriteAction *asRemoveNodeRewriteAction() { return 0; } - virtual RemovePropertyRewriteAction *asRemovePropertyRewriteAction() { return 0; } - virtual ReparentNodeRewriteAction *asReparentNodeRewriteAction() { return 0; } - virtual MoveNodeRewriteAction *asMoveNodeRewriteAction() { return 0; } - virtual ~RewriteAction() {} + virtual AddImportRewriteAction *asAddImportRewriteAction() { return nullptr; } + virtual AddPropertyRewriteAction *asAddPropertyRewriteAction() { return nullptr; } + virtual ChangeIdRewriteAction *asChangeIdRewriteAction() { return nullptr; } + virtual ChangePropertyRewriteAction *asChangePropertyRewriteAction() { return nullptr; } + virtual ChangeTypeRewriteAction *asChangeTypeRewriteAction() { return nullptr; } + virtual RemoveImportRewriteAction *asRemoveImportRewriteAction() { return nullptr; } + virtual RemoveNodeRewriteAction *asRemoveNodeRewriteAction() { return nullptr; } + virtual RemovePropertyRewriteAction *asRemovePropertyRewriteAction() { return nullptr; } + virtual ReparentNodeRewriteAction *asReparentNodeRewriteAction() { return nullptr; } + virtual MoveNodeRewriteAction *asMoveNodeRewriteAction() { return nullptr; } + virtual ~RewriteAction() = default; protected: - RewriteAction() - {} + RewriteAction() = default; -private: - RewriteAction(const RewriteAction &); - RewriteAction &operator=(const RewriteAction&); +public: + RewriteAction(const RewriteAction&) = delete; + RewriteAction &operator=(const RewriteAction&) = delete; }; class AddPropertyRewriteAction: public RewriteAction @@ -79,10 +78,10 @@ public: m_sheduledInHierarchy(property.isValid() && property.parentModelNode().isInHierarchy()) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual AddPropertyRewriteAction *asAddPropertyRewriteAction() { return this; } + AddPropertyRewriteAction *asAddPropertyRewriteAction() override { return this; } AbstractProperty property() const { return m_property; } @@ -111,10 +110,10 @@ public: m_node(node), m_oldId(oldId), m_newId(newId) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual ChangeIdRewriteAction *asChangeIdRewriteAction() { return this; } + ChangeIdRewriteAction *asChangeIdRewriteAction() override { return this; } ModelNode node() const { return m_node; } @@ -133,10 +132,10 @@ public: m_sheduledInHierarchy(property.isValid() && property.parentModelNode().isInHierarchy()) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual ChangePropertyRewriteAction *asChangePropertyRewriteAction() { return this; } + ChangePropertyRewriteAction *asChangePropertyRewriteAction() override { return this; } AbstractProperty property() const { return m_property; } @@ -165,10 +164,10 @@ public: m_node(node) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual ChangeTypeRewriteAction *asChangeTypeRewriteAction() { return this; } + ChangeTypeRewriteAction *asChangeTypeRewriteAction() override { return this; } ModelNode node() const { return m_node; } @@ -184,10 +183,10 @@ public: m_node(node) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual RemoveNodeRewriteAction *asRemoveNodeRewriteAction() { return this; } + RemoveNodeRewriteAction *asRemoveNodeRewriteAction() override { return this; } ModelNode node() const { return m_node; } @@ -203,10 +202,10 @@ public: m_property(property) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual RemovePropertyRewriteAction *asRemovePropertyRewriteAction() { return this; } + RemovePropertyRewriteAction *asRemovePropertyRewriteAction() override { return this; } AbstractProperty property() const { return m_property; } @@ -222,10 +221,10 @@ public: m_node(node), m_oldParentProperty(oldParentProperty), m_targetProperty(targetProperty), m_propertyType(propertyType) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual ReparentNodeRewriteAction *asReparentNodeRewriteAction() { return this; } + ReparentNodeRewriteAction *asReparentNodeRewriteAction() override { return this; } ModelNode reparentedNode() const { return m_node; } @@ -256,10 +255,10 @@ public: m_movingNode(movingNode), m_newTrailingNode(newTrailingNode) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual MoveNodeRewriteAction *asMoveNodeRewriteAction() { return this; } + MoveNodeRewriteAction *asMoveNodeRewriteAction() override { return this; } private: ModelNode m_movingNode; @@ -273,10 +272,10 @@ public: m_import(import) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual AddImportRewriteAction *asAddImportRewriteAction() { return this; } + AddImportRewriteAction *asAddImportRewriteAction() override { return this; } Import import() const { return m_import; } @@ -291,10 +290,10 @@ public: m_import(import) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual RemoveImportRewriteAction *asRemoveImportRewriteAction() { return this; } + RemoveImportRewriteAction *asRemoveImportRewriteAction() override { return this; } Import import() const { return m_import; } diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp index fef81225f4..6dac375ff7 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp @@ -317,7 +317,7 @@ void RewriteActionCompressor::compressAddEditActions(QList<RewriteAction *> &act QmlTextGenerator gen(m_propertyOrder); foreach (RewriteAction *action, dirtyActions) { - RewriteAction *newAction = 0; + RewriteAction *newAction = nullptr; if (AddPropertyRewriteAction *addAction = action->asAddPropertyRewriteAction()) { newAction = new AddPropertyRewriteAction(addAction->property(), gen(addAction->containedModelNode()), @@ -364,7 +364,7 @@ void RewriteActionCompressor::compressAddReparentActions(QList<RewriteAction *> RewriteAction *previousAction = addedNodes[reparentAction->reparentedNode()]; actionsToRemove.append(previousAction); - RewriteAction *replacementAction = 0; + RewriteAction *replacementAction = nullptr; if (AddPropertyRewriteAction *addAction = previousAction->asAddPropertyRewriteAction()) { replacementAction = new AddPropertyRewriteAction(reparentAction->targetProperty(), addAction->valueText(), diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index ab4dba68df..4ccc6a4ef1 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -70,9 +70,7 @@ RewriterView::RewriterView(DifferenceHandling differenceHandling, QObject *paren connect(&m_amendTimer, &QTimer::timeout, this, &RewriterView::amendQmlText); } -RewriterView::~RewriterView() -{ -} +RewriterView::~RewriterView() = default; Internal::ModelToTextMerger *RewriterView::modelToTextMerger() const { diff --git a/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp b/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp index 3ad9280e7a..e1701a0b71 100644 --- a/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp @@ -33,9 +33,7 @@ #include "model_p.h" namespace QmlDesigner { -SignalHandlerProperty::SignalHandlerProperty() -{ -} +SignalHandlerProperty::SignalHandlerProperty() = default; SignalHandlerProperty::SignalHandlerProperty(const SignalHandlerProperty &property, AbstractView *view) : AbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/textmodifier.cpp b/src/plugins/qmldesigner/designercore/model/textmodifier.cpp index 9016619f6d..8653f5efd9 100644 --- a/src/plugins/qmldesigner/designercore/model/textmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/textmodifier.cpp @@ -31,9 +31,7 @@ using namespace QmlDesigner; -TextModifier::~TextModifier() -{ -} +TextModifier::~TextModifier() = default; int TextModifier::getLineInDocument(QTextDocument *document, int offset) { diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 9066a65d7e..4e6a8ea409 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -197,9 +197,9 @@ static bool isLiteralValue(AST::ExpressionNode *expr) return true; else if (AST::cast<AST::StringLiteral*>(expr)) return true; - else if (AST::UnaryPlusExpression *plusExpr = AST::cast<AST::UnaryPlusExpression*>(expr)) + else if (auto plusExpr = AST::cast<AST::UnaryPlusExpression*>(expr)) return isLiteralValue(plusExpr->expression); - else if (AST::UnaryMinusExpression *minusExpr = AST::cast<AST::UnaryMinusExpression*>(expr)) + else if (auto minusExpr = AST::cast<AST::UnaryMinusExpression*>(expr)) return isLiteralValue(minusExpr->expression); else if (AST::cast<AST::TrueLiteral*>(expr)) return true; @@ -211,7 +211,7 @@ static bool isLiteralValue(AST::ExpressionNode *expr) static bool isLiteralValue(AST::Statement *stmt) { - AST::ExpressionStatement *exprStmt = AST::cast<AST::ExpressionStatement *>(stmt); + auto exprStmt = AST::cast<AST::ExpressionStatement *>(stmt); if (exprStmt) return isLiteralValue(exprStmt->expression); else @@ -368,8 +368,7 @@ public: { } - ~ReadingContext() - {} + ~ReadingContext() = default; Document::Ptr doc() const { return m_doc; } @@ -436,7 +435,8 @@ public: /// When something is changed here, also change Check::checkScopeObjectMember in /// qmljscheck.cpp /// ### Maybe put this into the context as a helper function. - bool lookupProperty(const QString &prefix, const AST::UiQualifiedId *id, const Value **property = 0, const ObjectValue **parentObject = 0, QString *name = 0) + bool lookupProperty(const QString &prefix, const AST::UiQualifiedId *id, const Value **property = nullptr, + const ObjectValue **parentObject = nullptr, QString *name = nullptr) { QList<const ObjectValue *> scopeObjects = m_scopeChain.qmlScopeObjects(); if (scopeObjects.isEmpty()) @@ -472,8 +472,8 @@ public: return false; // global lookup for first part of id - const ObjectValue *objectValue = 0; - const Value *value = 0; + const ObjectValue *objectValue = nullptr; + const Value *value = nullptr; for (int i = scopeObjects.size() - 1; i >= 0; --i) { objectValue = scopeObjects[i]; value = objectValue->lookupMember(propertyName, m_context); @@ -560,8 +560,8 @@ public: { const bool hasQuotes = astValue.trimmed().left(1) == QStringLiteral("\"") && astValue.trimmed().right(1) == QStringLiteral("\""); const QString cleanedValue = fixEscapedUnicodeChar(deEscape(stripQuotes(astValue.trimmed()))); - const Value *property = 0; - const ObjectValue *containingObject = 0; + const Value *property = nullptr; + const ObjectValue *containingObject = nullptr; QString name; if (!lookupProperty(propertyPrefix, propertyId, &property, &containingObject, &name)) { qWarning() << Q_FUNC_INFO << "Unknown property" << propertyPrefix + QLatin1Char('.') + toString(propertyId) @@ -623,13 +623,13 @@ public: return QVariant::fromValue(Enumeration(astValue)); } - AST::ExpressionStatement *eStmt = AST::cast<AST::ExpressionStatement *>(rhs); + auto eStmt = AST::cast<AST::ExpressionStatement *>(rhs); if (!eStmt || !eStmt->expression) return QVariant(); - const ObjectValue *containingObject = 0; + const ObjectValue *containingObject = nullptr; QString name; - if (!lookupProperty(propertyPrefix, propertyId, 0, &containingObject, &name)) + if (!lookupProperty(propertyPrefix, propertyId, nullptr, &containingObject, &name)) return QVariant(); if (containingObject) @@ -639,14 +639,14 @@ public: return QVariant(); const QString lhsPropertyTypeName = lhsCppComponent->propertyType(name); - const ObjectValue *rhsValueObject = 0; + const ObjectValue *rhsValueObject = nullptr; QString rhsValueName; - if (AST::IdentifierExpression *idExp = AST::cast<AST::IdentifierExpression *>(eStmt->expression)) { + if (auto idExp = AST::cast<AST::IdentifierExpression *>(eStmt->expression)) { if (!m_scopeChain.qmlScopeObjects().isEmpty()) rhsValueObject = m_scopeChain.qmlScopeObjects().constLast(); if (!idExp->name.isEmpty()) rhsValueName = idExp->name.toString(); - } else if (AST::FieldMemberExpression *memberExp = AST::cast<AST::FieldMemberExpression *>(eStmt->expression)) { + } else if (auto memberExp = AST::cast<AST::FieldMemberExpression *>(eStmt->expression)) { Evaluate evaluate(&m_scopeChain); const Value *result = evaluate(memberExp->base); rhsValueObject = result->asObjectValue(); @@ -748,7 +748,7 @@ void TextToModelMerger::setupImports(const Document::Ptr &doc, QList<Import> existingImports = m_rewriterView->model()->imports(); for (AST::UiHeaderItemList *iter = doc->qmlProgram()->headers; iter; iter = iter->next) { - AST::UiImport *import = AST::cast<AST::UiImport *>(iter->headerItem); + auto import = AST::cast<AST::UiImport *>(iter->headerItem); if (!import) continue; @@ -1022,7 +1022,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH } setupUsedImports(); - AST::UiObjectMember *astRootNode = 0; + AST::UiObjectMember *astRootNode = nullptr; if (AST::UiProgram *program = m_document->qmlProgram()) if (program->members) astRootNode = program->members->member; @@ -1081,7 +1081,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, if (modelNode.isRootNode() && isComponentType(typeName)) { for (AST::UiObjectMemberList *iter = astInitializer->members; iter; iter = iter->next) { - if (AST::UiObjectDefinition *def = AST::cast<AST::UiObjectDefinition *>(iter->member)) { + if (auto def = AST::cast<AST::UiObjectDefinition *>(iter->member)) { syncNode(modelNode, def, context, differenceHandler); return; } @@ -1120,7 +1120,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, if (!member) continue; - if (AST::UiArrayBinding *array = AST::cast<AST::UiArrayBinding *>(member)) { + if (auto array = AST::cast<AST::UiArrayBinding *>(member)) { const QString astPropertyName = toString(array->qualifiedId); if (isPropertyChangesType(typeName) || isConnectionsType(typeName) || context->lookupProperty(QString(), array->qualifiedId)) { AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8()); @@ -1135,7 +1135,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, qWarning() << "Skipping invalid array property" << astPropertyName << "for node type" << modelNode.type(); } - } else if (AST::UiObjectDefinition *def = AST::cast<AST::UiObjectDefinition *>(member)) { + } else if (auto def = AST::cast<AST::UiObjectDefinition *>(member)) { const QString &name = def->qualifiedTypeNameId->name.toString(); if (name.isEmpty() || !name.at(0).isUpper()) { QStringList props = syncGroupedProperties(modelNode, @@ -1148,13 +1148,13 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, } else { defaultPropertyItems.append(member); } - } else if (AST::UiObjectBinding *binding = AST::cast<AST::UiObjectBinding *>(member)) { + } else if (auto binding = AST::cast<AST::UiObjectBinding *>(member)) { const QString astPropertyName = toString(binding->qualifiedId); if (binding->hasOnToken) { // skip value sources } else { - const Value *propertyType = 0; - const ObjectValue *containingObject = 0; + const Value *propertyType = nullptr; + const ObjectValue *containingObject = nullptr; QString name; if (context->lookupProperty(QString(), binding->qualifiedId, &propertyType, &containingObject, &name) || isPropertyChangesType(typeName) @@ -1173,9 +1173,9 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, modelPropertyNames.remove(astPropertyName.toUtf8()); } } - } else if (AST::UiScriptBinding *script = AST::cast<AST::UiScriptBinding *>(member)) { + } else if (auto script = AST::cast<AST::UiScriptBinding *>(member)) { modelPropertyNames.remove(syncScriptBinding(modelNode, QString(), script, context, differenceHandler)); - } else if (AST::UiPublicMember *property = AST::cast<AST::UiPublicMember *>(member)) { + } else if (auto property = AST::cast<AST::UiPublicMember *>(member)) { if (property->type == AST::UiPublicMember::Signal) continue; // QML designer doesn't support this yet. @@ -1198,7 +1198,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, AbstractProperty modelProperty = modelNode.property(astName.toUtf8()); if (property->binding) { - if (AST::UiObjectBinding *binding = AST::cast<AST::UiObjectBinding *>(property->binding)) + if (auto binding = AST::cast<AST::UiObjectBinding *>(property->binding)) syncNodeProperty(modelProperty, binding, context, astType, differenceHandler); else qWarning() << "Arrays are not yet supported"; @@ -1251,7 +1251,7 @@ static QVariant parsePropertyExpression(AST::ExpressionNode *expressionNode) { Q_ASSERT(expressionNode); - AST::ArrayLiteral *arrayLiteral = AST::cast<AST::ArrayLiteral *>(expressionNode); + auto arrayLiteral = AST::cast<AST::ArrayLiteral *>(expressionNode); if (arrayLiteral) { QList<QVariant> variantList; @@ -1260,19 +1260,19 @@ static QVariant parsePropertyExpression(AST::ExpressionNode *expressionNode) return variantList; } - AST::StringLiteral *stringLiteral = AST::cast<AST::StringLiteral *>(expressionNode); + auto stringLiteral = AST::cast<AST::StringLiteral *>(expressionNode); if (stringLiteral) return stringLiteral->value.toString(); - AST::TrueLiteral *trueLiteral = AST::cast<AST::TrueLiteral *>(expressionNode); + auto trueLiteral = AST::cast<AST::TrueLiteral *>(expressionNode); if (trueLiteral) return true; - AST::FalseLiteral *falseLiteral = AST::cast<AST::FalseLiteral *>(expressionNode); + auto falseLiteral = AST::cast<AST::FalseLiteral *>(expressionNode); if (falseLiteral) return false; - AST::NumericLiteral *numericLiteral = AST::cast<AST::NumericLiteral *>(expressionNode); + auto numericLiteral = AST::cast<AST::NumericLiteral *>(expressionNode); if (numericLiteral) return numericLiteral->value; @@ -1284,7 +1284,7 @@ QVariant parsePropertyScriptBinding(AST::UiScriptBinding *uiScriptBinding) { Q_ASSERT(uiScriptBinding); - AST::ExpressionStatement *expStmt = AST::cast<AST::ExpressionStatement *>(uiScriptBinding->statement); + auto expStmt = AST::cast<AST::ExpressionStatement *>(uiScriptBinding->statement); if (!expStmt) return QVariant(); @@ -1596,7 +1596,7 @@ QStringList TextToModelMerger::syncGroupedProperties(ModelNode &modelNode, for (AST::UiObjectMemberList *iter = members; iter; iter = iter->next) { AST::UiObjectMember *member = iter->member; - if (AST::UiScriptBinding *script = AST::cast<AST::UiScriptBinding *>(member)) { + if (auto script = AST::cast<AST::UiScriptBinding *>(member)) { const QString prop = QString::fromLatin1(syncScriptBinding(modelNode, name, script, context, differenceHandler)); if (!prop.isEmpty()) props.append(prop); @@ -1881,12 +1881,12 @@ ModelNode ModelAmender::listPropertyMissingModelNode(NodeListProperty &modelProp ReadingContext *context, AST::UiObjectMember *arrayMember) { - AST::UiQualifiedId *astObjectType = 0; - AST::UiObjectInitializer *astInitializer = 0; - if (AST::UiObjectDefinition *def = AST::cast<AST::UiObjectDefinition *>(arrayMember)) { + AST::UiQualifiedId *astObjectType = nullptr; + AST::UiObjectInitializer *astInitializer = nullptr; + if (auto def = AST::cast<AST::UiObjectDefinition *>(arrayMember)) { astObjectType = def->qualifiedTypeNameId; astInitializer = def->initializer; - } else if (AST::UiObjectBinding *bin = AST::cast<AST::UiObjectBinding *>(arrayMember)) { + } else if (auto bin = AST::cast<AST::UiObjectBinding *>(arrayMember)) { astObjectType = bin->qualifiedTypeNameId; astInitializer = bin->initializer; } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index 4eebae3b85..82def3927f 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -167,8 +167,7 @@ public: DifferenceHandler(TextToModelMerger *textToModelMerger): m_merger(textToModelMerger) {} - virtual ~DifferenceHandler() - {} + virtual ~DifferenceHandler() = default; virtual void modelMissesImport(const QmlDesigner::Import &import) = 0; virtual void importAbsentInQMl(const QmlDesigner::Import &import) = 0; @@ -219,48 +218,47 @@ public: ModelValidator(TextToModelMerger *textToModelMerger): DifferenceHandler(textToModelMerger) {} - ~ModelValidator() - {} - - virtual void modelMissesImport(const QmlDesigner::Import &import); - virtual void importAbsentInQMl(const QmlDesigner::Import &import); - virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, - const QString &javascript, - const TypeName &astType); - virtual void shouldBeBindingProperty(AbstractProperty &modelProperty, - const QString &javascript, - const TypeName &astType); - virtual void signalHandlerSourceDiffer(SignalHandlerProperty &modelProperty, - const QString &javascript); - virtual void shouldBeSignalHandlerProperty(AbstractProperty &modelProperty, - const QString &javascript); - virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty, - const QList<QmlJS::AST::UiObjectMember *> arrayMembers, - ReadingContext *context); - virtual void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName); - virtual void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName); - virtual void shouldBeNodeProperty(AbstractProperty &modelProperty, - const TypeName &typeName, - int majorVersion, - int minorVersion, - QmlJS::AST::UiObjectMember *astNode, - const TypeName &dynamicPropertyType, - ReadingContext *context); - - virtual void modelNodeAbsentFromQml(ModelNode &modelNode); - virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, - ReadingContext *context, - QmlJS::AST::UiObjectMember *arrayMember); - virtual void typeDiffers(bool isRootNode, - ModelNode &modelNode, - const TypeName &typeName, - int majorVersion, - int minorVersion, - QmlJS::AST::UiObjectMember *astNode, - ReadingContext *context); - virtual void propertyAbsentFromQml(AbstractProperty &modelProperty); - virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId); - virtual bool isValidator() const {return false; } + ~ModelValidator() override = default; + + void modelMissesImport(const QmlDesigner::Import &import) override; + void importAbsentInQMl(const QmlDesigner::Import &import) override; + void bindingExpressionsDiffer(BindingProperty &modelProperty, + const QString &javascript, + const TypeName &astType) override; + void shouldBeBindingProperty(AbstractProperty &modelProperty, + const QString &javascript, + const TypeName &astType) override; + void signalHandlerSourceDiffer(SignalHandlerProperty &modelProperty, + const QString &javascript) override; + void shouldBeSignalHandlerProperty(AbstractProperty &modelProperty, + const QString &javascript) override; + void shouldBeNodeListProperty(AbstractProperty &modelProperty, + const QList<QmlJS::AST::UiObjectMember *> arrayMembers, + ReadingContext *context) override; + void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName) override; + void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName) override; + void shouldBeNodeProperty(AbstractProperty &modelProperty, + const TypeName &typeName, + int majorVersion, + int minorVersion, + QmlJS::AST::UiObjectMember *astNode, + const TypeName &dynamicPropertyType, + ReadingContext *context) override; + + void modelNodeAbsentFromQml(ModelNode &modelNode) override; + ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, + ReadingContext *context, + QmlJS::AST::UiObjectMember *arrayMember) override; + void typeDiffers(bool isRootNode, + ModelNode &modelNode, + const TypeName &typeName, + int majorVersion, + int minorVersion, + QmlJS::AST::UiObjectMember *astNode, + ReadingContext *context) override; + void propertyAbsentFromQml(AbstractProperty &modelProperty) override; + void idsDiffer(ModelNode &modelNode, const QString &qmlId) override; + bool isValidator() const override {return false; } }; class ModelAmender: public DifferenceHandler @@ -269,48 +267,47 @@ public: ModelAmender(TextToModelMerger *textToModelMerger): DifferenceHandler(textToModelMerger) {} - ~ModelAmender() - {} - - virtual void modelMissesImport(const QmlDesigner::Import &import); - virtual void importAbsentInQMl(const QmlDesigner::Import &import); - virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, - const QString &javascript, - const TypeName &astType); - virtual void shouldBeBindingProperty(AbstractProperty &modelProperty, - const QString &javascript, - const TypeName &astType); - virtual void signalHandlerSourceDiffer(SignalHandlerProperty &modelProperty, - const QString &javascript); - virtual void shouldBeSignalHandlerProperty(AbstractProperty &modelProperty, - const QString &javascript); - virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty, - const QList<QmlJS::AST::UiObjectMember *> arrayMembers, - ReadingContext *context); - virtual void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicType); - virtual void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName); - virtual void shouldBeNodeProperty(AbstractProperty &modelProperty, - const TypeName &typeName, - int majorVersion, - int minorVersion, - QmlJS::AST::UiObjectMember *astNode, - const TypeName &dynamicPropertyType, - ReadingContext *context); - - virtual void modelNodeAbsentFromQml(ModelNode &modelNode); - virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, - ReadingContext *context, - QmlJS::AST::UiObjectMember *arrayMember); - virtual void typeDiffers(bool isRootNode, - ModelNode &modelNode, - const TypeName &typeName, - int majorVersion, - int minorVersion, - QmlJS::AST::UiObjectMember *astNode, - ReadingContext *context); - virtual void propertyAbsentFromQml(AbstractProperty &modelProperty); - virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId); - virtual bool isValidator() const {return true; } + ~ModelAmender() override = default; + + void modelMissesImport(const QmlDesigner::Import &import) override; + void importAbsentInQMl(const QmlDesigner::Import &import) override; + void bindingExpressionsDiffer(BindingProperty &modelProperty, + const QString &javascript, + const TypeName &astType) override; + void shouldBeBindingProperty(AbstractProperty &modelProperty, + const QString &javascript, + const TypeName &astType) override; + void signalHandlerSourceDiffer(SignalHandlerProperty &modelProperty, + const QString &javascript) override; + void shouldBeSignalHandlerProperty(AbstractProperty &modelProperty, + const QString &javascript) override; + void shouldBeNodeListProperty(AbstractProperty &modelProperty, + const QList<QmlJS::AST::UiObjectMember *> arrayMembers, + ReadingContext *context) override; + void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicType) override; + void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName) override; + void shouldBeNodeProperty(AbstractProperty &modelProperty, + const TypeName &typeName, + int majorVersion, + int minorVersion, + QmlJS::AST::UiObjectMember *astNode, + const TypeName &dynamicPropertyType, + ReadingContext *context) override; + + void modelNodeAbsentFromQml(ModelNode &modelNode) override; + ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, + ReadingContext *context, + QmlJS::AST::UiObjectMember *arrayMember) override; + void typeDiffers(bool isRootNode, + ModelNode &modelNode, + const TypeName &typeName, + int majorVersion, + int minorVersion, + QmlJS::AST::UiObjectMember *astNode, + ReadingContext *context) override; + void propertyAbsentFromQml(AbstractProperty &modelProperty) override; + void idsDiffer(ModelNode &modelNode, const QString &qmlId) override; + bool isValidator() const override {return true; } }; } //Internal diff --git a/src/plugins/qmldesigner/designercore/model/variantproperty.cpp b/src/plugins/qmldesigner/designercore/model/variantproperty.cpp index dbdf1bb74e..03c4f5acbf 100644 --- a/src/plugins/qmldesigner/designercore/model/variantproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/variantproperty.cpp @@ -35,8 +35,7 @@ namespace QmlDesigner { -VariantProperty::VariantProperty() -{} +VariantProperty::VariantProperty() = default; VariantProperty::VariantProperty(const VariantProperty &property, AbstractView *view) : AbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp index 9fca067862..800c807dc6 100644 --- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp @@ -143,7 +143,7 @@ void ViewManager::detachRewriterView() { if (RewriterView *view = currentDesignDocument()->rewriterView()) { view->deactivateTextMofifierChangeSignals(); - currentModel()->setRewriterView(0); + currentModel()->setRewriterView(nullptr); } } @@ -205,7 +205,7 @@ void ViewManager::detachViewsExceptRewriterAndComponetView() if (d->debugView.isAttached()) currentModel()->detachView(&d->debugView); - currentModel()->setNodeInstanceView(0); + currentModel()->setNodeInstanceView(nullptr); } void ViewManager::attachItemLibraryView() diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp index cae792a456..2b3b5c81c5 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp @@ -37,9 +37,7 @@ namespace QmlDesigner { namespace Internal { -WidgetPluginManager::WidgetPluginManager() -{ -} +WidgetPluginManager::WidgetPluginManager() = default; WidgetPluginManager::IWidgetPluginList WidgetPluginManager::instances() { @@ -63,7 +61,7 @@ bool WidgetPluginManager::addPath(const QString &path) QAbstractItemModel *WidgetPluginManager::createModel(QObject *parent) { - QStandardItemModel *model = new QStandardItemModel(parent); + auto model = new QStandardItemModel(parent); const auto end = m_paths.end(); for (auto it = m_paths.begin(); it != end; ++it) model->appendRow(it->createModelItem()); diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h index 2955ef9bfd..854da511c3 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h @@ -49,9 +49,9 @@ namespace Internal { class WidgetPluginManager { Q_DISABLE_COPY(WidgetPluginManager) - typedef QList<WidgetPluginPath> PluginPathList; + using PluginPathList = QList<WidgetPluginPath>; public: - typedef QList<IWidgetPlugin *> IWidgetPluginList; + using IWidgetPluginList = QList<IWidgetPlugin *>; WidgetPluginManager(); diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp index 6904417759..968a2e8bc3 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp @@ -52,11 +52,11 @@ static IWidgetPlugin *instance(WidgetPluginData &p) // Go stale once something fails if (p.failed) - return 0; + return nullptr; // Pull up the plugin, retrieve IPlugin instance. if (!p.instanceGuard) { - p.instance = 0; + p.instance = nullptr; QPluginLoader loader(p.path); if (debug) @@ -68,7 +68,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p) "Failed to create instance of file " "\"%1\": %2").arg(p.path).arg(p.errorMessage); qWarning() << p.errorMessage; - return 0; + return nullptr; } QObject *object = loader.instance(); if (!object) { @@ -77,7 +77,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p) "Failed to create instance of file \"%1\"." ).arg(p.path); qWarning() << p.errorMessage; - return 0; + return nullptr; } IWidgetPlugin *iplugin = qobject_cast<IWidgetPlugin *>(object); if (!iplugin) { @@ -87,7 +87,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p) ).arg(p.path); qWarning() << p.errorMessage; delete object; - return 0; + return nullptr; } p.instanceGuard = object; p.instance = iplugin; @@ -110,7 +110,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p) WidgetPluginData::WidgetPluginData(const QString &p) : path(p), failed(false), - instance(0) + instance(nullptr) { } @@ -187,7 +187,7 @@ QStandardItem *WidgetPluginPath::createModelItem() // If there are failed ones, create a separate "Failed" // category at the end QStandardItem *pathItem = new QStandardItem(m_path.absolutePath()); - QStandardItem *failedCategory = 0; + QStandardItem *failedCategory = nullptr; const auto end = m_plugins.end(); for (auto it = m_plugins.begin(); it != end; ++it) { QStandardItem *pluginItem = new QStandardItem(Utils::FileName::fromString(it->path).fileName()); diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h index 391fe86fe9..13ad38fcd3 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h @@ -66,7 +66,7 @@ struct WidgetPluginData { // IPlugins. class WidgetPluginPath { - typedef QList<IWidgetPlugin *> IWidgetPluginList; + using IWidgetPluginList = QList<IWidgetPlugin *>; public: explicit WidgetPluginPath(const QDir &path); @@ -80,7 +80,7 @@ public: QStandardItem *createModelItem(); private: - typedef QList<WidgetPluginData> PluginDataList; + using PluginDataList = QList<WidgetPluginData>; static QStringList libraryFilePaths(const QDir &dir); void clear(); |