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

QMakeProjectManager: Introduce member initialization.

Browse Source 
Change-Id: I69df0c22a215b2df12f63fdc47082e9797fc02ac
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Jarek Kobus
2015-06-18 15:14:06 +02:00
parent 995e3d9802
commit a73ad816a3
33 changed files with 137 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -306,8 +306,7 @@ QmakePriFileNode::QmakePriFileNode(QmakeProject *project, QmakeProFileNode *qmak
m_project(project),
m_qmakeProFileNode(qmakeProFileNode),
m_projectFilePath(filePath),
m_projectDir(filePath.toFileInfo().absolutePath()),
m_includedInExactParse(true)
m_projectDir(filePath.toFileInfo().absolutePath())
{
Q_ASSERT(project);
m_qmakePriFile = new QmakePriFile(this);
@@ -335,19 +334,13 @@ struct InternalNode
QList<InternalNode *> virtualfolders;
QMap<QString, InternalNode *> subnodes;
FileNameList files;
FileType type;
int priority;
FileType type = UnknownFileType;
int priority = 0;
QString displayName;
QString typeName;
QString fullPath;
QIcon icon;
InternalNode()
{
type = UnknownFileType;
priority = 0;
}
~InternalNode()
{
qDeleteAll(virtualfolders);
@@ -1597,12 +1590,7 @@ bool QmakeProFileNode::isDeployable() const
*/
QmakeProFileNode::QmakeProFileNode(QmakeProject *project,
const FileName &filePath)
: QmakePriFileNode(project, this, filePath),
m_validParse(false),
m_parseInProgress(true),
m_projectType(InvalidProject),
m_readerExact(0),
m_readerCumulative(0)
: QmakePriFileNode(project, this, filePath)
{
// The slot is a lambda, so that QmakeProFileNode does not need to be
// a qobject. The lifetime of the m_parserFutureWatcher is shorter