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

Android: Use Qt5-style connects

Browse Source 
The heavy lifting was done by clazy.

Change-Id: Id09b62b7b9812d9c0981202c257d18387a8b09d9
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Orgad Shaneh
2016-06-26 22:52:59 +03:00
committed by Orgad Shaneh
parent c3acbc46ed
commit 88dfa84fc6
40 changed files with 243 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,13 +79,11 @@ public:
void setBuildTargetSdk(const QString &sdk);
virtual Utils::FileName androidPackageSourceDir() const = 0;
public slots:
void setDeployAction(AndroidDeployAction deploy);
protected slots:
void showInGraphicalShell();
protected:
Q_INVOKABLE void showInGraphicalShell();
AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc,
AndroidBuildApkStep *other);
bool keystorePassword();

60
src/plugins/android/androidbuildapkwidget.cpp
View File

@@ -96,37 +96,47 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
m_ui->openPackageLocationCheckBox->setChecked(m_step->openPackageLocation());
// target sdk
connect(m_ui->targetSDKComboBox, SIGNAL(activated(QString)), SLOT(setTargetSdk(QString)));
connect(m_ui->targetSDKComboBox,
static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
this, &AndroidBuildApkWidget::setTargetSdk);
// deployment options
connect(m_ui->ministroOption, SIGNAL(clicked()), SLOT(setMinistro()));
connect(m_ui->temporaryQtOption, SIGNAL(clicked()), SLOT(setDeployLocalQtLibs()));
connect(m_ui->bundleQtOption, SIGNAL(clicked()), SLOT(setBundleQtLibs()));
connect(m_ui->ministroOption, SIGNAL(clicked()), SLOT(updateDebugDeploySigningWarning()));
connect(m_ui->temporaryQtOption, SIGNAL(clicked()), SLOT(updateDebugDeploySigningWarning()));
connect(m_ui->bundleQtOption, SIGNAL(clicked()), SLOT(updateDebugDeploySigningWarning()));
connect(m_ui->ministroOption, &QAbstractButton::clicked,
this, &AndroidBuildApkWidget::setMinistro);
connect(m_ui->temporaryQtOption, &QAbstractButton::clicked,
this, &AndroidBuildApkWidget::setDeployLocalQtLibs);
connect(m_ui->bundleQtOption, &QAbstractButton::clicked,
this, &AndroidBuildApkWidget::setBundleQtLibs);
connect(m_ui->ministroOption, &QAbstractButton::clicked,
this, &AndroidBuildApkWidget::updateDebugDeploySigningWarning);
connect(m_ui->temporaryQtOption, &QAbstractButton::clicked,
this, &AndroidBuildApkWidget::updateDebugDeploySigningWarning);
connect(m_ui->bundleQtOption, &QAbstractButton::clicked,
this, &AndroidBuildApkWidget::updateDebugDeploySigningWarning);
connect(m_ui->useGradleCheckBox, SIGNAL(toggled(bool)),
this, SLOT(useGradleCheckBoxToggled(bool)));
connect(m_ui->openPackageLocationCheckBox, SIGNAL(toggled(bool)),
this, SLOT(openPackageLocationCheckBoxToggled(bool)));
connect(m_ui->verboseOutputCheckBox, SIGNAL(toggled(bool)),
this, SLOT(verboseOutputCheckBoxToggled(bool)));
connect(m_ui->useGradleCheckBox, &QAbstractButton::toggled,
this, &AndroidBuildApkWidget::useGradleCheckBoxToggled);
connect(m_ui->openPackageLocationCheckBox, &QAbstractButton::toggled,
this, &AndroidBuildApkWidget::openPackageLocationCheckBoxToggled);
connect(m_ui->verboseOutputCheckBox, &QAbstractButton::toggled,
this, &AndroidBuildApkWidget::verboseOutputCheckBoxToggled);
//signing
connect(m_ui->signPackageCheckBox, SIGNAL(toggled(bool)),
this, SLOT(signPackageCheckBoxToggled(bool)));
connect(m_ui->KeystoreCreatePushButton, SIGNAL(clicked()),
this, SLOT(createKeyStore()));
connect(m_ui->KeystoreLocationPathChooser, SIGNAL(pathChanged(QString)),
SLOT(updateKeyStorePath(QString)));
connect(m_ui->certificatesAliasComboBox, SIGNAL(activated(QString)),
this, SLOT(certificatesAliasComboBoxActivated(QString)));
connect(m_ui->certificatesAliasComboBox, SIGNAL(currentIndexChanged(QString)),
this, SLOT(certificatesAliasComboBoxCurrentIndexChanged(QString)));
connect(m_ui->signPackageCheckBox, &QAbstractButton::toggled,
this, &AndroidBuildApkWidget::signPackageCheckBoxToggled);
connect(m_ui->KeystoreCreatePushButton, &QAbstractButton::clicked,
this, &AndroidBuildApkWidget::createKeyStore);
connect(m_ui->KeystoreLocationPathChooser, &Utils::PathChooser::pathChanged,
this, &AndroidBuildApkWidget::updateKeyStorePath);
connect(m_ui->certificatesAliasComboBox,
static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
this, &AndroidBuildApkWidget::certificatesAliasComboBoxActivated);
connect(m_ui->certificatesAliasComboBox,
static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
this, &AndroidBuildApkWidget::certificatesAliasComboBoxCurrentIndexChanged);
connect(m_step->buildConfiguration(), SIGNAL(buildTypeChanged()),
this, SLOT(updateSigningWarning()));
connect(m_step->buildConfiguration(), &ProjectExplorer::BuildConfiguration::buildTypeChanged,
this, &AndroidBuildApkWidget::updateSigningWarning);
updateSigningWarning();
updateDebugDeploySigningWarning();

3
src/plugins/android/androidbuildapkwidget.h
View File

@@ -49,7 +49,7 @@ public:
AndroidBuildApkWidget(AndroidBuildApkStep *step);
~AndroidBuildApkWidget();
private slots:
private:
void setTargetSdk(const QString &sdk);
void setMinistro();
void setDeployLocalQtLibs();
@@ -65,7 +65,6 @@ private slots:
void updateKeyStorePath(const QString &path);
void signPackageCheckBoxToggled(bool checked);
private:
virtual QString summaryText() const;
virtual QString displayName() const;
void setCertificates();

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

@@ -776,7 +776,8 @@ QString AndroidConfig::startAVD(const QString &name) const
bool AndroidConfig::startAVDAsync(const QString &avdName) const
{
QProcess *avdProcess = new QProcess();
avdProcess->connect(avdProcess, SIGNAL(finished(int)), avdProcess, SLOT(deleteLater()));
QObject::connect(avdProcess, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
avdProcess, &QObject::deleteLater);
// start the emulator
QStringList arguments;

1
src/plugins/android/androidconfigurations.h
View File

@@ -224,7 +224,6 @@ public:
static AndroidDeviceInfo showDeviceDialog(ProjectExplorer::Project *project, int apiLevel, const QString &abi, Options options);
static void setDefaultDevice(ProjectExplorer::Project *project, const QString &abi, const QString &serialNumber); // serial number or avd name
static QString defaultDevice(ProjectExplorer::Project *project, const QString &abi); // serial number or avd name
public slots:
static void clearDefaultDevices(ProjectExplorer::Project *project);
static void registerNewToolChains();
static void removeOldToolChains();

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

@@ -39,12 +39,18 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare
ui(new Ui::AndroidCreateKeystoreCertificate)
{
ui->setupUi(this);
connect(ui->keystorePassLineEdit, SIGNAL(textChanged(QString)), this, SLOT(checkKeystorePassword()));
connect(ui->keystoreRetypePassLineEdit, SIGNAL(textChanged(QString)), this, SLOT(checkKeystorePassword()));
connect(ui->certificatePassLineEdit, SIGNAL(textChanged(QString)), this, SLOT(checkCertificatePassword()));
connect(ui->certificateRetypePassLineEdit, SIGNAL(textChanged(QString)), this, SLOT(checkCertificatePassword()));
connect(ui->certificateAliasLineEdit, SIGNAL(textChanged(QString)), this, SLOT(checkCertificateAlias()));
connect(ui->countryLineEdit, SIGNAL(textChanged(QString)), this, SLOT(checkCountryCode()));
connect(ui->keystorePassLineEdit, &QLineEdit::textChanged,
this, &AndroidCreateKeystoreCertificate::checkKeystorePassword);
connect(ui->keystoreRetypePassLineEdit, &QLineEdit::textChanged,
this, &AndroidCreateKeystoreCertificate::checkKeystorePassword);
connect(ui->certificatePassLineEdit, &QLineEdit::textChanged,
this, &AndroidCreateKeystoreCertificate::checkCertificatePassword);
connect(ui->certificateRetypePassLineEdit, &QLineEdit::textChanged,
this, &AndroidCreateKeystoreCertificate::checkCertificatePassword);
connect(ui->certificateAliasLineEdit, &QLineEdit::textChanged,
this, &AndroidCreateKeystoreCertificate::checkCertificateAlias);
connect(ui->countryLineEdit, &QLineEdit::textChanged,
this, &AndroidCreateKeystoreCertificate::checkCountryCode);
}
AndroidCreateKeystoreCertificate::~AndroidCreateKeystoreCertificate()

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

@@ -54,11 +54,13 @@ public:
QString certificateAlias();
QString certificatePassword();
private slots:
private:
PasswordStatus checkKeystorePassword();
PasswordStatus checkCertificatePassword();
bool checkCertificateAlias();
bool checkCountryCode();
private slots:
void on_keystoreShowPassCheckBox_stateChanged(int state);
void on_certificateShowPassCheckBox_stateChanged(int state);
void on_buttonBox_accepted();

1
src/plugins/android/androiddeployqtstep.h
View File

@@ -77,7 +77,6 @@ public:
AndroidDeviceInfo deviceInfo() const;
public slots:
void setUninstallPreviousPackage(bool uninstall);
signals:

13
src/plugins/android/androiddeployqtwidget.cpp
View File

@@ -44,11 +44,14 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
m_ui->uninstallPreviousPackage->setEnabled(m_step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
connect(m_ui->installMinistroButton, SIGNAL(clicked()), SLOT(installMinistro()));
connect(m_ui->cleanLibsPushButton, SIGNAL(clicked()), SLOT(cleanLibsOnDevice()));
connect(m_ui->resetDefaultDevices, SIGNAL(clicked()), SLOT(resetDefaultDevices()));
connect(m_ui->uninstallPreviousPackage, SIGNAL(toggled(bool)),
m_step, SLOT(setUninstallPreviousPackage(bool)));
connect(m_ui->installMinistroButton, &QAbstractButton::clicked,
this, &AndroidDeployQtWidget::installMinistro);
connect(m_ui->cleanLibsPushButton, &QAbstractButton::clicked,
this, &AndroidDeployQtWidget::cleanLibsOnDevice);
connect(m_ui->resetDefaultDevices, &QAbstractButton::clicked,
this, &AndroidDeployQtWidget::resetDefaultDevices);
connect(m_ui->uninstallPreviousPackage, &QAbstractButton::toggled,
m_step, &AndroidDeployQtStep::setUninstallPreviousPackage);
}

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

@@ -46,12 +46,11 @@ public:
AndroidDeployQtWidget(AndroidDeployQtStep *step);
~AndroidDeployQtWidget();
private slots:
private:
void installMinistro();
void cleanLibsOnDevice();
void resetDefaultDevices();
private:
virtual QString summaryText() const;
virtual QString displayName() const;

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

@@ -439,19 +439,19 @@ AndroidDeviceDialog::AndroidDeviceDialog(int apiLevel, const QString &abi, Andro
+ tr("No Device Found") + QLatin1String("</span></p><br/>")
+ msgConnect() + QLatin1String("<br/>")
+ msgAdbListDevices());
connect(m_ui->missingLabel, SIGNAL(linkActivated(QString)),
this, SLOT(showHelp()));
connect(m_ui->missingLabel, &QLabel::linkActivated,
this, &AndroidDeviceDialog::showHelp);
connect(m_ui->refreshDevicesButton, SIGNAL(clicked()),
this, SLOT(refreshDeviceList()));
connect(m_ui->refreshDevicesButton, &QAbstractButton::clicked,
this, &AndroidDeviceDialog::refreshDeviceList);
connect(m_ui->createAVDButton, SIGNAL(clicked()),
this, SLOT(createAvd()));
connect(m_ui->deviceView, SIGNAL(doubleClicked(QModelIndex)),
this, SLOT(accept()));
connect(m_ui->createAVDButton, &QAbstractButton::clicked,
this, &AndroidDeviceDialog::createAvd);
connect(m_ui->deviceView, &QAbstractItemView::doubleClicked,
this, &QDialog::accept);
connect(&m_futureWatcherAddDevice, SIGNAL(finished()),
this, SLOT(avdAdded()));
connect(&m_futureWatcherAddDevice, &QFutureWatcherBase::finished,
this, &AndroidDeviceDialog::avdAdded);
connect(&m_futureWatcherRefreshDevices, &QFutureWatcherBase::finished,
this, &AndroidDeviceDialog::devicesRefreshed);

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

@@ -57,13 +57,12 @@ public:
bool saveDeviceSelection() const;
private slots:
private:
void refreshDeviceList();
void createAvd();
void clickedOnView(const QModelIndex &idx);
void showHelp();
void avdAdded();
private:
void devicesRefreshed();
void enableOkayButton();
void defaultDeviceClear();

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

@@ -122,9 +122,11 @@ AndroidGdbServerKitInformationWidget::AndroidGdbServerKitInformationWidget(Kit *
// ToolButton with Menu, defaulting to 'Autodetect'.
auto buttonMenu = new QMenu(m_button);
QAction *autoDetectAction = buttonMenu->addAction(tr("Auto-detect"));
connect(autoDetectAction, SIGNAL(triggered()), this, SLOT(autoDetectDebugger()));
connect(autoDetectAction, &QAction::triggered,
this, &AndroidGdbServerKitInformationWidget::autoDetectDebugger);
QAction *changeAction = buttonMenu->addAction(tr("Edit..."));
connect(changeAction, SIGNAL(triggered()), this, SLOT(showDialog()));
connect(changeAction, &QAction::triggered,
this, &AndroidGdbServerKitInformationWidget::showDialog);
m_button->setMenu(buttonMenu);
refresh();
@@ -192,8 +194,8 @@ void AndroidGdbServerKitInformationWidget::showDialog()
layout->addLayout(formLayout);
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, &dialog);
connect(buttonBox, SIGNAL(accepted()), &dialog, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), &dialog, SLOT(reject()));
connect(buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
layout->addWidget(buttonBox);
dialog.setWindowTitle(tr("GDB Server for \"%1\"").arg(m_kit->displayName()));

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

@@ -53,10 +53,10 @@ public:
QWidget *mainWidget() const override;
QWidget *buttonWidget() const override;
private slots:
private:
void autoDetectDebugger();
void showDialog();
private:
QLabel *m_label;
QPushButton *m_button;
};

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

@@ -316,7 +316,8 @@ void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target)
QProcess *process = new QProcess();
QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber);
arguments << QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/tmp/qt");
process->connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
QObject::connect(process, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
process, &QObject::deleteLater);
const QString adb = AndroidConfigurations::currentConfig().adbToolPath().toString();
Core::MessageManager::write(adb + QLatin1Char(' ') + arguments.join(QLatin1Char(' ')));
process->start(adb, arguments);

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

@@ -43,8 +43,8 @@ AndroidManifestDocument::AndroidManifestDocument(AndroidManifestEditorWidget *ed
setId(Constants::ANDROID_MANIFEST_EDITOR_ID);
setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE));
setSuspendAllowed(false);
connect(editorWidget, SIGNAL(guiChanged()),
this, SIGNAL(changed()));
connect(editorWidget, &AndroidManifestEditorWidget::guiChanged,
this, &Core::IDocument::changed);
}
bool AndroidManifestDocument::save(QString *errorString, const QString &fileName, bool autoSave)

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

@@ -42,7 +42,8 @@ AndroidManifestEditor::AndroidManifestEditor(AndroidManifestEditorWidget *editor
{
m_toolBar = new QToolBar(editorWidget);
m_actionGroup = new QActionGroup(this);
connect(m_actionGroup, SIGNAL(triggered(QAction*)), this, SLOT(changeEditorPage(QAction*)));
connect(m_actionGroup, &QActionGroup::triggered,
this, &AndroidManifestEditor::changeEditorPage);
QAction *generalAction = m_toolBar->addAction(tr("General"));
generalAction->setData(AndroidManifestEditorWidget::General);

3
src/plugins/android/androidmanifesteditor.h
View File

@@ -57,10 +57,9 @@ public:
int currentColumn() const override;
void gotoLine(int line, int column = 0, bool centerLine = true) override;
private slots:
private:
void changeEditorPage(QAction *action);
private:
QString m_displayName;
QToolBar *m_toolBar;
QActionGroup *m_actionGroup;

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

@@ -112,11 +112,11 @@ AndroidManifestEditorWidget::AndroidManifestEditorWidget()
m_editor = new AndroidManifestEditor(this);
connect(&m_timerParseCheck, SIGNAL(timeout()),
this, SLOT(delayedParseCheck()));
connect(&m_timerParseCheck, &QTimer::timeout,
this, &AndroidManifestEditorWidget::delayedParseCheck);
connect(m_textEditorWidget->document(), SIGNAL(contentsChanged()),
this, SLOT(startParseCheck()));
connect(m_textEditorWidget->document(), &QTextDocument::contentsChanged,
this, &AndroidManifestEditorWidget::startParseCheck);
connect(m_textEditorWidget->textDocument(), &TextEditor::TextDocument::reloadFinished,
this, [this](bool success) { if (success) updateAfterFileLoad(); });
connect(m_textEditorWidget->textDocument(), &TextEditor::TextDocument::openFinishedSuccessfully,
@@ -137,6 +137,7 @@ void AndroidManifestEditorWidget::initializePage()
QGroupBox *packageGroupBox = new QGroupBox(mainWidget);
topLayout->addWidget(packageGroupBox);
auto setDirtyFunc = [this] { setDirty(); };
packageGroupBox->setTitle(tr("Package"));
{
QFormLayout *formLayout = new QFormLayout();
@@ -201,16 +202,18 @@ void AndroidManifestEditorWidget::initializePage()
updateSdkVersions();
connect(m_packageNameLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(setPackageName()));
connect(m_versionCode, SIGNAL(valueChanged(int)),
this, SLOT(setDirty()));
connect(m_versionNameLinedit, SIGNAL(textEdited(QString)),
this, SLOT(setDirty()));
connect(m_androidMinSdkVersion, SIGNAL(currentIndexChanged(int)),
this, SLOT(setDirty()));
connect(m_androidTargetSdkVersion, SIGNAL(currentIndexChanged(int)),
this, SLOT(setDirty()));
connect(m_packageNameLineEdit, &QLineEdit::textEdited,
this, &AndroidManifestEditorWidget::setPackageName);
connect(m_versionCode, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
this, &AndroidManifestEditorWidget::setDirty);
connect(m_versionNameLinedit, &QLineEdit::textEdited,
this, setDirtyFunc);
connect(m_androidMinSdkVersion,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, setDirtyFunc);
connect(m_androidTargetSdkVersion,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, setDirtyFunc);
}
@@ -261,16 +264,19 @@ void AndroidManifestEditorWidget::initializePage()
applicationGroupBox->setLayout(formLayout);
connect(m_appNameLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(setDirty()));
connect(m_activityNameLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(setDirty()));
connect(m_targetLineEdit, SIGNAL(currentTextChanged(QString)),
this, SLOT(setDirty()));
connect(m_appNameLineEdit, &QLineEdit::textEdited,
this, setDirtyFunc);
connect(m_activityNameLineEdit, &QLineEdit::textEdited,
this, setDirtyFunc);
connect(m_targetLineEdit, &QComboBox::currentTextChanged,
this, setDirtyFunc);
connect(m_lIconButton, SIGNAL(clicked()), SLOT(setLDPIIcon()));
connect(m_mIconButton, SIGNAL(clicked()), SLOT(setMDPIIcon()));
connect(m_hIconButton, SIGNAL(clicked()), SLOT(setHDPIIcon()));
connect(m_lIconButton, &QAbstractButton::clicked,
this, &AndroidManifestEditorWidget::setLDPIIcon);
connect(m_mIconButton, &QAbstractButton::clicked,
this, &AndroidManifestEditorWidget::setMDPIIcon);
connect(m_hIconButton, &QAbstractButton::clicked,
this, &AndroidManifestEditorWidget::setHDPIIcon);
}
@@ -443,17 +449,17 @@ void AndroidManifestEditorWidget::initializePage()
permissionsGroupBox->setLayout(layout);
connect(m_defaultPermissonsCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(defaultPermissionOrFeatureCheckBoxClicked()));
connect(m_defaultFeaturesCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(defaultPermissionOrFeatureCheckBoxClicked()));
connect(m_defaultPermissonsCheckBox, &QCheckBox::stateChanged,
this, &AndroidManifestEditorWidget::defaultPermissionOrFeatureCheckBoxClicked);
connect(m_defaultFeaturesCheckBox, &QCheckBox::stateChanged,
this, &AndroidManifestEditorWidget::defaultPermissionOrFeatureCheckBoxClicked);
connect(m_addPermissionButton, SIGNAL(clicked()),
this, SLOT(addPermission()));
connect(m_removePermissionButton, SIGNAL(clicked()),
this, SLOT(removePermission()));
connect(m_permissionsComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(updateAddRemovePermissionButtons()));
connect(m_addPermissionButton, &QAbstractButton::clicked,
this, &AndroidManifestEditorWidget::addPermission);
connect(m_removePermissionButton, &QAbstractButton::clicked,
this, &AndroidManifestEditorWidget::removePermission);
connect(m_permissionsComboBox, &QComboBox::currentTextChanged,
this, &AndroidManifestEditorWidget::updateAddRemovePermissionButtons);
}
topLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::MinimumExpanding));
@@ -470,7 +476,7 @@ bool AndroidManifestEditorWidget::eventFilter(QObject *obj, QEvent *event)
{
if (obj == m_targetLineEdit) {
if (event->type() == QEvent::FocusIn)
QTimer::singleShot(0, this, SLOT(updateTargetComboBox()));
QTimer::singleShot(0, this, &AndroidManifestEditorWidget::updateTargetComboBox);
}
return QWidget::eventFilter(obj, event);
@@ -772,10 +778,10 @@ void AndroidManifestEditorWidget::syncToWidgets(const QDomDocument &doc)
m_mIconPath.clear();
m_hIconPath.clear();
disconnect(m_defaultPermissonsCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(defaultPermissionOrFeatureCheckBoxClicked()));
disconnect(m_defaultFeaturesCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(defaultPermissionOrFeatureCheckBoxClicked()));
disconnect(m_defaultPermissonsCheckBox, &QCheckBox::stateChanged,
this, &AndroidManifestEditorWidget::defaultPermissionOrFeatureCheckBoxClicked);
disconnect(m_defaultFeaturesCheckBox, &QCheckBox::stateChanged,
this, &AndroidManifestEditorWidget::defaultPermissionOrFeatureCheckBoxClicked);
m_defaultPermissonsCheckBox->setChecked(false);
m_defaultFeaturesCheckBox->setChecked(false);
@@ -796,10 +802,10 @@ void AndroidManifestEditorWidget::syncToWidgets(const QDomDocument &doc)
m_defaultPermissonsCheckBox->setChecked(foundPermissionComment);
m_defaultFeaturesCheckBox->setChecked(foundFeatureComment);
connect(m_defaultPermissonsCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(defaultPermissionOrFeatureCheckBoxClicked()));
connect(m_defaultFeaturesCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(defaultPermissionOrFeatureCheckBoxClicked()));
connect(m_defaultPermissonsCheckBox, &QCheckBox::stateChanged,
this, &AndroidManifestEditorWidget::defaultPermissionOrFeatureCheckBoxClicked);
connect(m_defaultFeaturesCheckBox, &QCheckBox::stateChanged,
this, &AndroidManifestEditorWidget::defaultPermissionOrFeatureCheckBoxClicked);
QStringList permissions;
QDomElement permissionElem = manifest.firstChildElement(QLatin1String("uses-permission"));

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

@@ -101,7 +101,6 @@ public:
Core::IEditor *editor() const;
TextEditor::TextEditorWidget *textEditorWidget() const;
public slots:
void setDirty(bool dirty = true);
signals:
@@ -109,7 +108,8 @@ signals:
protected:
bool eventFilter(QObject *obj, QEvent *event);
private slots:
private:
void setLDPIIcon();
void setMDPIIcon();
void setHDPIIcon();
@@ -122,7 +122,6 @@ private slots:
void updateSdkVersions();
void startParseCheck();
void delayedParseCheck();
private:
void initializePage();
bool syncToWidgets();
void syncToWidgets(const QDomDocument &doc);
@@ -138,7 +137,7 @@ private:
void updateInfoBar(const QString &errorMessage, int line, int column);
void hideInfoBar();
Q_SLOT void updateTargetComboBox();
void updateTargetComboBox();
void parseManifest(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseApplication(QXmlStreamReader &reader, QXmlStreamWriter &writer);

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

@@ -40,7 +40,7 @@ public:
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized() { }
private slots:
private:
void updateDevice();
void kitsRestored();
};

8
src/plugins/android/androidpotentialkit.cpp
View File

@@ -105,11 +105,11 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
openOptions->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
layout->addWidget(openOptions, 1, 1);
connect(openOptions, SIGNAL(clicked()),
this, SLOT(openOptions()));
connect(openOptions, &QAbstractButton::clicked,
this, &AndroidPotentialKitWidget::openOptions);
connect(AndroidConfigurations::instance(), SIGNAL(updated()),
this, SLOT(recheck()));
connect(AndroidConfigurations::instance(), &AndroidConfigurations::updated,
this, &AndroidPotentialKitWidget::recheck);
}
void AndroidPotentialKitWidget::openOptions()

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

@@ -46,7 +46,7 @@ class AndroidPotentialKitWidget : public Utils::DetailsWidget
Q_OBJECT
public:
AndroidPotentialKitWidget(QWidget *parent);
private slots:
private:
void openOptions();
void recheck();
};

12
src/plugins/android/androidruncontrol.cpp
View File

@@ -58,12 +58,12 @@ void AndroidRunControl::start()
emit started();
disconnect(m_runner, 0, this, 0);
connect(m_runner, SIGNAL(remoteErrorOutput(QString)),
SLOT(handleRemoteErrorOutput(QString)));
connect(m_runner, SIGNAL(remoteOutput(QString)),
SLOT(handleRemoteOutput(QString)));
connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
SLOT(handleRemoteProcessFinished(QString)));
connect(m_runner, &AndroidRunner::remoteErrorOutput,
this, &AndroidRunControl::handleRemoteErrorOutput);
connect(m_runner, &AndroidRunner::remoteOutput,
this, &AndroidRunControl::handleRemoteOutput);
connect(m_runner, &AndroidRunner::remoteProcessFinished,
this, &AndroidRunControl::handleRemoteProcessFinished);
appendMessage(tr("Starting remote process."), Utils::NormalMessageFormat);
m_runner->setRunnable(runnable().as<AndroidRunnable>());
m_runner->start();

