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

QmlDesigner: Modernize

Browse Source 
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default

Change-Id: Ic42b5c59fed5a4a01853138542d8156471e86f58
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Alessandro Portale
2018-07-24 23:56:45 +02:00
parent 0558db7b54
commit 859d847769
228 changed files with 839 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -77,13 +77,11 @@ DesignDocument::DesignDocument(QObject *parent) :
m_subComponentManager(new SubComponentManager(m_documentModel.data(), this)),
m_rewriterView (new RewriterView(RewriterView::Amend, m_documentModel.data())),
m_documentLoaded(false),
m_currentKit(0)
m_currentKit(nullptr)
{
}
DesignDocument::~DesignDocument()
{
}
DesignDocument::~DesignDocument() = default;
Model *DesignDocument::currentModel() const
{
@@ -590,7 +588,7 @@ QPlainTextEdit *DesignDocument::plainTextEdit() const
if (editor())
return qobject_cast<QPlainTextEdit*>(editor()->widget());
return 0;
return nullptr;
}
ModelNode DesignDocument::rootModelNode() const
@@ -622,7 +620,7 @@ static inline Kit *getActiveKit(DesignDocument *designDocument)
currentProject = ProjectExplorer::ProjectTree::currentProject();
if (!currentProject)
return 0;
return nullptr;
QObject::connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
@@ -641,10 +639,10 @@ static inline Kit *getActiveKit(DesignDocument *designDocument)
Target *target = currentProject->activeTarget();
if (!target)
return 0;
return nullptr;
if (!target->kit() || !target->kit()->isValid())
return 0;
return nullptr;
QObject::connect(target, &Target::kitChanged,
designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection);