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

TargetSettingsPanelWidget: Use Qt5-style connects

Browse Source 
* Use member data initialization as well

Change-Id: Ia8593b6f18dc6158edcdf4b96273cfbef5abfc44
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-12-02 09:40:13 +01:00
parent 723463e72c
commit 9894f6cf40
2 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/plugins/projectexplorer/targetsettingspanel.cpp
View File

@@ -76,15 +76,8 @@ int TargetSettingsPanelWidget::s_targetSubIndex = -1;
/// ///
TargetSettingsPanelWidget::TargetSettingsPanelWidget(Project *project) : TargetSettingsPanelWidget::TargetSettingsPanelWidget(Project *project) :
m_currentTarget(0),
m_project(project), m_project(project),
m_importer(project->createProjectImporter()), m_importer(project->createProjectImporter())
m_selector(0),
m_centralWidget(0),
m_changeMenu(0),
m_duplicateMenu(0),
m_lastAction(0),
m_importAction(0)
{ {
Q_ASSERT(m_project); Q_ASSERT(m_project);
@@ -96,23 +89,26 @@ TargetSettingsPanelWidget::TargetSettingsPanelWidget(Project *project) :
if (m_importer) { if (m_importer) {
m_importAction = new QAction(tr("Import existing build..."), this); m_importAction = new QAction(tr("Import existing build..."), this);
connect(m_importAction, SIGNAL(triggered()), this, SLOT(importTarget())); connect(m_importAction, &QAction::triggered, this, [this]() {
const QString toImport
= QFileDialog::getExistingDirectory(this, tr("Import directory"),
m_project->projectDirectory().toString());
importTarget(Utils::FileName::fromString(toImport));
});
} }
setFocusPolicy(Qt::NoFocus); setFocusPolicy(Qt::NoFocus);
setupUi(); setupUi();
connect(m_project, SIGNAL(addedTarget(ProjectExplorer::Target*)), connect(m_project, &Project::addedTarget, this, &TargetSettingsPanelWidget::targetAdded);
this, SLOT(targetAdded(ProjectExplorer::Target*))); connect(m_project, &Project::removedTarget, this, &TargetSettingsPanelWidget::removedTarget);
connect(m_project, SIGNAL(removedTarget(ProjectExplorer::Target*)),
this, SLOT(removedTarget(ProjectExplorer::Target*)));
connect(m_project, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), connect(m_project, &Project::activeTargetChanged,
this, SLOT(activeTargetChanged(ProjectExplorer::Target*))); this, &TargetSettingsPanelWidget::activeTargetChanged);
connect(KitManager::instance(), SIGNAL(kitsChanged()), connect(KitManager::instance(), &KitManager::kitsChanged,
this, SLOT(updateTargetButtons())); this, &TargetSettingsPanelWidget::updateTargetButtons);
} }
TargetSettingsPanelWidget::~TargetSettingsPanelWidget() TargetSettingsPanelWidget::~TargetSettingsPanelWidget()
@@ -201,17 +197,17 @@ void TargetSettingsPanelWidget::setupUi()
m_selector->setCurrentSubIndex(s_targetSubIndex); m_selector->setCurrentSubIndex(s_targetSubIndex);
currentTargetChanged(index, m_selector->currentSubIndex()); currentTargetChanged(index, m_selector->currentSubIndex());
connect(m_selector, SIGNAL(currentChanged(int,int)), connect(m_selector, &TargetSettingsWidget::currentChanged,
this, SLOT(currentTargetChanged(int,int))); this, &TargetSettingsPanelWidget::currentTargetChanged);
connect(m_selector, SIGNAL(manageButtonClicked()), connect(m_selector, &TargetSettingsWidget::manageButtonClicked,
this, SLOT(openTargetPreferences())); this, &TargetSettingsPanelWidget::openTargetPreferences);
connect(m_selector, SIGNAL(toolTipRequested(QPoint,int)), connect(m_selector, &TargetSettingsWidget::toolTipRequested,
this, SLOT(showTargetToolTip(QPoint,int))); this, &TargetSettingsPanelWidget::showTargetToolTip);
connect(m_selector, SIGNAL(menuShown(int)), connect(m_selector, &TargetSettingsWidget::menuShown,
this, SLOT(menuShown(int))); this, &TargetSettingsPanelWidget::menuShown);
connect(m_addMenu, SIGNAL(triggered(QAction*)), connect(m_addMenu, &QMenu::triggered,
this, SLOT(addActionTriggered(QAction*))); this, &TargetSettingsPanelWidget::addActionTriggered);
m_selector->setAddButtonMenu(m_addMenu); m_selector->setAddButtonMenu(m_addMenu);
m_selector->setTargetMenu(m_targetMenu); m_selector->setTargetMenu(m_targetMenu);
@@ -299,6 +295,7 @@ void TargetSettingsPanelWidget::menuShown(int targetIndex)
void TargetSettingsPanelWidget::changeActionTriggered(QAction *action) void TargetSettingsPanelWidget::changeActionTriggered(QAction *action)
{ {
QTC_ASSERT(m_menuTargetIndex >= 0, return);
Kit *k = KitManager::find(action->data().value<Id>()); Kit *k = KitManager::find(action->data().value<Id>());
Target *sourceTarget = m_targets.at(m_menuTargetIndex); Target *sourceTarget = m_targets.at(m_menuTargetIndex);
Target *newTarget = m_project->cloneTarget(sourceTarget, k); Target *newTarget = m_project->cloneTarget(sourceTarget, k);
@@ -312,6 +309,7 @@ void TargetSettingsPanelWidget::changeActionTriggered(QAction *action)
void TargetSettingsPanelWidget::duplicateActionTriggered(QAction *action) void TargetSettingsPanelWidget::duplicateActionTriggered(QAction *action)
{ {
QTC_ASSERT(m_menuTargetIndex >= 0, return);
Kit *k = KitManager::find(action->data().value<Id>()); Kit *k = KitManager::find(action->data().value<Id>());
Target *newTarget = m_project->cloneTarget(m_targets.at(m_menuTargetIndex), k); Target *newTarget = m_project->cloneTarget(m_targets.at(m_menuTargetIndex), k);
@@ -336,8 +334,9 @@ void TargetSettingsPanelWidget::addActionTriggered(QAction *action)
} }
} }
void TargetSettingsPanelWidget::removeTarget() void TargetSettingsPanelWidget::removeCurrentTarget()
{ {
QTC_ASSERT(m_menuTargetIndex >= 0, return);
Target *t = m_targets.at(m_menuTargetIndex); Target *t = m_targets.at(m_menuTargetIndex);
if (BuildManager::isBuilding(t)) { if (BuildManager::isBuilding(t)) {
@@ -389,7 +388,8 @@ void TargetSettingsPanelWidget::targetAdded(Target *target)
} }
} }
connect(target, SIGNAL(displayNameChanged()), this, SLOT(renameTarget())); connect(target, &ProjectConfiguration::displayNameChanged,
this, &TargetSettingsPanelWidget::renameTarget);
updateTargetButtons(); updateTargetButtons();
} }
@@ -465,7 +465,7 @@ void TargetSettingsPanelWidget::updateTargetButtons()
this, &TargetSettingsPanelWidget::changeActionTriggered); this, &TargetSettingsPanelWidget::changeActionTriggered);
connect(m_duplicateMenu, &QMenu::triggered, connect(m_duplicateMenu, &QMenu::triggered,
this, &TargetSettingsPanelWidget::duplicateActionTriggered); this, &TargetSettingsPanelWidget::duplicateActionTriggered);
connect(removeAction, &QAction::triggered, this, &TargetSettingsPanelWidget::removeTarget); connect(removeAction, &QAction::triggered, this, &TargetSettingsPanelWidget::removeCurrentTarget);
foreach (Kit *k, KitManager::sortKits(KitManager::kits())) { foreach (Kit *k, KitManager::sortKits(KitManager::kits())) {
if (m_project->target(k)) if (m_project->target(k))
@@ -503,12 +503,6 @@ void TargetSettingsPanelWidget::openTargetPreferences()
ICore::showOptionsDialog(Constants::KITS_SETTINGS_PAGE_ID, this); ICore::showOptionsDialog(Constants::KITS_SETTINGS_PAGE_ID, this);
} }
void TargetSettingsPanelWidget::importTarget()
{
QString toImport = QFileDialog::getExistingDirectory(this, tr("Import directory"), m_project->projectDirectory().toString());
importTarget(Utils::FileName::fromString(toImport));
}
void TargetSettingsPanelWidget::importTarget(const Utils::FileName &path) void TargetSettingsPanelWidget::importTarget(const Utils::FileName &path)
{ {
if (!m_importer) if (!m_importer)

23
src/plugins/projectexplorer/targetsettingspanel.h
View File

@@ -67,7 +67,8 @@ public:
protected: protected:
bool event(QEvent *event); bool event(QEvent *event);
private slots:
private:
void currentTargetChanged(int targetIndex, int subIndex); void currentTargetChanged(int targetIndex, int subIndex);
void showTargetToolTip(const QPoint &globalPos, int targetIndex); void showTargetToolTip(const QPoint &globalPos, int targetIndex);
void targetAdded(ProjectExplorer::Target *target); void targetAdded(ProjectExplorer::Target *target);
@@ -76,32 +77,30 @@ private slots:
void updateTargetButtons(); void updateTargetButtons();
void renameTarget(); void renameTarget();
void openTargetPreferences(); void openTargetPreferences();
void importTarget();
void removeTarget(); void removeCurrentTarget();
void menuShown(int targetIndex); void menuShown(int targetIndex);
void addActionTriggered(QAction *action); void addActionTriggered(QAction *action);
void changeActionTriggered(QAction *action); void changeActionTriggered(QAction *action);
void duplicateActionTriggered(QAction *action); void duplicateActionTriggered(QAction *action);
private:
void importTarget(const Utils::FileName &path); void importTarget(const Utils::FileName &path);
void createAction(Kit *k, QMenu *menu); void createAction(Kit *k, QMenu *menu);
Target *m_currentTarget; Target *m_currentTarget = 0;
Project *m_project; Project *m_project;
ProjectImporter *m_importer; ProjectImporter *m_importer;
TargetSettingsWidget *m_selector; TargetSettingsWidget *m_selector = 0;
QStackedWidget *m_centralWidget; QStackedWidget *m_centralWidget = 0;
QWidget *m_noTargetLabel; QWidget *m_noTargetLabel;
PanelsWidget *m_panelWidgets[2]; PanelsWidget *m_panelWidgets[2];
QList<Target *> m_targets; QList<Target *> m_targets;
QMenu *m_targetMenu; QMenu *m_targetMenu;
QMenu *m_changeMenu; QMenu *m_changeMenu = 0;
QMenu *m_duplicateMenu; QMenu *m_duplicateMenu = 0;
QMenu *m_addMenu; QMenu *m_addMenu;
QAction *m_lastAction; QAction *m_lastAction = 0;
QAction *m_importAction; QAction *m_importAction = 0;
int m_menuTargetIndex; int m_menuTargetIndex = -1;
static int s_targetSubIndex; static int s_targetSubIndex;
}; };