3
src/plugins/android/androidruncontrol.h
View File

@@ -46,12 +46,11 @@ public:
bool isRunning() const override;
QString displayName() const override;
private slots:
private:
void handleRemoteProcessFinished(const QString &error);
void handleRemoteOutput(const QString &output);
void handleRemoteErrorOutput(const QString &output);
private:
AndroidRunner *const m_runner;
bool m_running;
};

8
src/plugins/android/androidrunner.cpp
View File

@@ -179,9 +179,11 @@ AndroidRunner::AndroidRunner(QObject *parent,
m_checkPIDTimer.setInterval(1000);
connect(&m_adbLogcatProcess, SIGNAL(readyReadStandardOutput()), SLOT(logcatReadStandardOutput()));
connect(&m_adbLogcatProcess, SIGNAL(readyReadStandardError()), SLOT(logcatReadStandardError()));
connect(&m_checkPIDTimer, SIGNAL(timeout()), SLOT(checkPID()));
connect(&m_adbLogcatProcess, &QProcess::readyReadStandardOutput,
this, &AndroidRunner::logcatReadStandardOutput);
connect(&m_adbLogcatProcess, &QProcess::readyReadStandardError,
this, &AndroidRunner::logcatReadStandardError);
connect(&m_checkPIDTimer, &QTimer::timeout, this, &AndroidRunner::checkPID);
if (version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0)) {
if (qEnvironmentVariableIsSet("QTC_ANDROID_USE_FILE_HANDSHAKE"))

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

@@ -61,7 +61,7 @@ public:
void setRunnable(const AndroidRunnable &runnable);
const AndroidRunnable &runnable() const { return m_androidRunnable; }
public slots:
public:
void start();
void stop();
void handleRemoteDebuggerRunning();
@@ -74,14 +74,13 @@ signals:
void remoteOutput(const QString &output);
void remoteErrorOutput(const QString &output);
private slots:
private:
void checkPID();
void logcatReadStandardError();
void logcatReadStandardOutput();
void asyncStart();
QByteArray runPs();
Q_INVOKABLE QByteArray runPs();
private:
void adbKill(qint64 pid);
QStringList selector() const { return m_selector; }
void forceStop();
@@ -89,7 +88,6 @@ private:
void logcatProcess(const QByteArray &text, QByteArray &buffer, bool onlyError);
bool adbShellAmNeedsQuotes();
private:
bool runAdb(const QStringList &args, QString *errorMessage = nullptr, int timeoutS = 10);
QProcess m_adbLogcatProcess;
QProcess m_psProc;

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

@@ -131,8 +131,8 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
{
m_ui->setupUi(this);
connect(&m_checkGdbWatcher, SIGNAL(finished()),
this, SLOT(checkGdbFinished()));
connect(&m_checkGdbWatcher, &QFutureWatcherBase::finished,
this, &AndroidSettingsWidget::checkGdbFinished);
m_ui->SDKLocationPathChooser->setFileName(m_androidConfig.sdkLocation());
m_ui->SDKLocationPathChooser->setPromptDialogTitle(tr("Select Android SDK folder"));
@@ -179,22 +179,52 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
m_ui->gdbWarningIconLabel->setPixmap(errorPixmap);
m_ui->ndkWarningIconLabel->setPixmap(errorPixmap);
connect(m_ui->gdbWarningLabel, SIGNAL(linkActivated(QString)),
this, SLOT(showGdbWarningDialog()));
connect(m_ui->gdbWarningLabel, &QLabel::linkActivated,
this, &AndroidSettingsWidget::showGdbWarningDialog);
connect(&m_virtualDevicesWatcher, SIGNAL(finished()),
this, SLOT(updateAvds()));
connect(&m_virtualDevicesWatcher, &QFutureWatcherBase::finished,
this, &AndroidSettingsWidget::updateAvds);
check(All);
applyToUi(All);
connect(&m_futureWatcher, SIGNAL(finished()),
this, SLOT(avdAdded()));
connect(&m_futureWatcher, &QFutureWatcherBase::finished,
this, &AndroidSettingsWidget::avdAdded);
connect(m_ui->NDKLocationPathChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(ndkLocationEditingFinished()));
connect(m_ui->SDKLocationPathChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(sdkLocationEditingFinished()));
connect(m_ui->AntLocationPathChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(antLocationEditingFinished()));
connect(m_ui->OpenJDKLocationPathChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(openJDKLocationEditingFinished()));
connect(m_ui->NDKLocationPathChooser, &Utils::PathChooser::rawPathChanged,
this, &AndroidSettingsWidget::ndkLocationEditingFinished);
connect(m_ui->SDKLocationPathChooser, &Utils::PathChooser::rawPathChanged,
this, &AndroidSettingsWidget::sdkLocationEditingFinished);
connect(m_ui->AntLocationPathChooser, &Utils::PathChooser::rawPathChanged,
this, &AndroidSettingsWidget::antLocationEditingFinished);
connect(m_ui->OpenJDKLocationPathChooser, &Utils::PathChooser::rawPathChanged,
this, &AndroidSettingsWidget::openJDKLocationEditingFinished);
connect(m_ui->AVDAddPushButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::addAVD);
connect(m_ui->AVDRemovePushButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::removeAVD);
connect(m_ui->AVDStartPushButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::startAVD);
connect(m_ui->AVDTableView, &QAbstractItemView::activated,
this, &AndroidSettingsWidget::avdActivated);
connect(m_ui->AVDTableView, &QAbstractItemView::clicked,
this, &AndroidSettingsWidget::avdActivated);
connect(m_ui->DataPartitionSizeSpinBox, &QAbstractSpinBox::editingFinished,
this, &AndroidSettingsWidget::dataPartitionSizeEditingFinished);
connect(m_ui->manageAVDPushButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::manageAVD);
connect(m_ui->CreateKitCheckBox, &QAbstractButton::toggled,
this, &AndroidSettingsWidget::createKitToggled);
connect(m_ui->downloadSDKToolButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::openSDKDownloadUrl);
connect(m_ui->downloadNDKToolButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::openNDKDownloadUrl);
connect(m_ui->downloadAntToolButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::openAntDownloadUrl);
connect(m_ui->downloadOpenJDKToolButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::openOpenJDKDownloadUrl);
connect(m_ui->UseGradleCheckBox, &QAbstractButton::toggled,
this, &AndroidSettingsWidget::useGradleToggled);
}
@@ -646,8 +676,9 @@ void AndroidSettingsWidget::showGdbWarningDialog()
void AndroidSettingsWidget::manageAVD()
{
QProcess *avdProcess = new QProcess();
connect(this, SIGNAL(destroyed()), avdProcess, SLOT(deleteLater()));
connect(avdProcess, SIGNAL(finished(int)), avdProcess, SLOT(deleteLater()));
connect(this, &QObject::destroyed, avdProcess, &QObject::deleteLater);
connect(avdProcess, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
avdProcess, &QObject::deleteLater);
avdProcess->setProcessEnvironment(m_androidConfig.androidToolEnvironment().toProcessEnvironment());
QString executable = m_androidConfig.androidToolPath().toString();

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

@@ -68,7 +68,7 @@ public:
void saveSettings();
private slots:
private:
void sdkLocationEditingFinished();
void ndkLocationEditingFinished();
void searchForAnt(const Utils::FileName &location);

228
src/plugins/android/androidsettingswidget.ui
View File

@@ -463,231 +463,5 @@
<resources>
<include location="android.qrc"/>
</resources>
<connections>
<connection>
<sender>AVDAddPushButton</sender>
<signal>clicked()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>addAVD()</slot>
<hints>
<hint type="sourcelabel">
<x>793</x>
<y>394</y>
</hint>
<hint type="destinationlabel">
<x>352</x>
<y>186</y>
</hint>
</hints>
</connection>
<connection>
<sender>AVDRemovePushButton</sender>
<signal>clicked()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>removeAVD()</slot>
<hints>
<hint type="sourcelabel">
<x>793</x>
<y>427</y>
</hint>
<hint type="destinationlabel">
<x>352</x>
<y>186</y>
</hint>
</hints>
</connection>
<connection>
<sender>AVDStartPushButton</sender>
<signal>clicked()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>startAVD()</slot>
<hints>
<hint type="sourcelabel">
<x>793</x>
<y>460</y>
</hint>
<hint type="destinationlabel">
<x>352</x>
<y>186</y>
</hint>
</hints>
</connection>
<connection>
<sender>AVDTableView</sender>
<signal>activated(QModelIndex)</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>avdActivated(QModelIndex)</slot>
<hints>
<hint type="sourcelabel">
<x>328</x>
<y>605</y>
</hint>
<hint type="destinationlabel">
<x>352</x>
<y>186</y>
</hint>
</hints>
</connection>
<connection>
<sender>AVDTableView</sender>
<signal>clicked(QModelIndex)</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>avdActivated(QModelIndex)</slot>
<hints>
<hint type="sourcelabel">
<x>328</x>
<y>605</y>
</hint>
<hint type="destinationlabel">
<x>352</x>
<y>186</y>
</hint>
</hints>
</connection>
<connection>
<sender>DataPartitionSizeSpinBox</sender>
<signal>editingFinished()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>dataPartitionSizeEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
<x>614</x>
<y>360</y>
</hint>
<hint type="destinationlabel">
<x>352</x>
<y>186</y>
</hint>
</hints>
</connection>
<connection>
<sender>manageAVDPushButton</sender>
<signal>clicked()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>manageAVD()</slot>
<hints>
<hint type="sourcelabel">
<x>792</x>
<y>359</y>
</hint>
<hint type="destinationlabel">
<x>339</x>
<y>220</y>
</hint>
</hints>
</connection>
<connection>
<sender>CreateKitCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>createKitToggled()</slot>
<hints>
<hint type="sourcelabel">
<x>543</x>
<y>228</y>
</hint>
<hint type="destinationlabel">
<x>339</x>
<y>220</y>
</hint>
</hints>
</connection>
<connection>
<sender>downloadSDKToolButton</sender>
<signal>clicked()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>openSDKDownloadUrl()</slot>
<hints>
<hint type="sourcelabel">
<x>830</x>
<y>85</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>downloadNDKToolButton</sender>
<signal>clicked()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>openNDKDownloadUrl()</slot>
<hints>
<hint type="sourcelabel">
<x>830</x>
<y>141</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>downloadAntToolButton</sender>
<signal>clicked()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>openAntDownloadUrl()</slot>
<hints>
<hint type="sourcelabel">
<x>830</x>
<y>313</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>downloadOpenJDKToolButton</sender>
<signal>clicked()</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>openOpenJDKDownloadUrl()</slot>
<hints>
<hint type="sourcelabel">
<x>830</x>
<y>29</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>UseGradleCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>AndroidSettingsWidget</receiver>
<slot>useGradleToggled()</slot>
<hints>
<hint type="sourcelabel">
<x>395</x>
<y>238</y>
</hint>
<hint type="destinationlabel">
<x>324</x>
<y>223</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>sdkLocationEditingFinished()</slot>
<slot>ndkLocationEditingFinished()</slot>
<slot>antLocationEditingFinished()</slot>
<slot>addAVD()</slot>
<slot>removeAVD()</slot>
<slot>startAVD()</slot>
<slot>avdActivated(QModelIndex)</slot>
<slot>dataPartitionSizeEditingFinished()</slot>
<slot>openJDKLocationEditingFinished()</slot>
<slot>manageAVD()</slot>
<slot>createKitToggled()</slot>
<slot>openSDKDownloadUrl()</slot>
<slot>openNDKDownloadUrl()</slot>
<slot>openAntDownloadUrl()</slot>
<slot>openOpenJDKDownloadUrl()</slot>
</slots>
<connections/>
</ui>

12
src/plugins/android/androidsignaloperation.cpp
View File

@@ -39,7 +39,7 @@ Android::Internal::AndroidSignalOperation::AndroidSignalOperation()
, m_signal(0)
{
m_timeout->setInterval(5000);
connect(m_timeout, SIGNAL(timeout()), this, SLOT(handleTimeout()));
connect(m_timeout, &QTimer::timeout, this, &AndroidSignalOperation::handleTimeout);
}
void Android::Internal::AndroidSignalOperation::adbFindRunAsFinished(int exitCode,
@@ -63,8 +63,9 @@ void Android::Internal::AndroidSignalOperation::adbFindRunAsFinished(int exitCod
m_state = Idle;
emit finished(m_errorMessage);
} else {
connect(m_adbProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
SLOT(adbKillFinished(int,QProcess::ExitStatus)));
connect(m_adbProcess,
static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
this, &AndroidSignalOperation::adbKillFinished);
m_state = Kill;
m_timeout->start();
m_adbProcess->start(m_adbPath, QStringList()
@@ -116,8 +117,9 @@ void Android::Internal::AndroidSignalOperation::signalOperationViaADB(qint64 pid
m_adbProcess->disconnect(this);
m_pid = pid;
m_signal = signal;
connect(m_adbProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
SLOT(adbFindRunAsFinished(int,QProcess::ExitStatus)));
connect(m_adbProcess,
static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
this, &AndroidSignalOperation::adbFindRunAsFinished);
m_state = RunAs;
m_timeout->start();
m_adbProcess->start(m_adbPath, QStringList()

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

@@ -47,12 +47,11 @@ public:
protected:
explicit AndroidSignalOperation();
private slots:
private:
void adbFindRunAsFinished(int exitCode, QProcess::ExitStatus exitStatus);
void adbKillFinished(int exitCode, QProcess::ExitStatus exitStatus);
void handleTimeout();
private:
void signalOperationViaADB(qint64 pid, int signal);
QString m_adbPath;

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

@@ -61,8 +61,9 @@ AvdDialog::AvdDialog(int minApiLevel, const QString &targetArch, const AndroidCo
updateApiLevelComboBox();
connect(m_avdDialog.abiComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(updateApiLevelComboBox()));
connect(m_avdDialog.abiComboBox,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &AvdDialog::updateApiLevelComboBox);
connect(&m_hideTipTimer, &QTimer::timeout,
this, [](){Utils::ToolTip::hide();});

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

@@ -48,9 +48,8 @@ public:
int sdcardSize() const;
bool isValid() const;
private slots:
void updateApiLevelComboBox();
private:
void updateApiLevelComboBox();
bool eventFilter(QObject *obj, QEvent *event);
Ui::AddNewAVDDialog m_avdDialog;

12
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
View File

@@ -90,8 +90,8 @@ ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard, const
}
nodeSelected(m_comboBox->currentIndex());
connect(m_comboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(nodeSelected(int)));
connect(m_comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &ChooseProFilePage::nodeSelected);
fl->addRow(tr(".pro file:"), m_comboBox);
setTitle(tr("Select a .pro File"));
@@ -136,8 +136,8 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
m_layout->addRow(hbox);
connect(m_androidPackageSourceDir, SIGNAL(pathChanged(QString)),
m_wizard, SLOT(setDirectory(QString)));
connect(m_androidPackageSourceDir, &PathChooser::pathChanged,
m_wizard, &CreateAndroidManifestWizard::setDirectory);
if (wizard->copyGradle()) {
QCheckBox *checkBox = new QCheckBox(this);
@@ -178,8 +178,8 @@ void ChooseDirectoryPage::initializePage()
"Android directory and the default files are overwritten."));
m_androidPackageSourceDir->setPath(m_wizard->node()->filePath().toFileInfo().absolutePath().append(QLatin1String("/android")));
connect(m_androidPackageSourceDir, SIGNAL(rawPathChanged(QString)),
this, SLOT(checkPackageSourceDir()));
connect(m_androidPackageSourceDir, &PathChooser::rawPathChanged,
this, &ChooseDirectoryPage::checkPackageSourceDir);
} else {
m_label->setText(tr("The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file."));
m_androidPackageSourceDir->setPath(androidPackageDir);

5
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h
View File

@@ -57,7 +57,7 @@ class ChooseProFilePage : public QWizardPage
Q_OBJECT
public:
ChooseProFilePage(CreateAndroidManifestWizard *wizard, const QList<QmakeProjectManager::QmakeProFileNode *> &nodes, const QmakeProjectManager::QmakeProFileNode *select);
private slots:
private:
void nodeSelected(int index);
private:
CreateAndroidManifestWizard *m_wizard;
@@ -72,7 +72,7 @@ public:
void initializePage();
protected:
bool isComplete() const;
private slots:
private:
void checkPackageSourceDir();
private:
CreateAndroidManifestWizard *m_wizard;
@@ -96,7 +96,6 @@ public:
void accept();
bool copyGradle();
public slots:
void setDirectory(const QString &directory);
void setCopyGradle(bool copy);

20
src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
View File

@@ -83,20 +83,20 @@ QmakeAndroidBuildApkWidget::QmakeAndroidBuildApkWidget(QmakeAndroidBuildApkStep
m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
m_ui->androidExtraLibsListView->setModel(m_extraLibraryListModel);
connect(m_ui->createAndroidTemplatesButton, SIGNAL(clicked()),
SLOT(createAndroidTemplatesButton()));
connect(m_ui->createAndroidTemplatesButton, &QAbstractButton::clicked,
this, &QmakeAndroidBuildApkWidget::createAndroidTemplatesButton);
connect(m_ui->addAndroidExtraLibButton, SIGNAL(clicked()),
SLOT(addAndroidExtraLib()));
connect(m_ui->addAndroidExtraLibButton, &QAbstractButton::clicked,
this, &QmakeAndroidBuildApkWidget::addAndroidExtraLib);
connect(m_ui->removeAndroidExtraLibButton, SIGNAL(clicked()),
SLOT(removeAndroidExtraLib()));
connect(m_ui->removeAndroidExtraLibButton, &QAbstractButton::clicked,
this, &QmakeAndroidBuildApkWidget::removeAndroidExtraLib);
connect(m_ui->androidExtraLibsListView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
SLOT(checkEnableRemoveButton()));
connect(m_ui->androidExtraLibsListView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, &QmakeAndroidBuildApkWidget::checkEnableRemoveButton);
connect(m_extraLibraryListModel, SIGNAL(enabledChanged(bool)),
m_ui->additionalLibrariesGroupBox, SLOT(setEnabled(bool)));
connect(m_extraLibraryListModel, &AndroidExtraLibraryListModel::enabledChanged,
m_ui->additionalLibrariesGroupBox, &QWidget::setEnabled);
m_ui->additionalLibrariesGroupBox->setEnabled(m_extraLibraryListModel->isEnabled());
}

2
src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h
View File

@@ -54,7 +54,7 @@ public:
explicit QmakeAndroidBuildApkWidget(QmakeAndroidBuildApkStep *step);
~QmakeAndroidBuildApkWidget();
private slots:
private:
void createAndroidTemplatesButton();
void addAndroidExtraLib();
void removeAndroidExtraLib();

4
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
View File

@@ -76,8 +76,8 @@ QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *parent, Qmake
void QmakeAndroidRunConfiguration::init()
{
setDefaultDisplayName(defaultDisplayName());
connect(qmakeProject(), SIGNAL(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool)),
this, SLOT(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool)));
connect(qmakeProject(), &QmakeProject::proFileUpdated,
this, &QmakeAndroidRunConfiguration::proFileUpdated);
}
bool QmakeAndroidRunConfiguration::fromMap(const QVariantMap &map)

4
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
View File

@@ -58,10 +58,8 @@ protected:
QVariantMap toMap() const override;
QString defaultDisplayName();
private slots:
void proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, bool parseInProgress);
private:
void proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, bool parseInProgress);
QmakeProjectManager::QmakeProject *qmakeProject() const;
void init();