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

2
src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
View File

@@ -190,7 +190,7 @@ AddLibraryWizard::LibraryKind LibraryTypePage::libraryKind() const
///////////// /////////////
DetailsPage::DetailsPage(AddLibraryWizard *parent) DetailsPage::DetailsPage(AddLibraryWizard *parent)
: QWizardPage(parent), m_libraryWizard(parent), m_libraryDetailsController(0) : QWizardPage(parent), m_libraryWizard(parent)
{ {
m_libraryDetailsWidget = new Ui::LibraryDetailsWidget(); m_libraryDetailsWidget = new Ui::LibraryDetailsWidget();
m_libraryDetailsWidget->setupUi(this); m_libraryDetailsWidget->setupUi(this);

24
src/plugins/qmakeprojectmanager/addlibrarywizard.h
View File

@@ -93,9 +93,9 @@ public:
signals: signals:
private: private:
LibraryTypePage *m_libraryTypePage; LibraryTypePage *m_libraryTypePage = nullptr;
DetailsPage *m_detailsPage; DetailsPage *m_detailsPage = nullptr;
SummaryPage *m_summaryPage; SummaryPage *m_summaryPage = nullptr;
QString m_proFile; QString m_proFile;
}; };
@@ -109,10 +109,10 @@ public:
AddLibraryWizard::LibraryKind libraryKind() const; AddLibraryWizard::LibraryKind libraryKind() const;
private: private:
QRadioButton *m_internalRadio; QRadioButton *m_internalRadio = nullptr;
QRadioButton *m_externalRadio; QRadioButton *m_externalRadio = nullptr;
QRadioButton *m_systemRadio; QRadioButton *m_systemRadio = nullptr;
QRadioButton *m_packageRadio; QRadioButton *m_packageRadio = nullptr;
}; };
class DetailsPage : public QWizardPage class DetailsPage : public QWizardPage
@@ -126,8 +126,8 @@ public:
private: private:
AddLibraryWizard *m_libraryWizard; AddLibraryWizard *m_libraryWizard;
Ui::LibraryDetailsWidget *m_libraryDetailsWidget; Ui::LibraryDetailsWidget *m_libraryDetailsWidget = nullptr;
LibraryDetailsController *m_libraryDetailsController; LibraryDetailsController *m_libraryDetailsController = nullptr;
}; };
class SummaryPage : public QWizardPage class SummaryPage : public QWizardPage
@@ -138,9 +138,9 @@ public:
virtual void initializePage(); virtual void initializePage();
QString snippet() const; QString snippet() const;
private: private:
AddLibraryWizard *m_libraryWizard; AddLibraryWizard *m_libraryWizard = nullptr;
QLabel *m_summaryLabel; QLabel *m_summaryLabel = nullptr;
QLabel *m_snippetLabel; QLabel *m_snippetLabel = nullptr;
QString m_snippet; QString m_snippet;
}; };

9
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
View File

@@ -83,9 +83,7 @@ static Utils::FileName pathFromId(Core::Id id)
DesktopQmakeRunConfiguration::DesktopQmakeRunConfiguration(Target *parent, Core::Id id) : DesktopQmakeRunConfiguration::DesktopQmakeRunConfiguration(Target *parent, Core::Id id) :
LocalApplicationRunConfiguration(parent, id), LocalApplicationRunConfiguration(parent, id),
m_proFilePath(pathFromId(id)), m_proFilePath(pathFromId(id))
m_runMode(ApplicationLauncher::Gui),
m_isUsingDyldImageSuffix(false)
{ {
addExtraAspect(new ProjectExplorer::LocalEnvironmentAspect(this)); addExtraAspect(new ProjectExplorer::LocalEnvironmentAspect(this));
@@ -174,10 +172,7 @@ void DesktopQmakeRunConfiguration::ctor()
DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQmakeRunConfiguration *qmakeRunConfiguration, QWidget *parent) DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQmakeRunConfiguration *qmakeRunConfiguration, QWidget *parent)
: QWidget(parent), : QWidget(parent),
m_qmakeRunConfiguration(qmakeRunConfiguration), m_qmakeRunConfiguration(qmakeRunConfiguration)
m_ignoreChange(false),
m_usingDyldImageSuffix(0),
m_isShown(false)
{ {
QVBoxLayout *vboxTopLayout = new QVBoxLayout(this); QVBoxLayout *vboxTopLayout = new QVBoxLayout(this);
vboxTopLayout->setMargin(0); vboxTopLayout->setMargin(0);

32
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
View File

@@ -128,11 +128,11 @@ private:
Utils::FileName m_proFilePath; // Full path to the Application Pro File Utils::FileName m_proFilePath; // Full path to the Application Pro File
// Cached startup sub project information // Cached startup sub project information
ProjectExplorer::ApplicationLauncher::Mode m_runMode; ProjectExplorer::ApplicationLauncher::Mode m_runMode = ProjectExplorer::ApplicationLauncher::Gui;
bool m_isUsingDyldImageSuffix; bool m_isUsingDyldImageSuffix = false;
QString m_userWorkingDirectory; QString m_userWorkingDirectory;
bool m_parseSuccess; bool m_parseSuccess = false;
bool m_parseInProgress; bool m_parseInProgress = false;
}; };
class DesktopQmakeRunConfigurationWidget : public QWidget class DesktopQmakeRunConfigurationWidget : public QWidget
@@ -165,19 +165,19 @@ private slots:
void usingDyldImageSuffixChanged(bool); void usingDyldImageSuffixChanged(bool);
private: private:
DesktopQmakeRunConfiguration *m_qmakeRunConfiguration; DesktopQmakeRunConfiguration *m_qmakeRunConfiguration = nullptr;
bool m_ignoreChange; bool m_ignoreChange = false;
QLabel *m_disabledIcon; QLabel *m_disabledIcon = nullptr;
QLabel *m_disabledReason; QLabel *m_disabledReason = nullptr;
QLabel *m_executableLineLabel; QLabel *m_executableLineLabel = nullptr;
Utils::PathChooser *m_workingDirectoryEdit; Utils::PathChooser *m_workingDirectoryEdit = nullptr;
QLineEdit *m_argumentsLineEdit; QLineEdit *m_argumentsLineEdit = nullptr;
QCheckBox *m_useTerminalCheck; QCheckBox *m_useTerminalCheck = nullptr;
QCheckBox *m_useQvfbCheck; QCheckBox *m_useQvfbCheck = nullptr;
QCheckBox *m_usingDyldImageSuffix; QCheckBox *m_usingDyldImageSuffix = nullptr;
QLineEdit *m_qmlDebugPort; QLineEdit *m_qmlDebugPort = nullptr;
Utils::DetailsWidget *m_detailsContainer; Utils::DetailsWidget *m_detailsContainer;
bool m_isShown; bool m_isShown = false;
}; };
class DesktopQmakeRunConfigurationFactory : public QmakeRunConfigurationFactory class DesktopQmakeRunConfigurationFactory : public QmakeRunConfigurationFactory

3
src/plugins/qmakeprojectmanager/externaleditors.cpp
View File

@@ -210,8 +210,7 @@ DesignerExternalEditor::DesignerExternalEditor(QObject *parent) :
ExternalQtEditor(designerIdC, ExternalQtEditor(designerIdC,
QLatin1String(designerDisplayName), QLatin1String(designerDisplayName),
QLatin1String(Designer::Constants::FORM_MIMETYPE), QLatin1String(Designer::Constants::FORM_MIMETYPE),
parent), parent)
m_terminationMapper(0)
{ {
} }

2
src/plugins/qmakeprojectmanager/externaleditors.h
View File

@@ -139,7 +139,7 @@ private:
typedef QMap<QString, QTcpSocket*> ProcessCache; typedef QMap<QString, QTcpSocket*> ProcessCache;
ProcessCache m_processCache; ProcessCache m_processCache;
QSignalMapper *m_terminationMapper; QSignalMapper *m_terminationMapper = nullptr;
}; };
} // namespace Internal } // namespace Internal

12
src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
View File

@@ -54,19 +54,7 @@ LibraryDetailsController::LibraryDetailsController(
Ui::LibraryDetailsWidget *libraryDetails, Ui::LibraryDetailsWidget *libraryDetails,
const QString &proFile, QObject *parent) : const QString &proFile, QObject *parent) :
QObject(parent), QObject(parent),
m_platforms(AddLibraryWizard::LinuxPlatform
| AddLibraryWizard::MacPlatform
| AddLibraryWizard::WindowsMinGWPlatform
| AddLibraryWizard::WindowsMSVCPlatform),
m_linkageType(AddLibraryWizard::NoLinkage),
m_macLibraryType(AddLibraryWizard::NoLibraryType),
m_proFile(proFile), m_proFile(proFile),
m_ignoreGuiSignals(false),
m_includePathChanged(false),
m_linkageRadiosVisible(true),
m_macLibraryRadiosVisible(true),
m_includePathVisible(true),
m_windowsGroupVisible(true),
m_libraryDetailsWidget(libraryDetails) m_libraryDetailsWidget(libraryDetails)
{ {
switch (Utils::HostOsInfo::hostOs()) { switch (Utils::HostOsInfo::hostOs()) {

21
src/plugins/qmakeprojectmanager/librarydetailscontroller.h
View File

@@ -104,21 +104,24 @@ private:
void showLinkageType(AddLibraryWizard::LinkageType linkageType); void showLinkageType(AddLibraryWizard::LinkageType linkageType);
void showMacLibraryType(AddLibraryWizard::MacLibraryType libType); void showMacLibraryType(AddLibraryWizard::MacLibraryType libType);
AddLibraryWizard::Platforms m_platforms; AddLibraryWizard::Platforms m_platforms = AddLibraryWizard::LinuxPlatform
AddLibraryWizard::LinkageType m_linkageType; | AddLibraryWizard::MacPlatform
AddLibraryWizard::MacLibraryType m_macLibraryType; | AddLibraryWizard::WindowsMinGWPlatform
| AddLibraryWizard::WindowsMSVCPlatform;
AddLibraryWizard::LinkageType m_linkageType = AddLibraryWizard::NoLinkage;
AddLibraryWizard::MacLibraryType m_macLibraryType = AddLibraryWizard::NoLibraryType;
QString m_proFile; QString m_proFile;
CreatorPlatform m_creatorPlatform; CreatorPlatform m_creatorPlatform;
bool m_ignoreGuiSignals; bool m_ignoreGuiSignals = false;
bool m_includePathChanged; bool m_includePathChanged = false;
bool m_linkageRadiosVisible; bool m_linkageRadiosVisible = true;
bool m_macLibraryRadiosVisible; bool m_macLibraryRadiosVisible = true;
bool m_includePathVisible; bool m_includePathVisible = true;
bool m_windowsGroupVisible; bool m_windowsGroupVisible = true;
Ui::LibraryDetailsWidget *m_libraryDetailsWidget; Ui::LibraryDetailsWidget *m_libraryDetailsWidget;
}; };

14
src/plugins/qmakeprojectmanager/makefileparse.h
View File

@@ -75,16 +75,10 @@ private:
class QmakeBuildConfig class QmakeBuildConfig
{ {
public: public:
QmakeBuildConfig() bool explicitDebug = false;
: explicitDebug(false), bool explicitRelease = false;
explicitRelease(false), bool explicitBuildAll = false;
explicitBuildAll(false), bool explicitNoBuildAll = false;
explicitNoBuildAll(false)
{}
bool explicitDebug;
bool explicitRelease;
bool explicitBuildAll;
bool explicitNoBuildAll;
}; };
MakefileState m_state; MakefileState m_state;

8
src/plugins/qmakeprojectmanager/makestep.cpp
View File

@@ -63,8 +63,7 @@ const char CLEAN_KEY[] = "Qt4ProjectManager.MakeStep.Clean";
} }
MakeStep::MakeStep(BuildStepList *bsl) : MakeStep::MakeStep(BuildStepList *bsl) :
AbstractProcessStep(bsl, Core::Id(MAKESTEP_BS_ID)), AbstractProcessStep(bsl, Core::Id(MAKESTEP_BS_ID))
m_clean(false)
{ {
ctor(); ctor();
} }
@@ -79,8 +78,7 @@ MakeStep::MakeStep(BuildStepList *bsl, MakeStep *bs) :
} }
MakeStep::MakeStep(BuildStepList *bsl, Core::Id id) : MakeStep::MakeStep(BuildStepList *bsl, Core::Id id) :
AbstractProcessStep(bsl, id), AbstractProcessStep(bsl, id)
m_clean(false)
{ {
ctor(); ctor();
} }
@@ -314,7 +312,7 @@ void MakeStep::setUserArguments(const QString &arguments)
} }
MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
: BuildStepConfigWidget(), m_ui(new Internal::Ui::MakeStep), m_makeStep(makeStep), m_bc(0), m_ignoreChange(false) : BuildStepConfigWidget(), m_ui(new Internal::Ui::MakeStep), m_makeStep(makeStep)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);

12
src/plugins/qmakeprojectmanager/makestep.h
View File

@@ -109,8 +109,8 @@ private:
void ctor(); void ctor();
void setMakeCommand(const QString &make); void setMakeCommand(const QString &make);
QStringList automaticallyAddedArguments() const; QStringList automaticallyAddedArguments() const;
bool m_clean; bool m_clean = false;
bool m_scriptTarget; bool m_scriptTarget = false;
QString m_makeFileToCheck; QString m_makeFileToCheck;
QString m_userArgs; QString m_userArgs;
QString m_makeCmd; QString m_makeCmd;
@@ -136,11 +136,11 @@ private slots:
private: private:
void setSummaryText(const QString &text); void setSummaryText(const QString &text);
Internal::Ui::MakeStep *m_ui; Internal::Ui::MakeStep *m_ui = nullptr;
MakeStep *m_makeStep; MakeStep *m_makeStep = nullptr;
QString m_summaryText; QString m_summaryText;
ProjectExplorer::BuildConfiguration *m_bc; ProjectExplorer::BuildConfiguration *m_bc = nullptr;
bool m_ignoreChange; bool m_ignoreChange = false;
}; };
} // QmakeProjectManager } // QmakeProjectManager

3
src/plugins/qmakeprojectmanager/profilecompletionassist.cpp
View File

@@ -317,9 +317,6 @@ static const char *const functionKeywords[] = {
// ------------------------------- // -------------------------------
// ProFileCompletionAssistProvider // ProFileCompletionAssistProvider
// ------------------------------- // -------------------------------
ProFileCompletionAssistProvider::ProFileCompletionAssistProvider()
{}
void ProFileCompletionAssistProvider::init() void ProFileCompletionAssistProvider::init()
{ {
for (uint i = 0; i < sizeof variableKeywords / sizeof variableKeywords[0] - 1; i++) for (uint i = 0; i < sizeof variableKeywords / sizeof variableKeywords[0] - 1; i++)

1
src/plugins/qmakeprojectmanager/profilecompletionassist.h
View File

@@ -43,7 +43,6 @@ class ProFileCompletionAssistProvider : public TextEditor::CompletionAssistProvi
Q_OBJECT Q_OBJECT
public: public:
ProFileCompletionAssistProvider();
void init(); void init();
~ProFileCompletionAssistProvider(); ~ProFileCompletionAssistProvider();

5
src/plugins/qmakeprojectmanager/profileeditor.cpp
View File

@@ -58,11 +58,6 @@ namespace Internal {
class ProFileEditorWidget : public TextEditorWidget class ProFileEditorWidget : public TextEditorWidget
{ {
public:
ProFileEditorWidget()
{
}
protected: protected:
virtual Link findLinkAt(const QTextCursor &, bool resolveTarget = true, virtual Link findLinkAt(const QTextCursor &, bool resolveTarget = true,
bool inNextSplit = false) override; bool inNextSplit = false) override;

2
src/plugins/qmakeprojectmanager/profilehoverhandler.cpp
View File

@@ -45,7 +45,7 @@ namespace QmakeProjectManager {
namespace Internal { namespace Internal {
ProFileHoverHandler::ProFileHoverHandler(const TextEditor::Keywords &keywords) ProFileHoverHandler::ProFileHoverHandler(const TextEditor::Keywords &keywords)
: m_manualKind(UnknownManual), m_keywords(keywords) : m_keywords(keywords)
{ {
} }

2
src/plugins/qmakeprojectmanager/profilehoverhandler.h
View File

@@ -66,7 +66,7 @@ private:
const QString &keyword); const QString &keyword);
QString m_docFragment; QString m_docFragment;
ManualKind m_manualKind; ManualKind m_manualKind = UnknownManual;
const TextEditor::Keywords m_keywords; const TextEditor::Keywords m_keywords;
}; };

12
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -106,12 +106,7 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target)
} }
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) : QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) :
BuildConfiguration(target, id), BuildConfiguration(target, id)
m_shadowBuild(true),
m_isEnabled(false),
m_qmakeBuildConfiguration(0),
m_subNodeBuild(0),
m_fileNodeBuild(0)
{ {
ctor(); ctor();
} }
@@ -119,10 +114,7 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) :
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, QmakeBuildConfiguration *source) : QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, QmakeBuildConfiguration *source) :
BuildConfiguration(target, source), BuildConfiguration(target, source),
m_shadowBuild(source->m_shadowBuild), m_shadowBuild(source->m_shadowBuild),
m_isEnabled(false), m_qmakeBuildConfiguration(source->m_qmakeBuildConfiguration)
m_qmakeBuildConfiguration(source->m_qmakeBuildConfiguration),
m_subNodeBuild(0), // temporary value, so not copied
m_fileNodeBuild(0)
{ {
cloneSteps(source); cloneSteps(source);
ctor(); ctor();

10
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
View File

@@ -144,11 +144,11 @@ private:
}; };
LastKitState m_lastKitState; LastKitState m_lastKitState;
bool m_shadowBuild; bool m_shadowBuild = true;
bool m_isEnabled; bool m_isEnabled = false;
QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration; QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration = 0;
QmakeProjectManager::QmakeProFileNode *m_subNodeBuild; QmakeProjectManager::QmakeProFileNode *m_subNodeBuild = nullptr;
ProjectExplorer::FileNode *m_fileNodeBuild; ProjectExplorer::FileNode *m_fileNodeBuild = nullptr;
friend class Internal::QmakeProjectConfigWidget; friend class Internal::QmakeProjectConfigWidget;
friend class QmakeBuildConfigurationFactory; friend class QmakeBuildConfigurationFactory;

2
src/plugins/qmakeprojectmanager/qmakebuildinfo.h
View File

