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

Android: Modernize

Browse Source 
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-equals-default
modernize-use-transparent-functors

Change-Id: I6c9e567edf16cf436c0e0c1239b40f74574a1096
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Alessandro Portale
2018-07-25 12:19:15 +02:00
committed by Vikas Pachdha
parent 02a759d4f5
commit be5c228e5b
42 changed files with 153 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/adbcommandswidget.cpp
View File

@@ -77,9 +77,7 @@ AdbCommandsWidget::AdbCommandsWidget(QWidget *parent) :
{
}
AdbCommandsWidget::~AdbCommandsWidget()
{
}
AdbCommandsWidget::~AdbCommandsWidget() = default;
QStringList AdbCommandsWidget::commandsList() const
{

2
src/plugins/android/adbcommandswidget.h
View File

@@ -40,7 +40,7 @@ class AdbCommandsWidget : public QGroupBox
Q_OBJECT
public:
explicit AdbCommandsWidget(QWidget *parent);
~AdbCommandsWidget();
~AdbCommandsWidget() override;
QStringList commandsList() const;
void setCommandList(const QStringList &commands);

7
src/plugins/android/androidavdmanager.cpp
View File

@@ -234,10 +234,7 @@ AndroidAvdManager::AndroidAvdManager(const AndroidConfig &config):
}
AndroidAvdManager::~AndroidAvdManager()
{
}
AndroidAvdManager::~AndroidAvdManager() = default;
void AndroidAvdManager::launchAvdManagerUiTool() const
{
@@ -296,7 +293,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
.arg(m_config.emulatorToolPath().toString()));
return false;
}
QProcess *avdProcess = new QProcess();
auto avdProcess = new QProcess();
avdProcess->setReadChannelMode(QProcess::MergedChannels);
QObject::connect(avdProcess,
static_cast<void (QProcess::*)(int)>(&QProcess::finished),

4
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -175,7 +175,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
return false;
}
JavaParser *parser = new JavaParser;
auto parser = new JavaParser;
parser->setProjectFileList(Utils::transform(target()->project()->files(ProjectExplorer::Project::AllFiles),
&Utils::FileName::toString));
@@ -469,7 +469,7 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates()
const Utils::SynchronousProcessResponse response
= keytoolProc.run(AndroidConfigurations::currentConfig().keytoolPath().toString(), params);
if (response.result > Utils::SynchronousProcessResponse::FinishedError)
QMessageBox::critical(0, tr("Error"), tr("Failed to run keytool."));
QMessageBox::critical(nullptr, tr("Error"), tr("Failed to run keytool."));
else
model = new CertificatesModel(response.stdOut(), this);

9
src/plugins/android/androidconfigurations.cpp
View File

@@ -312,7 +312,7 @@ void AndroidConfig::updateNdkInformation() const
const QString &fileName = it.next();
m_availableNdkPlatforms.push_back(fileName.midRef(fileName.lastIndexOf(QLatin1Char('-')) + 1).toInt());
}
Utils::sort(m_availableNdkPlatforms, std::greater<int>());
Utils::sort(m_availableNdkPlatforms, std::greater<>());
// detect toolchain host
QStringList hostPatterns;
@@ -1174,10 +1174,7 @@ AndroidConfigurations::AndroidConfigurations()
m_instance = this;
}
AndroidConfigurations::~AndroidConfigurations()
{
}
AndroidConfigurations::~AndroidConfigurations() = default;
static FileName javaHomeForJavac(const FileName &location)
{
@@ -1286,7 +1283,7 @@ void AndroidConfigurations::updateAndroidDevice()
devMgr->removeDevice(Core::Id(Constants::ANDROID_DEVICE_ID));
}
AndroidConfigurations *AndroidConfigurations::m_instance = 0;
AndroidConfigurations *AndroidConfigurations::m_instance = nullptr;
QDebug &operator<<(QDebug &stream, const AndroidDeviceInfo &device)
{

4
src/plugins/android/androidcreatekeystorecertificate.h
View File

@@ -47,8 +47,8 @@ class AndroidCreateKeystoreCertificate : public QDialog
};
public:
explicit AndroidCreateKeystoreCertificate(QWidget *parent = 0);
~AndroidCreateKeystoreCertificate();
explicit AndroidCreateKeystoreCertificate(QWidget *parent = nullptr);
~AndroidCreateKeystoreCertificate() override;
Utils::FileName keystoreFilePath();
QString keystorePassword();
QString certificateAlias();

4
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -131,7 +131,7 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
QTC_ASSERT(deployQtLive || bc, return false);
AndroidBuildApkStep *androidBuildApkStep = AndroidGlobal::buildStep<AndroidBuildApkStep>(bc);
auto androidBuildApkStep = AndroidGlobal::buildStep<AndroidBuildApkStep>(bc);
if (!androidBuildApkStep && !deployQtLive) {
emit addOutput(tr("Cannot find the android build step."), OutputFormat::Stderr);
return false;
@@ -379,7 +379,7 @@ void AndroidDeployQtStep::slotAskForUninstall(DeployErrorCode errorCode)
}
uninstallMsg.append(tr("\nUninstalling the installed package may solve the issue.\nDo you want to uninstall the existing package?"));
int button = QMessageBox::critical(0, tr("Install failed"), uninstallMsg,
int button = QMessageBox::critical(nullptr, tr("Install failed"), uninstallMsg,
QMessageBox::Yes, QMessageBox::No);
m_askForUninstall = button == QMessageBox::Yes;
}

