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

Android: De-Q_OBJECT-ify AndroidPackageInstallationStep

Browse Source 
Change-Id: I49a839405c8b3b61a29c79bf13620a2e98cdca2e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-02-20 17:02:59 +01:00
parent f0fcc4e5c5
commit b6cd57b4f9
2 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -28,13 +28,14 @@
#include "androidconstants.h"
#include "androidmanager.h"
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/target.h>
#include <projectexplorer/abstractprocessstep.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/processparameters.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <utils/hostosinfo.h>
@@ -44,9 +45,38 @@
using namespace ProjectExplorer;
using namespace Utils;
using namespace Android::Internal;
namespace Android {
namespace Internal {
class AndroidPackageInstallationStep final : public AbstractProcessStep
{
Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStep)
public:
AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id);
BuildStepConfigWidget *createConfigWidget() final;
private:
bool init() final;
void doRun() final;
QStringList m_androidDirsToClean;
};
class AndroidPackageInstallationStepWidget final : public BuildStepConfigWidget
{
Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStepWidget)
public:
AndroidPackageInstallationStepWidget(BuildStep *step)
: BuildStepConfigWidget(step)
{
setDisplayName(tr("Make install"));
setSummaryText("<b>" + tr("Make install") + "</b>");
}
};
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id)
: AbstractProcessStep(bsl, id)
@@ -117,20 +147,6 @@ BuildStepConfigWidget *AndroidPackageInstallationStep::createConfigWidget()
return new AndroidPackageInstallationStepWidget(this);
}
//
// AndroidPackageInstallationStepWidget
//
namespace Internal {
AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step)
: BuildStepConfigWidget(step)
{
setDisplayName(tr("Make install"));
setSummaryText("<b>" + tr("Make install") + "</b>");
}
//
// AndroidPackageInstallationStepFactory
//

29
src/plugins/android/androidpackageinstallationstep.h
View File

@@ -25,39 +25,12 @@
#pragma once
#include "android_global.h"
#include <projectexplorer/buildstep.h>
#include <projectexplorer/abstractprocessstep.h>
namespace Android {
class ANDROID_EXPORT AndroidPackageInstallationStep : public ProjectExplorer::AbstractProcessStep
{
Q_OBJECT
public:
AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
private:
bool init() override;
void doRun() override;
QStringList m_androidDirsToClean;
};
namespace Internal {
class AndroidPackageInstallationStepWidget : public ProjectExplorer::BuildStepConfigWidget
{
Q_OBJECT
public:
AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
};
class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory
class AndroidPackageInstallationFactory final : public ProjectExplorer::BuildStepFactory
{
public:
AndroidPackageInstallationFactory();