@@ -46,7 +46,7 @@ class QmakeBuildInfo : public ProjectExplorer::BuildInfo
public: public:
QmakeBuildInfo(const QmakeBuildConfigurationFactory *f) : ProjectExplorer::BuildInfo(f) { } QmakeBuildInfo(const QmakeBuildConfigurationFactory *f) : ProjectExplorer::BuildInfo(f) { }
ProjectExplorer::BuildConfiguration::BuildType type; ProjectExplorer::BuildConfiguration::BuildType type = ProjectExplorer::BuildConfiguration::Unknown;
QString additionalArguments; QString additionalArguments;
QString makefile; QString makefile;
QMakeStepConfig config; QMakeStepConfig config;

3
src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp
View File

@@ -41,8 +41,7 @@ namespace Internal {
QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki) : QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki) :
ProjectExplorer::KitConfigWidget(k, ki), ProjectExplorer::KitConfigWidget(k, ki),
m_lineEdit(new QLineEdit), m_lineEdit(new QLineEdit)
m_ignoreChange(false)
{ {
refresh(); // set up everything according to kit refresh(); // set up everything according to kit
m_lineEdit->setToolTip(toolTip()); m_lineEdit->setToolTip(toolTip());

4
src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h
View File

@@ -61,8 +61,8 @@ private slots:
private: private:
int findQtVersion(const int id) const; int findQtVersion(const int id) const;
QLineEdit *m_lineEdit; QLineEdit *m_lineEdit = nullptr;
bool m_ignoreChange; bool m_ignoreChange = false;
}; };
} // namespace Internal } // namespace Internal

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

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

36
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -219,7 +219,7 @@ private:
QMap<ProjectExplorer::FileType, QSet<Utils::FileName> > m_files; QMap<ProjectExplorer::FileType, QSet<Utils::FileName> > m_files;
QSet<Utils::FileName> m_recursiveEnumerateFiles; QSet<Utils::FileName> m_recursiveEnumerateFiles;
QSet<QString> m_watchedFolders; QSet<QString> m_watchedFolders;
bool m_includedInExactParse; bool m_includedInExactParse = true;
// managed by QmakeProFileNode // managed by QmakeProFileNode
friend class QmakeProjectManager::QmakeProFileNode; friend class QmakeProjectManager::QmakeProFileNode;
@@ -277,7 +277,7 @@ private:
class QMAKEPROJECTMANAGER_EXPORT TargetInformation class QMAKEPROJECTMANAGER_EXPORT TargetInformation
{ {
public: public:
bool valid; bool valid = false;
QString target; QString target;
QString destDir; QString destDir;
QString buildDir; QString buildDir;
@@ -295,19 +295,9 @@ public:
return !(*this == other); return !(*this == other);
} }
TargetInformation() TargetInformation() = default;
: valid(false)
{}
TargetInformation(const TargetInformation &other)
: valid(other.valid),
target(other.target),
destDir(other.destDir),
buildDir(other.buildDir),
buildTarget(other.buildTarget)
{
}
TargetInformation(const TargetInformation &other) = default;
}; };
struct QMAKEPROJECTMANAGER_EXPORT InstallsItem { struct QMAKEPROJECTMANAGER_EXPORT InstallsItem {
@@ -322,12 +312,6 @@ struct QMAKEPROJECTMANAGER_EXPORT InstallsList {
QList<InstallsItem> items; QList<InstallsItem> items;
}; };
struct QMAKEPROJECTMANAGER_EXPORT ProjectVersion {
int major;
int minor;
int patch;
};
// Implements ProjectNode for qmake .pro files // Implements ProjectNode for qmake .pro files
class QMAKEPROJECTMANAGER_EXPORT QmakeProFileNode : public QmakePriFileNode class QMAKEPROJECTMANAGER_EXPORT QmakeProFileNode : public QmakePriFileNode
{ {
@@ -413,12 +397,12 @@ private:
static TargetInformation targetInformation(QtSupport::ProFileReader *reader, QtSupport::ProFileReader *readerBuildPass, const QString &buildDir, const QString &projectFilePath); static TargetInformation targetInformation(QtSupport::ProFileReader *reader, QtSupport::ProFileReader *readerBuildPass, const QString &buildDir, const QString &projectFilePath);
static InstallsList installsList(const QtSupport::ProFileReader *reader, const QString &projectFilePath, const QString &projectDir); static InstallsList installsList(const QtSupport::ProFileReader *reader, const QString &projectFilePath, const QString &projectDir);
bool m_isDeployable; bool m_isDeployable = false;
bool m_validParse; bool m_validParse = false;
bool m_parseInProgress; bool m_parseInProgress = true;
QmakeProjectType m_projectType; QmakeProjectType m_projectType = InvalidProject;
QmakeVariablesHash m_varValues; QmakeVariablesHash m_varValues;
QMap<QString, QDateTime> m_uitimestamps; QMap<QString, QDateTime> m_uitimestamps;
@@ -430,8 +414,8 @@ private:
// Async stuff // Async stuff
QFutureWatcher<Internal::EvalResult *> m_parseFutureWatcher; QFutureWatcher<Internal::EvalResult *> m_parseFutureWatcher;
QtSupport::ProFileReader *m_readerExact; QtSupport::ProFileReader *m_readerExact = nullptr;
QtSupport::ProFileReader *m_readerCumulative; QtSupport::ProFileReader *m_readerCumulative = nullptr;
}; };
} // namespace QmakeProjectManager } // namespace QmakeProjectManager

11
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -311,18 +311,9 @@ bool QmakeProjectFile::reload(QString *errorString, ReloadFlag flag, ChangeType
QmakeProject::QmakeProject(QmakeManager *manager, const QString &fileName) : QmakeProject::QmakeProject(QmakeManager *manager, const QString &fileName) :
m_manager(manager), m_manager(manager),
m_rootProjectNode(0),
m_fileInfo(new QmakeProjectFile(fileName, this)), m_fileInfo(new QmakeProjectFile(fileName, this)),
m_projectFiles(new QmakeProjectFiles), m_projectFiles(new QmakeProjectFiles),
m_qmakeVfs(new QMakeVfs), m_qmakeVfs(new QMakeVfs)
m_qmakeGlobals(0),
m_qmakeGlobalsRefCnt(0),
m_asyncUpdateFutureInterface(0),
m_pendingEvaluateFuturesCount(0),
m_asyncUpdateState(Base),
m_cancelEvaluate(false),
m_centralizedFolderWatcher(0),
m_activeTarget(0)
{ {
setId(Constants::QMAKEPROJECT_ID); setId(Constants::QMAKEPROJECT_ID);
setProjectContext(Core::Context(QmakeProjectManager::Constants::PROJECT_ID)); setProjectContext(Core::Context(QmakeProjectManager::Constants::PROJECT_ID));

24
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -185,35 +185,35 @@ private:
bool matchesKit(const ProjectExplorer::Kit *kit); bool matchesKit(const ProjectExplorer::Kit *kit);
QmakeManager *m_manager; QmakeManager *m_manager;
QmakeProFileNode *m_rootProjectNode; QmakeProFileNode *m_rootProjectNode = 0;
Internal::QmakeProjectFile *m_fileInfo; Internal::QmakeProjectFile *m_fileInfo = nullptr;
// Current configuration // Current configuration
QString m_oldQtIncludePath; QString m_oldQtIncludePath;
QString m_oldQtLibsPath; QString m_oldQtLibsPath;
// cached lists of all of files // cached lists of all of files
Internal::QmakeProjectFiles *m_projectFiles; Internal::QmakeProjectFiles *m_projectFiles = nullptr;
QMakeVfs *m_qmakeVfs; QMakeVfs *m_qmakeVfs = nullptr;
// cached data during project rescan // cached data during project rescan
ProFileGlobals *m_qmakeGlobals; ProFileGlobals *m_qmakeGlobals = nullptr;
int m_qmakeGlobalsRefCnt; int m_qmakeGlobalsRefCnt = 0;
QTimer m_asyncUpdateTimer; QTimer m_asyncUpdateTimer;
QFutureInterface<void> *m_asyncUpdateFutureInterface; QFutureInterface<void> *m_asyncUpdateFutureInterface = nullptr;
int m_pendingEvaluateFuturesCount; int m_pendingEvaluateFuturesCount = 0;
AsyncUpdateState m_asyncUpdateState; AsyncUpdateState m_asyncUpdateState = Base;
bool m_cancelEvaluate; bool m_cancelEvaluate = false;
QList<QmakeProFileNode *> m_partialEvaluate; QList<QmakeProFileNode *> m_partialEvaluate;
QFuture<void> m_codeModelFuture; QFuture<void> m_codeModelFuture;
Internal::CentralizedFolderWatcher *m_centralizedFolderWatcher; Internal::CentralizedFolderWatcher *m_centralizedFolderWatcher = nullptr;
ProjectExplorer::Target *m_activeTarget; ProjectExplorer::Target *m_activeTarget = nullptr;
friend class Internal::QmakeProjectFile; friend class Internal::QmakeProjectFile;
friend class Internal::QmakeProjectConfigWidget; friend class Internal::QmakeProjectConfigWidget;

3
src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
View File

@@ -47,8 +47,7 @@ using namespace ProjectExplorer;
QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc) QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
: NamedWidget(), : NamedWidget(),
m_buildConfiguration(bc), m_buildConfiguration(bc)
m_ignoreChange(false)
{ {
m_defaultShadowBuildDir m_defaultShadowBuildDir
= QmakeBuildConfiguration::shadowBuildDirectory(bc->target()->project()->projectFilePath().toString(), = QmakeBuildConfiguration::shadowBuildDirectory(bc->target()->project()->projectFilePath().toString(),

2
src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
View File

@@ -73,7 +73,7 @@ private:
QmakeBuildConfiguration *m_buildConfiguration; QmakeBuildConfiguration *m_buildConfiguration;
Utils::DetailsWidget *m_detailsContainer; Utils::DetailsWidget *m_detailsContainer;
QString m_defaultShadowBuildDir; QString m_defaultShadowBuildDir;
bool m_ignoreChange; bool m_ignoreChange = false;
}; };
} // namespace Internal } // namespace Internal

7
src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp
View File

@@ -58,13 +58,6 @@ using namespace TextEditor;
namespace QmakeProjectManager { namespace QmakeProjectManager {
QmakeManager::QmakeManager()
: m_contextNode(0),
m_contextProject(0),
m_contextFile(0)
{
}
QmakeManager::~QmakeManager() QmakeManager::~QmakeManager()
{ {
} }

7
src/plugins/qmakeprojectmanager/qmakeprojectmanager.h
View File

@@ -54,7 +54,6 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeManager : public ProjectExplorer::IProject
Q_OBJECT Q_OBJECT
public: public:
QmakeManager();
~QmakeManager(); ~QmakeManager();
void registerProject(QmakeProject *project); void registerProject(QmakeProject *project);
@@ -95,9 +94,9 @@ private:
void addLibrary(const QString &fileName, TextEditor::BaseTextEditor *editor = 0); void addLibrary(const QString &fileName, TextEditor::BaseTextEditor *editor = 0);
void runQMake(ProjectExplorer::Project *p, ProjectExplorer::Node *node); void runQMake(ProjectExplorer::Project *p, ProjectExplorer::Node *node);
ProjectExplorer::Node *m_contextNode; ProjectExplorer::Node *m_contextNode = nullptr;
ProjectExplorer::Project *m_contextProject; ProjectExplorer::Project *m_contextProject = nullptr;
ProjectExplorer::FileNode *m_contextFile; ProjectExplorer::FileNode *m_contextFile = nullptr;
}; };
} // namespace QmakeProjectManager } // namespace QmakeProjectManager

6
src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
View File

@@ -76,12 +76,6 @@ using namespace QmakeProjectManager::Internal;
using namespace QmakeProjectManager; using namespace QmakeProjectManager;
using namespace ProjectExplorer; using namespace ProjectExplorer;
QmakeProjectManagerPlugin::QmakeProjectManagerPlugin()
: m_qmakeProjectManager(0), m_previousStartupProject(0), m_previousTarget(0)
{
}
QmakeProjectManagerPlugin::~QmakeProjectManagerPlugin() QmakeProjectManagerPlugin::~QmakeProjectManagerPlugin()
{ {
} }

33
src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h
View File

@@ -59,7 +59,6 @@ class QmakeProjectManagerPlugin : public ExtensionSystem::IPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmakeProjectManager.json") Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmakeProjectManager.json")
public: public:
QmakeProjectManagerPlugin();
~QmakeProjectManagerPlugin(); ~QmakeProjectManagerPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage); bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized(); void extensionsInitialized();
@@ -78,23 +77,23 @@ private slots:
#endif #endif
private: private:
QmakeManager *m_qmakeProjectManager; QmakeManager *m_qmakeProjectManager = nullptr;
QmakeProject *m_previousStartupProject; QmakeProject *m_previousStartupProject = nullptr;
ProjectExplorer::Target *m_previousTarget; ProjectExplorer::Target *m_previousTarget = nullptr;
QAction *m_runQMakeAction; QAction *m_runQMakeAction = nullptr;
QAction *m_runQMakeActionContextMenu; QAction *m_runQMakeActionContextMenu = nullptr;
Utils::ParameterAction *m_buildSubProjectContextMenu; Utils::ParameterAction *m_buildSubProjectContextMenu = nullptr;
QAction *m_subProjectRebuildSeparator; QAction *m_subProjectRebuildSeparator = nullptr;
QAction *m_rebuildSubProjectContextMenu; QAction *m_rebuildSubProjectContextMenu = nullptr;
QAction *m_cleanSubProjectContextMenu; QAction *m_cleanSubProjectContextMenu = nullptr;
QAction *m_buildFileContextMenu; QAction *m_buildFileContextMenu = nullptr;
Utils::ParameterAction *m_buildSubProjectAction; Utils::ParameterAction *m_buildSubProjectAction = nullptr;
Utils::ParameterAction *m_rebuildSubProjectAction; Utils::ParameterAction *m_rebuildSubProjectAction = nullptr;
Utils::ParameterAction *m_cleanSubProjectAction; Utils::ParameterAction *m_cleanSubProjectAction = nullptr;
Utils::ParameterAction *m_buildFileAction; Utils::ParameterAction *m_buildFileAction = nullptr;
QAction *m_addLibraryAction; QAction *m_addLibraryAction = nullptr;
QAction *m_addLibraryActionContextMenu; QAction *m_addLibraryActionContextMenu = nullptr;
Core::Context m_projectContext; Core::Context m_projectContext;
}; };

16
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -75,22 +75,13 @@ const char QMAKE_QMLDEBUGLIB_KEY[] = "QtProjectManager.QMakeBuildStep.LinkQmlDeb
} }
QMakeStep::QMakeStep(BuildStepList *bsl) : QMakeStep::QMakeStep(BuildStepList *bsl) :
AbstractProcessStep(bsl, Core::Id(QMAKE_BS_ID)), AbstractProcessStep(bsl, Core::Id(QMAKE_BS_ID))
m_forced(false),
m_needToRunQMake(false),
m_linkQmlDebuggingLibrary(DebugLink),
m_useQtQuickCompiler(false),
m_separateDebugInfo(false)
{ {
ctor(); ctor();
} }
QMakeStep::QMakeStep(BuildStepList *bsl, Core::Id id) : QMakeStep::QMakeStep(BuildStepList *bsl, Core::Id id) :
AbstractProcessStep(bsl, id), AbstractProcessStep(bsl, id)
m_forced(false),
m_linkQmlDebuggingLibrary(DebugLink),
m_useQtQuickCompiler(false),
m_separateDebugInfo(false)
{ {
ctor(); ctor();
} }
@@ -457,8 +448,7 @@ bool QMakeStep::fromMap(const QVariantMap &map)
//// ////
QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
: BuildStepConfigWidget(), m_ui(new Internal::Ui::QMakeStep), m_step(step), : BuildStepConfigWidget(), m_ui(new Internal::Ui::QMakeStep), m_step(step)
m_ignoreChange(false)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);