6
src/plugins/android/androiddeployqtwidget.h
View File

@@ -44,15 +44,15 @@ class AndroidDeployQtWidget : public ProjectExplorer::BuildStepConfigWidget
public:
AndroidDeployQtWidget(AndroidDeployQtStep *step);
~AndroidDeployQtWidget();
~AndroidDeployQtWidget() override;
private:
void installMinistro();
void cleanLibsOnDevice();
void resetDefaultDevices();
virtual QString summaryText() const;
virtual QString displayName() const;
QString summaryText() const override;
QString displayName() const override;
Ui::AndroidDeployQtWidget *m_ui;
AndroidDeployQtStep *m_step;

7
src/plugins/android/androiddevice.cpp
View File

@@ -61,10 +61,7 @@ AndroidDevice::AndroidDevice()
setQmlsceneCommand(activityPath);
}
AndroidDevice::AndroidDevice(const AndroidDevice &other)
: IDevice(other)
{ }
AndroidDevice::AndroidDevice(const AndroidDevice &other) = default;
IDevice::DeviceInfo AndroidDevice::deviceInformation() const
{
@@ -78,7 +75,7 @@ QString AndroidDevice::displayType() const
IDeviceWidget *AndroidDevice::createWidget()
{
return 0;
return nullptr;
}
QList<Core::Id> AndroidDevice::actionIds() const

2
src/plugins/android/androiddevice.h
View File

@@ -41,7 +41,7 @@ public:
ProjectExplorer::IDeviceWidget *createWidget() override;
QList<Core::Id> actionIds() const override;
QString displayNameForActionId(Core::Id actionId) const override;
void executeAction(Core::Id actionId, QWidget *parent = 0) override;
void executeAction(Core::Id actionId, QWidget *parent = nullptr) override;
bool canAutoDetectPorts() const override;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
Utils::OsType osType() const override;

44
src/plugins/android/androiddevicedialog.cpp
View File

@@ -107,23 +107,21 @@ class AndroidDeviceModelDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
AndroidDeviceModelDelegate(QObject * parent = 0)
AndroidDeviceModelDelegate(QObject * parent = nullptr)
: QStyledItemDelegate(parent)
{
}
~AndroidDeviceModelDelegate()
{
}
~AndroidDeviceModelDelegate() override = default;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
{
QStyleOptionViewItem opt = option;
initStyleOption(&opt, index);
painter->save();
AndroidDeviceModelNode *node = static_cast<AndroidDeviceModelNode *>(index.internalPointer());
auto node = static_cast<AndroidDeviceModelNode *>(index.internalPointer());
AndroidDeviceInfo device = node->deviceInfo();
painter->setPen(Qt::NoPen);
@@ -221,7 +219,7 @@ public:
painter->restore();
}
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override
{
QStyleOptionViewItem opt = option;
initStyleOption(&opt, index);
@@ -240,12 +238,12 @@ class AndroidDeviceModel : public QAbstractItemModel
public:
AndroidDeviceModel(int apiLevel, const QString &abi);
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const;
QModelIndex parent(const QModelIndex &child) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
Qt::ItemFlags flags(const QModelIndex &index) const;
const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
AndroidDeviceInfo device(QModelIndex index);
void setDevices(const QVector<AndroidDeviceInfo> &devices);
@@ -263,7 +261,7 @@ private:
// AndroidDeviceModel
/////////////////
AndroidDeviceModel::AndroidDeviceModel(int apiLevel, const QString &abi)
: m_apiLevel(apiLevel), m_abi(abi), m_root(0)
: m_apiLevel(apiLevel), m_abi(abi), m_root(nullptr)
{
}
@@ -281,7 +279,7 @@ QModelIndex AndroidDeviceModel::index(int row, int column, const QModelIndex &pa
return createIndex(row, column, m_root->children().at(row));
}
AndroidDeviceModelNode *node = static_cast<AndroidDeviceModelNode *>(parent.internalPointer());
auto node = static_cast<AndroidDeviceModelNode *>(parent.internalPointer());
if (row < node->children().count())
return createIndex(row, column, node->children().at(row));
@@ -294,7 +292,7 @@ QModelIndex AndroidDeviceModel::parent(const QModelIndex &child) const
return QModelIndex();
if (!m_root)
return QModelIndex();
AndroidDeviceModelNode *node = static_cast<AndroidDeviceModelNode *>(child.internalPointer());
auto node = static_cast<AndroidDeviceModelNode *>(child.internalPointer());
if (node == m_root)
return QModelIndex();
AndroidDeviceModelNode *parent = node->parent();
@@ -312,7 +310,7 @@ int AndroidDeviceModel::rowCount(const QModelIndex &parent) const
return 0;
if (!parent.isValid())
return m_root->children().count();
AndroidDeviceModelNode *node = static_cast<AndroidDeviceModelNode *>(parent.internalPointer());
auto node = static_cast<AndroidDeviceModelNode *>(parent.internalPointer());
return node->children().count();
}
@@ -326,7 +324,7 @@ QVariant AndroidDeviceModel::data(const QModelIndex &index, int role) const
{
if (role != Qt::DisplayRole)
return QVariant();
AndroidDeviceModelNode *node = static_cast<AndroidDeviceModelNode *>(index.internalPointer());
auto node = static_cast<AndroidDeviceModelNode *>(index.internalPointer());
if (!node)
return QVariant();
return node->deviceInfo().serialNumber;
@@ -334,7 +332,7 @@ QVariant AndroidDeviceModel::data(const QModelIndex &index, int role) const
Qt::ItemFlags AndroidDeviceModel::flags(const QModelIndex &index) const
{
AndroidDeviceModelNode *node = static_cast<AndroidDeviceModelNode *>(index.internalPointer());
auto node = static_cast<AndroidDeviceModelNode *>(index.internalPointer());
if (node)
if (node->displayName().isEmpty() && node->incompatibleReason().isEmpty())
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
@@ -344,7 +342,7 @@ Qt::ItemFlags AndroidDeviceModel::flags(const QModelIndex &index) const
AndroidDeviceInfo AndroidDeviceModel::device(QModelIndex index)
{
AndroidDeviceModelNode *node = static_cast<AndroidDeviceModelNode *>(index.internalPointer());
auto node = static_cast<AndroidDeviceModelNode *>(index.internalPointer());
if (!node)
return AndroidDeviceInfo();
return node->deviceInfo();
@@ -354,10 +352,10 @@ void AndroidDeviceModel::setDevices(const QVector<AndroidDeviceInfo> &devices)
{
beginResetModel();
delete m_root;
m_root = new AndroidDeviceModelNode(0, QString());
m_root = new AndroidDeviceModelNode(nullptr, QString());
AndroidDeviceModelNode *compatibleDevices = new AndroidDeviceModelNode(m_root, AndroidDeviceDialog::tr("Compatible devices"));
AndroidDeviceModelNode *incompatibleDevices = 0; // created on demand
AndroidDeviceModelNode *incompatibleDevices = nullptr; // created on demand
foreach (const AndroidDeviceInfo &device, devices) {
QString error;
if (device.state == AndroidDeviceInfo::UnAuthorizedState) {
@@ -614,7 +612,7 @@ void AndroidDeviceDialog::enableOkayButton()
void AndroidDeviceDialog::clickedOnView(const QModelIndex &idx)
{
if (idx.isValid()) {
AndroidDeviceModelNode *node = static_cast<AndroidDeviceModelNode *>(idx.internalPointer());
auto node = static_cast<AndroidDeviceModelNode *>(idx.internalPointer());
if (!node->displayName().isEmpty()) {
if (m_ui->deviceView->isExpanded(idx))
m_ui->deviceView->collapse(idx);

4
src/plugins/android/androiddevicedialog.h
View File

@@ -53,8 +53,8 @@ class AndroidDeviceDialog : public QDialog
public:
explicit AndroidDeviceDialog(int apiLevel, const QString &abi,
const QString &serialNumber, QWidget *parent = 0);
~AndroidDeviceDialog();
const QString &serialNumber, QWidget *parent = nullptr);
~AndroidDeviceDialog() override;
AndroidDeviceInfo device();

14
src/plugins/android/androiddevicefactory.h
View File

@@ -36,14 +36,14 @@ class AndroidDeviceFactory : public ProjectExplorer::IDeviceFactory
public:
AndroidDeviceFactory();
QString displayNameForId(Core::Id type) const;
QList<Core::Id> availableCreationIds() const;
QIcon iconForId(Core::Id type) const;
QString displayNameForId(Core::Id type) const override;
QList<Core::Id> availableCreationIds() const override;
QIcon iconForId(Core::Id type) const override;
bool canCreate() const;
ProjectExplorer::IDevice::Ptr create(Core::Id id) const;
bool canRestore(const QVariantMap &map) const;
ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const;
bool canCreate() const override;
ProjectExplorer::IDevice::Ptr create(Core::Id id) const override;
bool canRestore(const QVariantMap &map) const override;
ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const override;
};
} // namespace Internal

12
src/plugins/android/androidextralibrarylistmodel.h
View File

@@ -43,13 +43,13 @@ class ANDROID_EXPORT AndroidExtraLibraryListModel : public QAbstractItemModel
Q_OBJECT
public:
explicit AndroidExtraLibraryListModel(ProjectExplorer::Target *target,
QObject *parent = 0);
QObject *parent = nullptr);
QModelIndex index(int row, int column, const QModelIndex &parent) const;
QModelIndex parent(const QModelIndex &child) const;
int rowCount(const QModelIndex &parent) const;
int columnCount(const QModelIndex &parent) const;
QVariant data(const QModelIndex &index, int role) const;
QModelIndex index(int row, int column, const QModelIndex &parent) const override;
QModelIndex parent(const QModelIndex &child) const override;
int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const override;
QVariant data(const QModelIndex &index, int role) const override;
void removeEntries(QModelIndexList list);
void addEntries(const QStringList &list);

18
src/plugins/android/androidmanager.cpp
View File

@@ -117,7 +117,7 @@ public:
QString name;
};
typedef QMap<QString, Library> LibrariesMap;
using LibrariesMap = QMap<QString, Library>;
static bool openXmlFile(QDomDocument &doc, const Utils::FileName &fileName);
static bool openManifest(ProjectExplorer::Target *target, QDomDocument &doc);
@@ -249,7 +249,7 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit)
QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
{
AndroidBuildApkStep *androidBuildApkStep
auto androidBuildApkStep
= AndroidGlobal::buildStep<AndroidBuildApkStep>(target->activeBuildConfiguration());
if (androidBuildApkStep)
return androidBuildApkStep->buildTargetSdk();
@@ -261,7 +261,7 @@ QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
bool AndroidManager::signPackage(ProjectExplorer::Target *target)
{
AndroidBuildApkStep *androidBuildApkStep
auto androidBuildApkStep
= AndroidGlobal::buildStep<AndroidBuildApkStep>(target->activeBuildConfiguration());
if (androidBuildApkStep)
return androidBuildApkStep->signPackage();
@@ -270,7 +270,7 @@ bool AndroidManager::signPackage(ProjectExplorer::Target *target)
QString AndroidManager::targetArch(ProjectExplorer::Target *target)
{
AndroidQtVersion *qt = static_cast<AndroidQtVersion *>(QtSupport::QtKitInformation::qtVersion(target->kit()));
auto qt = static_cast<AndroidQtVersion *>(QtSupport::QtKitInformation::qtVersion(target->kit()));
return qt->targetArch();
}
@@ -306,7 +306,7 @@ Utils::FileName AndroidManager::defaultPropertiesPath(ProjectExplorer::Target *t
bool AndroidManager::bundleQt(ProjectExplorer::Target *target)
{
AndroidBuildApkStep *androidBuildApkStep
auto androidBuildApkStep
= AndroidGlobal::buildStep<AndroidBuildApkStep>(target->activeBuildConfiguration());
if (androidBuildApkStep)
return !androidBuildApkStep->useMinistro();
@@ -401,7 +401,7 @@ QString AndroidManager::androidNameForApiLevel(int x)
static void raiseError(const QString &reason)
{
QMessageBox::critical(0, AndroidManager::tr("Error creating Android templates."), reason);
QMessageBox::critical(nullptr, AndroidManager::tr("Error creating Android templates."), reason);
}
static bool openXmlFile(QDomDocument &doc, const Utils::FileName &fileName)
@@ -534,10 +534,10 @@ AndroidQtSupport *AndroidManager::androidQtSupport(ProjectExplorer::Target *targ
if (provider->canHandle(target))
return provider;
}
return 0;
return nullptr;
}
typedef QMap<QByteArray, QByteArray> GradleProperties;
using GradleProperties = QMap<QByteArray, QByteArray>;
static GradleProperties readGradleProperties(const QString &path)
{
@@ -663,7 +663,7 @@ int AndroidManager::findApiLevel(const Utils::FileName &platformPath)
void AndroidManager::runAdbCommandDetached(const QStringList &args)
{
QProcess *process = new QProcess();
auto process = new QProcess();
connect(process, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
process, &QObject::deleteLater);
const QString adb = AndroidConfigurations::currentConfig().adbToolPath().toString();

2
src/plugins/android/androidmanifesteditor.cpp
View File

@@ -38,7 +38,7 @@ using namespace Android;
using namespace Internal;
AndroidManifestEditor::AndroidManifestEditor(AndroidManifestEditorWidget *editorWidget)
: Core::IEditor(editorWidget), m_toolBar(0)
: Core::IEditor(editorWidget), m_toolBar(nullptr)
{
m_toolBar = new QToolBar(editorWidget);
m_actionGroup = new QActionGroup(this);

2
src/plugins/android/androidmanifesteditorfactory.cpp
View File

@@ -49,6 +49,6 @@ AndroidManifestEditorFactory::AndroidManifestEditorFactory()
Core::IEditor *AndroidManifestEditorFactory::createEditor()
{
AndroidManifestEditorWidget *androidManifestEditorWidget = new AndroidManifestEditorWidget();
auto androidManifestEditorWidget = new AndroidManifestEditorWidget();
return androidManifestEditorWidget->editor();
}

2
src/plugins/android/androidmanifesteditorfactory.h
View File

@@ -37,7 +37,7 @@ class AndroidManifestEditorFactory : public Core::IEditorFactory
public:
AndroidManifestEditorFactory();
Core::IEditor *createEditor();
Core::IEditor *createEditor() override;
};
} // namespace Internal

22
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -93,7 +93,7 @@ Project *androidProject(const Utils::FileName &fileName)
&& fileName.isChildOf(project->projectDirectory()))
return project;
}
return 0;
return nullptr;
}
} // anonymous namespace
@@ -127,15 +127,15 @@ void AndroidManifestEditorWidget::initializePage()
{
QWidget *mainWidget = new QWidget; // different name
QVBoxLayout *topLayout = new QVBoxLayout(mainWidget);
auto topLayout = new QVBoxLayout(mainWidget);
QGroupBox *packageGroupBox = new QGroupBox(mainWidget);
auto packageGroupBox = new QGroupBox(mainWidget);
topLayout->addWidget(packageGroupBox);
auto setDirtyFunc = [this] { setDirty(); };
packageGroupBox->setTitle(tr("Package"));
{
QFormLayout *formLayout = new QFormLayout();
auto formLayout = new QFormLayout();
m_packageNameLineEdit = new QLineEdit(packageGroupBox);
m_packageNameLineEdit->setToolTip(tr(
@@ -161,7 +161,7 @@ void AndroidManifestEditorWidget::initializePage()
m_packageNameWarningIcon->setVisible(false);
m_packageNameWarningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
QHBoxLayout *warningRow = new QHBoxLayout;
auto warningRow = new QHBoxLayout;
warningRow->setMargin(0);
warningRow->addWidget(m_packageNameWarningIcon);
warningRow->addWidget(m_packageNameWarning);
@@ -213,12 +213,12 @@ void AndroidManifestEditorWidget::initializePage()
}
// Application
QGroupBox *applicationGroupBox = new QGroupBox(mainWidget);
auto applicationGroupBox = new QGroupBox(mainWidget);
topLayout->addWidget(applicationGroupBox);
applicationGroupBox->setTitle(tr("Application"));
{
QFormLayout *formLayout = new QFormLayout();
auto formLayout = new QFormLayout();
m_appNameLineEdit = new QLineEdit(applicationGroupBox);
formLayout->addRow(tr("Application name:"), m_appNameLineEdit);
@@ -232,7 +232,7 @@ void AndroidManifestEditorWidget::initializePage()
m_targetLineEdit->installEventFilter(this);
formLayout->addRow(tr("Run:"), m_targetLineEdit);
QHBoxLayout *iconLayout = new QHBoxLayout();
auto iconLayout = new QHBoxLayout();
m_lIconButton = new QToolButton(applicationGroupBox);
m_lIconButton->setMinimumSize(QSize(48, 48));
m_lIconButton->setMaximumSize(QSize(48, 48));
@@ -276,12 +276,12 @@ void AndroidManifestEditorWidget::initializePage()
// Permissions
QGroupBox *permissionsGroupBox = new QGroupBox(mainWidget);
auto permissionsGroupBox = new QGroupBox(mainWidget);
topLayout->addWidget(permissionsGroupBox);
permissionsGroupBox->setTitle(tr("Permissions"));
{
QGridLayout *layout = new QGridLayout(permissionsGroupBox);
auto layout = new QGridLayout(permissionsGroupBox);
m_defaultPermissonsCheckBox = new QCheckBox(this);
m_defaultPermissonsCheckBox->setText(tr("Include default permissions for Qt modules."));
@@ -459,7 +459,7 @@ void AndroidManifestEditorWidget::initializePage()
topLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::MinimumExpanding));
QScrollArea *mainWidgetScrollArea = new QScrollArea;
auto mainWidgetScrollArea = new QScrollArea;
mainWidgetScrollArea->setWidgetResizable(true);
mainWidgetScrollArea->setWidget(mainWidget);
mainWidgetScrollArea->setFocusProxy(m_packageNameLineEdit);

12
src/plugins/android/androidmanifesteditorwidget.h
View File

@@ -58,16 +58,16 @@ class PermissionsModel: public QAbstractListModel
{
Q_OBJECT
public:
PermissionsModel(QObject *parent = 0 );
PermissionsModel(QObject *parent = nullptr);
void setPermissions(const QStringList &permissions);
const QStringList &permissions();
QModelIndex addPermission(const QString &permission);
bool updatePermission(const QModelIndex &index, const QString &permission);
void removePermission(int index);
QVariant data(const QModelIndex &index, int role) const;
QVariant data(const QModelIndex &index, int role) const override;
protected:
int rowCount(const QModelIndex &parent) const;
int rowCount(const QModelIndex &parent) const override;
private:
QStringList m_permissions;
@@ -77,7 +77,7 @@ class AndroidManifestTextEditorWidget : public TextEditor::TextEditorWidget
{
public:
explicit AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent);
~AndroidManifestTextEditorWidget();
~AndroidManifestTextEditorWidget() override;
private:
Core::IContext *m_context;
@@ -111,8 +111,8 @@ signals:
void guiChanged();
protected:
bool eventFilter(QObject *obj, QEvent *event);
void focusInEvent(QFocusEvent *event);
bool eventFilter(QObject *obj, QEvent *event) override;
void focusInEvent(QFocusEvent *event) override;
private:
void setLDPIIcon();

2
src/plugins/android/androidqtsupport.cpp
View File

@@ -37,7 +37,7 @@ Utils::FileName Android::AndroidQtSupport::apkPath(const ProjectExplorer::Target
if (!target)
return Utils::FileName();
AndroidBuildApkStep *buildApkStep
auto buildApkStep
= Android::AndroidGlobal::buildStep<AndroidBuildApkStep>(target->activeBuildConfiguration());
if (!buildApkStep)

22
src/plugins/android/androidqtversion.h
View File

@@ -40,23 +40,23 @@ public:
AndroidQtVersion();
AndroidQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString());
AndroidQtVersion *clone() const;
QString type() const;
bool isValid() const;
QString invalidReason() const;
AndroidQtVersion *clone() const override;
QString type() const override;
bool isValid() const override;
QString invalidReason() const override;
QList<ProjectExplorer::Abi> detectQtAbis() const;
QList<ProjectExplorer::Abi> detectQtAbis() const override;
void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const;
Utils::Environment qmakeRunEnvironment() const;
void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
Utils::Environment qmakeRunEnvironment() const override;
QSet<Core::Id> availableFeatures() const;
QSet<Core::Id> targetDeviceTypes() const;
QSet<Core::Id> availableFeatures() const override;
QSet<Core::Id> targetDeviceTypes() const override;
QString description() const;
QString description() const override;
QString targetArch() const;
protected:
virtual void parseMkSpec(ProFileEvaluator *) const;
void parseMkSpec(ProFileEvaluator *) const override;
private:
mutable QString m_targetArch;
};

10
src/plugins/android/androidqtversionfactory.cpp
View File

@@ -48,8 +48,8 @@ bool AndroidQtVersionFactory::canRestore(const QString &type)
QtSupport::BaseQtVersion *AndroidQtVersionFactory::restore(const QString &type,
const QVariantMap &data)
{
QTC_ASSERT(canRestore(type), return 0);
AndroidQtVersion *v = new AndroidQtVersion;
QTC_ASSERT(canRestore(type), return nullptr);
auto v = new AndroidQtVersion;
v->fromMap(data);
return v;
}
@@ -63,12 +63,12 @@ QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName
{
QFileInfo fi = qmakePath.toFileInfo();
if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0;
return nullptr;
if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android"))
&& evaluator->value(QLatin1String("QMAKE_PLATFORM")) != QLatin1String("android"))
return 0;
return nullptr;
if (evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android-no-sdk")))
return 0;
return nullptr;
return new AndroidQtVersion(qmakePath, isAutoDetected, autoDetectionSource);
}

10
src/plugins/android/androidqtversionfactory.h
View File

@@ -33,14 +33,14 @@ namespace Internal {
class AndroidQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
explicit AndroidQtVersionFactory(QObject *parent = 0);
explicit AndroidQtVersionFactory(QObject *parent = nullptr);
bool canRestore(const QString &type);
QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data);
bool canRestore(const QString &type) override;
QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) override;
int priority() const;
int priority() const override;
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false, const QString &autoDetectionSource = QString());
bool isAutoDetected = false, const QString &autoDetectionSource = QString()) override;
};
} // namespace Internal

2
src/plugins/android/androidsdkmanager.cpp
View File

@@ -514,7 +514,7 @@ void SdkManagerOutputParser::compilePackageAssociations()
return platform && platform->apiLevel() == imageApi;
});
if (itr != m_packages.end()) {
SdkPlatform *platform = static_cast<SdkPlatform*>(*itr);
auto platform = static_cast<SdkPlatform*>(*itr);
platform->addSystemImage(static_cast<SystemImage *>(image));
}
}

2
src/plugins/android/androidsdkmanager.h
View File

@@ -62,7 +62,7 @@ public:
};
AndroidSdkManager(const AndroidConfig &config, QObject *parent = nullptr);
~AndroidSdkManager();
~AndroidSdkManager() override;
SdkPlatformList installedSdkPlatforms();
const AndroidSdkPackageList &allSdkPackages();

4
src/plugins/android/androidsdkmanagerwidget.h
View File

@@ -55,7 +55,7 @@ class OptionsDialog : public QDialog
public:
OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
QWidget *parent = nullptr);
~OptionsDialog();
~OptionsDialog() override;
QStringList sdkManagerArguments() const;
@@ -78,7 +78,7 @@ class AndroidSdkManagerWidget : public QWidget
public:
AndroidSdkManagerWidget(AndroidConfig &config, AndroidSdkManager *sdkManager,
QWidget *parent = nullptr);
~AndroidSdkManagerWidget();
~AndroidSdkManagerWidget() override;
void setSdkManagerControlsEnabled(bool enable);
void installEssentials();

2
src/plugins/android/androidsdkmodel.h
View File

@@ -52,7 +52,7 @@ public:
};
explicit AndroidSdkModel(const AndroidConfig &config, AndroidSdkManager *sdkManager,
QObject *parent = 0);
QObject *parent = nullptr);
// QAbstractItemModel overrides.
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;

2
src/plugins/android/androidsdkpackage.cpp
View File

@@ -164,7 +164,7 @@ bool SdkPlatform::operator <(const AndroidSdkPackage &other) const
if (typeid(*this) != typeid(other))
return AndroidSdkPackage::operator <(other);
const SdkPlatform &platform = static_cast<const SdkPlatform &>(other);
const auto &platform = static_cast<const SdkPlatform &>(other);
if (platform.m_apiLevel == m_apiLevel)
return AndroidSdkPackage::operator <(other);

2
src/plugins/android/androidsdkpackage.h
View File

@@ -65,7 +65,7 @@ public:
};
AndroidSdkPackage(QVersionNumber revision, QString sdkStylePathStr, QObject *parent = nullptr);
~AndroidSdkPackage() override { }
~AndroidSdkPackage() override = default;
virtual bool isValid() const = 0;
virtual PackageType type() const = 0;

8
src/plugins/android/androidsettingspage.h
View File

@@ -39,11 +39,11 @@ class AndroidSettingsPage : public Core::IOptionsPage
Q_OBJECT
public:
explicit AndroidSettingsPage(QObject *parent = 0);
explicit AndroidSettingsPage(QObject *parent = nullptr);
QWidget *widget();
void apply();
void finish();
QWidget *widget() override;
void apply() override;
void finish() override;
private:
QPointer<AndroidSettingsWidget> m_widget;

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -564,7 +564,7 @@ void AndroidSettingsWidget::checkMissingQtVersion()
m_ui->kitWarningDetails->setVisible(isArchMissing);
if (isArchMissing) {
m_ui->kitWarningDetails->setSummaryText(tr("Cannot create kits for all architectures."));
QLabel *detailsLabel = static_cast<QLabel *>(m_ui->kitWarningDetails->widget());
auto detailsLabel = static_cast<QLabel *>(m_ui->kitWarningDetails->widget());
QStringList archNames;
for (auto abi : missingQtArchs)
archNames << abi.toString();

12
src/plugins/android/androidsettingswidget.h
View File

@@ -55,10 +55,10 @@ public:
QModelIndex indexForAvdName(const QString &avdName) const;
protected:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
private:
AndroidDeviceInfoList m_list;
@@ -69,8 +69,8 @@ class AndroidSettingsWidget : public QWidget
Q_OBJECT
public:
// Todo: This would be so much simpler if it just used Utils::PathChooser!!!
AndroidSettingsWidget(QWidget *parent = 0);
~AndroidSettingsWidget();
AndroidSettingsWidget(QWidget *parent = nullptr);
~AndroidSettingsWidget() override;
void saveSettings();

10
src/plugins/android/androidsignaloperation.h
View File

@@ -38,11 +38,11 @@ class AndroidSignalOperation : public ProjectExplorer::DeviceProcessSignalOperat
{
Q_OBJECT
public:
~AndroidSignalOperation() {}
void killProcess(qint64 pid);
void killProcess(const QString &filePath);
void interruptProcess(qint64 pid);
void interruptProcess(const QString &filePath);
~AndroidSignalOperation() override = default;
void killProcess(qint64 pid) override;
void killProcess(const QString &filePath) override;
void interruptProcess(qint64 pid) override;
void interruptProcess(const QString &filePath) override;
protected:
explicit AndroidSignalOperation();

14
src/plugins/android/androidtoolchain.cpp
View File

@@ -84,13 +84,9 @@ AndroidToolChain::AndroidToolChain()
{
}
AndroidToolChain::AndroidToolChain(const AndroidToolChain &tc) :
GccToolChain(tc), m_ndkToolChainVersion(tc.m_ndkToolChainVersion),
m_secondaryToolChain(tc.m_secondaryToolChain)
{ }
AndroidToolChain::AndroidToolChain(const AndroidToolChain &tc) = default;
AndroidToolChain::~AndroidToolChain()
{ }
AndroidToolChain::~AndroidToolChain() = default;
static QString getArch(const QString &triple)
{
@@ -342,12 +338,12 @@ bool AndroidToolChainFactory::canRestore(const QVariantMap &data)
ToolChain *AndroidToolChainFactory::restore(const QVariantMap &data)
{
AndroidToolChain *tc = new AndroidToolChain();
auto tc = new AndroidToolChain();
if (tc->fromMap(data))
return tc;
delete tc;
return 0;
return nullptr;
}
QList<AndroidToolChainFactory::AndroidToolChainInformation> AndroidToolChainFactory::toolchainPathsForNdk(const FileName &ndkPath)
@@ -490,7 +486,7 @@ AndroidToolChainFactory::autodetectToolChainsForNdk(const FileName &ndkPath,
}
foreach (ToolChain *tc, result) {
AndroidToolChain *atc = static_cast<AndroidToolChain *>(tc);
auto atc = static_cast<AndroidToolChain *>(tc);
atc->setSecondaryToolChain(!newestToolChainForArch.value(atc->targetAbi()).contains(atc));
}

5
src/plugins/android/androidtoolmanager.cpp
View File

@@ -92,10 +92,7 @@ AndroidToolManager::AndroidToolManager(const AndroidConfig &config) :
}
AndroidToolManager::~AndroidToolManager()
{
}
AndroidToolManager::~AndroidToolManager() = default;
SdkPlatformList AndroidToolManager::availableSdkPlatforms(bool *ok) const
{

4
src/plugins/android/avddialog.cpp
View File

@@ -57,7 +57,7 @@ AvdDialog::AvdDialog(int minApiLevel, AndroidSdkManager *sdkManager, const QStri
m_avdDialog.abiComboBox->addItems(QStringList(targetArch));
}
QRegExpValidator *v = new QRegExpValidator(m_allowedNameChars, this);
auto v = new QRegExpValidator(m_allowedNameChars, this);
m_avdDialog.nameLineEdit->setValidator(v);
m_avdDialog.nameLineEdit->installEventFilter(this);
@@ -155,7 +155,7 @@ void AvdDialog::updateApiLevelComboBox()
bool AvdDialog::eventFilter(QObject *obj, QEvent *event)
{
if (obj == m_avdDialog.nameLineEdit && event->type() == QEvent::KeyPress) {
QKeyEvent *ke = static_cast<QKeyEvent *>(event);
auto ke = static_cast<QKeyEvent *>(event);
const QString key = ke->text();
if (!key.isEmpty() && !m_allowedNameChars.exactMatch(key)) {
QPoint position = m_avdDialog.nameLineEdit->parentWidget()->mapToGlobal(m_avdDialog.nameLineEdit->geometry().bottomLeft());

4
src/plugins/android/avddialog.h
View File

@@ -41,7 +41,7 @@ class AvdDialog : public QDialog
Q_OBJECT
public:
explicit AvdDialog(int minApiLevel, AndroidSdkManager *sdkManager, const QString &targetArch,
QWidget *parent = 0);
QWidget *parent = nullptr);
const SdkPlatform *sdkPlatform() const;
QString name() const;
@@ -53,7 +53,7 @@ public:
private:
void updateApiLevelComboBox();
bool eventFilter(QObject *obj, QEvent *event);
bool eventFilter(QObject *obj, QEvent *event) override;
Ui::AddNewAVDDialog m_avdDialog;
AndroidSdkManager *m_sdkManager;

4
src/plugins/android/certificatesmodel.h
View File

@@ -39,9 +39,9 @@ public:
CertificatesModel(const QString &rowCertificates, QObject *parent);
protected:
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
private:
QVector<QPair<QString, QString> > m_certs;

16
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -58,7 +58,7 @@ namespace Android {
NoApplicationProFilePage::NoApplicationProFilePage(CreateAndroidManifestWizard *wizard)
: m_wizard(wizard)
{
QVBoxLayout *layout = new QVBoxLayout(this);
auto layout = new QVBoxLayout(this);
QLabel *label = new QLabel(this);
label->setWordWrap(true);
label->setText(tr("No application .pro file found in this project."));
@@ -72,7 +72,7 @@ NoApplicationProFilePage::NoApplicationProFilePage(CreateAndroidManifestWizard *
ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard)
: m_wizard(wizard)
{
QFormLayout *fl = new QFormLayout(this);
auto fl = new QFormLayout(this);
QLabel *label = new QLabel(this);
label->setWordWrap(true);
label->setText(tr("Select the .pro file for which you want to create the Android template files."));
@@ -111,7 +111,7 @@ void ChooseProFilePage::nodeSelected(int index)
// ChooseDirectoryPage
//
ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
: m_wizard(wizard), m_androidPackageSourceDir(0), m_complete(true)
: m_wizard(wizard), m_androidPackageSourceDir(nullptr), m_complete(true)
{
m_layout = new QFormLayout(this);
m_label = new QLabel(this);
@@ -132,7 +132,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
m_warningIcon->setWordWrap(true);
m_warningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
QHBoxLayout *hbox = new QHBoxLayout;
auto hbox = new QHBoxLayout;
hbox->addWidget(m_warningIcon);
hbox->addWidget(m_sourceDirectoryWarning);
hbox->setAlignment(m_warningIcon, Qt::AlignTop);
@@ -143,7 +143,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
m_wizard, &CreateAndroidManifestWizard::setDirectory);
if (wizard->copyGradle()) {
QCheckBox *checkBox = new QCheckBox(this);
auto checkBox = new QCheckBox(this);
checkBox->setChecked(true);
connect(checkBox, &QCheckBox::toggled, wizard, &CreateAndroidManifestWizard::setCopyGradle);
checkBox->setText(tr("Copy the Gradle files to Android directory"));
@@ -324,21 +324,21 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
.append(QLatin1String("/src/android/java/AndroidManifest.xml")));
FileUtils::copyRecursively(FileName::fromString(src),
FileName::fromString(m_directory + QLatin1String("/AndroidManifest.xml")),
0, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
nullptr, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
} else {
const QString src(version->qmakeProperty("QT_INSTALL_PREFIX")
.append(QLatin1String("/src/android/templates")));
FileUtils::copyRecursively(FileName::fromString(src),
FileName::fromString(m_directory),
0, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
nullptr, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
if (m_copyGradle) {
FileName gradlePath = FileName::fromString(version->qmakeProperty("QT_INSTALL_PREFIX").append(QLatin1String("/src/3rdparty/gradle")));
if (!gradlePath.exists())
gradlePath = AndroidConfigurations::currentConfig().sdkLocation().appendPath(QLatin1String("/tools/templates/gradle/wrapper"));
FileUtils::copyRecursively(gradlePath, FileName::fromString(m_directory),
0, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
nullptr, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
}
AndroidManager::updateGradleProperties(m_target);

7
src/plugins/android/javaindenter.cpp
View File

@@ -31,12 +31,9 @@
using namespace Android;
using namespace Android::Internal;
JavaIndenter::JavaIndenter()
{
}
JavaIndenter::JavaIndenter() = default;
JavaIndenter::~JavaIndenter()
{}
JavaIndenter::~JavaIndenter() = default;
bool JavaIndenter::isElectricCharacter(const QChar &ch) const
{

4
src/plugins/android/javaparser.h
View File

@@ -39,8 +39,8 @@ class JavaParser : public ProjectExplorer::IOutputParser
public:
JavaParser();
void stdOutput(const QString &line);
void stdError(const QString &line);
void stdOutput(const QString &line) override;
void stdError(const QString &line) override;
void setProjectFileList(const QStringList &fileList);
void setBuildDirectory(const Utils::FileName &buildDirectory);