forked from qt-creator/qt-creator
Projectexplorer: Modernize codebase
Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
This commit is contained in:
@@ -105,7 +105,7 @@ FileName AndroidGdbServerKitInformation::autoDetect(const Kit *kit)
|
||||
ToolChain *tc = ToolChainKitInformation::toolChain(kit);
|
||||
if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_ID)
|
||||
return FileName();
|
||||
AndroidToolChain *atc = static_cast<AndroidToolChain *>(tc);
|
||||
auto atc = static_cast<AndroidToolChain *>(tc);
|
||||
return atc->suggestedGdbServer();
|
||||
}
|
||||
|
||||
@@ -114,13 +114,13 @@ FileName AndroidGdbServerKitInformation::autoDetect(const Kit *kit)
|
||||
///////////////
|
||||
|
||||
|
||||
AndroidGdbServerKitInformationWidget::AndroidGdbServerKitInformationWidget(Kit *kit, const KitInformation *ki)
|
||||
: KitConfigWidget(kit, ki),
|
||||
m_label(new ElidingLabel),
|
||||
m_button(new QPushButton(tr("Manage...")))
|
||||
AndroidGdbServerKitInformationWidget::AndroidGdbServerKitInformationWidget(Kit *kit, const KitInformation *ki) :
|
||||
KitConfigWidget(kit, ki),
|
||||
m_label(new ElidingLabel),
|
||||
m_button(new QPushButton(tr("Manage...")))
|
||||
{
|
||||
// ToolButton with Menu, defaulting to 'Autodetect'.
|
||||
QMenu *buttonMenu = new QMenu(m_button);
|
||||
auto buttonMenu = new QMenu(m_button);
|
||||
QAction *autoDetectAction = buttonMenu->addAction(tr("Auto-detect"));
|
||||
connect(autoDetectAction, SIGNAL(triggered()), this, SLOT(autoDetectDebugger()));
|
||||
QAction *changeAction = buttonMenu->addAction(tr("Edit..."));
|
||||
@@ -179,19 +179,19 @@ void AndroidGdbServerKitInformationWidget::autoDetectDebugger()
|
||||
void AndroidGdbServerKitInformationWidget::showDialog()
|
||||
{
|
||||
QDialog dialog;
|
||||
QVBoxLayout *layout = new QVBoxLayout(&dialog);
|
||||
QFormLayout *formLayout = new QFormLayout;
|
||||
auto layout = new QVBoxLayout(&dialog);
|
||||
auto formLayout = new QFormLayout;
|
||||
formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
|
||||
|
||||
QLabel *binaryLabel = new QLabel(tr("&Binary:"));
|
||||
PathChooser *chooser = new PathChooser;
|
||||
auto binaryLabel = new QLabel(tr("&Binary:"));
|
||||
auto chooser = new PathChooser;
|
||||
chooser->setExpectedKind(PathChooser::ExistingCommand);
|
||||
chooser->setPath(AndroidGdbServerKitInformation::gdbServer(m_kit).toString());
|
||||
binaryLabel->setBuddy(chooser);
|
||||
formLayout->addRow(binaryLabel, chooser);
|
||||
layout->addLayout(formLayout);
|
||||
|
||||
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, &dialog);
|
||||
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()));
|
||||
layout->addWidget(buttonBox);
|
||||
|
||||
@@ -56,7 +56,7 @@ void AndroidPotentialKit::executeFromMenu()
|
||||
QWidget *AndroidPotentialKit::createWidget(QWidget *parent) const
|
||||
{
|
||||
if (!isEnabled())
|
||||
return 0;
|
||||
return nullptr;
|
||||
return new AndroidPotentialKitWidget(parent);
|
||||
}
|
||||
|
||||
@@ -89,18 +89,18 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
|
||||
setSummaryText(QLatin1String("<b>Android has not been configured. Create Android kits.</b>"));
|
||||
setIcon(Core::Icons::WARNING.icon());
|
||||
//detailsWidget->setState(Utils::DetailsWidget::NoSummary);
|
||||
QWidget *mainWidget = new QWidget(this);
|
||||
auto mainWidget = new QWidget(this);
|
||||
setWidget(mainWidget);
|
||||
|
||||
QGridLayout *layout = new QGridLayout(mainWidget);
|
||||
auto layout = new QGridLayout(mainWidget);
|
||||
layout->setMargin(0);
|
||||
QLabel *label = new QLabel;
|
||||
auto label = new QLabel;
|
||||
label->setText(tr("Qt Creator needs additional settings to enable Android support."
|
||||
" You can configure those settings in the Options dialog."));
|
||||
label->setWordWrap(true);
|
||||
layout->addWidget(label, 0, 0, 1, 2);
|
||||
|
||||
QPushButton *openOptions = new QPushButton;
|
||||
auto openOptions = new QPushButton;
|
||||
openOptions->setText(Core::ICore::msgShowOptionsDialog());
|
||||
openOptions->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
||||
layout->addWidget(openOptions, 1, 1);
|
||||
|
||||
@@ -35,10 +35,10 @@ class AndroidPotentialKit : public ProjectExplorer::IPotentialKit
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
QString displayName() const;
|
||||
void executeFromMenu();
|
||||
QWidget *createWidget(QWidget *parent) const;
|
||||
bool isEnabled() const;
|
||||
QString displayName() const override;
|
||||
void executeFromMenu() override;
|
||||
QWidget *createWidget(QWidget *parent) const override;
|
||||
bool isEnabled() const override;
|
||||
};
|
||||
|
||||
class AndroidPotentialKitWidget : public Utils::DetailsWidget
|
||||
|
||||
Reference in New Issue
Block a user