40
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -91,25 +91,15 @@ public:
static TargetArchConfig targetArchFor(const ProjectExplorer::Abi &targetAbi, const QtSupport::BaseQtVersion *version); static TargetArchConfig targetArchFor(const ProjectExplorer::Abi &targetAbi, const QtSupport::BaseQtVersion *version);
static OsType osTypeFor(const ProjectExplorer::Abi &targetAbi, const QtSupport::BaseQtVersion *version); static OsType osTypeFor(const ProjectExplorer::Abi &targetAbi, const QtSupport::BaseQtVersion *version);
QMakeStepConfig()
: archConfig(NoArch),
osType(NoOsType),
linkQmlDebuggingQQ1(false),
linkQmlDebuggingQQ2(false),
useQtQuickCompiler(false),
separateDebugInfo(false)
{}
QStringList toArguments() const; QStringList toArguments() const;
// Actual data // Actual data
TargetArchConfig archConfig; TargetArchConfig archConfig = NoArch;
OsType osType; OsType osType = NoOsType;
bool linkQmlDebuggingQQ1; bool linkQmlDebuggingQQ1 = false;
bool linkQmlDebuggingQQ2; bool linkQmlDebuggingQQ2 = false;
bool useQtQuickCompiler; bool useQtQuickCompiler = false;
bool separateDebugInfo; bool separateDebugInfo = false;
}; };
@@ -192,13 +182,13 @@ private:
void ctor(); void ctor();
// last values // last values
bool m_forced; bool m_forced = false;
bool m_needToRunQMake; // set in init(), read in run() bool m_needToRunQMake = false; // set in init(), read in run()
QString m_userArgs; QString m_userArgs;
QmlLibraryLink m_linkQmlDebuggingLibrary; QmlLibraryLink m_linkQmlDebuggingLibrary = DebugLink;
bool m_useQtQuickCompiler; bool m_useQtQuickCompiler = false;
bool m_scriptTemplate; bool m_scriptTemplate = false;
bool m_separateDebugInfo; bool m_separateDebugInfo = false;
}; };
@@ -239,11 +229,11 @@ private:
void setSummaryText(const QString &); void setSummaryText(const QString &);
Internal::Ui::QMakeStep *m_ui; Internal::Ui::QMakeStep *m_ui = nullptr;
QMakeStep *m_step; QMakeStep *m_step = nullptr;
QString m_summaryText; QString m_summaryText;
QString m_additionalSummaryText; QString m_additionalSummaryText;
bool m_ignoreChange; bool m_ignoreChange = false;
}; };
} // namespace QmakeProjectManager } // namespace QmakeProjectManager