ProjectConfiguration: Sprinkle override and explicit over the code

Change-Id: I2aa3a32a0d30f1d122977d94d4109227dea6bbd7
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-13 11:06:27 +01:00
parent ca29cbfc8a
commit 0e278e9efe
52 changed files with 318 additions and 320 deletions

View File

@@ -54,8 +54,8 @@ public:
BundleLibrariesDeployment
};
bool fromMap(const QVariantMap &map);
QVariantMap toMap() const;
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
AndroidDeployAction deployAction() const;
@@ -79,7 +79,7 @@ public:
bool useGradle() const;
void setUseGradle(bool b);
bool runInGuiThread() const;
bool runInGuiThread() const override;
QString buildTargetSdk() const;
void setBuildTargetSdk(const QString &sdk);
@@ -97,10 +97,10 @@ protected:
bool keystorePassword();
bool certificatePassword();
bool init();
ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
bool immutable() const { return true; }
void processFinished(int exitCode, QProcess::ExitStatus status);
bool init() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const override { return true; }
void processFinished(int exitCode, QProcess::ExitStatus status) override;
protected:
AndroidDeployAction m_deployAction;

View File

@@ -81,12 +81,12 @@ public:
ForceUnintall
};
public:
AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc);
explicit AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc);
bool fromMap(const QVariantMap &map);
QVariantMap toMap() const;
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
bool runInGuiThread() const;
bool runInGuiThread() const override;
UninstallType uninstallPreviousPackage();
@@ -103,15 +103,15 @@ private:
void ctor();
void runCommand(const QString &program, const QStringList &arguments);
bool init();
void run(QFutureInterface<bool> &fi);
bool init() override;
void run(QFutureInterface<bool> &fi) override;
enum DeployResult { Success, Failure, AskUinstall };
DeployResult runDeploy(QFutureInterface<bool> &fi);
void slotAskForUninstall();
void slotSetSerialNumber(const QString &serialNumber);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
bool immutable() const { return true; }
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const override { return true; }
void processReadyReadStdOutput();
void stdOutput(const QString &line);

View File

@@ -43,8 +43,8 @@ class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfig
public:
AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
QWidget *createConfigurationWidget();
Utils::OutputFormatter *createOutputFormatter() const;
QWidget *createConfigurationWidget() override;
Utils::OutputFormatter *createOutputFormatter() const override;
const QString remoteChannel() const;
protected: