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

SideBar: Avoid using sender()

Browse Source 
Change-Id: I851455dd8447209a631234403837f785634de2b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-07-19 19:17:12 +02:00
parent 29bbf35895
commit 6f064b0239
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/sidebar.cpp
View File

@@ -198,8 +198,8 @@ Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QStrin
d->m_widgets.at(0)->setCloseIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); d->m_widgets.at(0)->setCloseIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon());
auto item = new Internal::SideBarWidget(this, id); auto item = new Internal::SideBarWidget(this, id);
connect(item, &Internal::SideBarWidget::splitMe, this, &SideBar::splitSubWidget); connect(item, &Internal::SideBarWidget::splitMe, this, [this, item] { splitSubWidget(item); });
connect(item, &Internal::SideBarWidget::closeMe, this, &SideBar::closeSubWidget); connect(item, &Internal::SideBarWidget::closeMe, this, [this, item] { closeSubWidget(item); });
connect(item, &Internal::SideBarWidget::currentWidgetChanged, this, &SideBar::updateWidgets); connect(item, &Internal::SideBarWidget::currentWidgetChanged, this, &SideBar::updateWidgets);
insertWidget(position, item); insertWidget(position, item);
d->m_widgets.insert(position, item); d->m_widgets.insert(position, item);
@@ -219,20 +219,16 @@ void SideBar::removeSideBarWidget(Internal::SideBarWidget *widget)
widget->deleteLater(); widget->deleteLater();
} }
void SideBar::splitSubWidget() void SideBar::splitSubWidget(Internal::SideBarWidget *widget)
{ {
auto original = qobject_cast<Internal::SideBarWidget*>(sender()); int pos = indexOf(widget) + 1;
int pos = indexOf(original) + 1;
insertSideBarWidget(pos); insertSideBarWidget(pos);
updateWidgets(); updateWidgets();
} }
void SideBar::closeSubWidget() void SideBar::closeSubWidget(Internal::SideBarWidget *widget)
{ {
if (d->m_widgets.count() != 1) { if (d->m_widgets.count() != 1) {
auto widget = qobject_cast<Internal::SideBarWidget*>(sender());
if (!widget)
return;
removeSideBarWidget(widget); removeSideBarWidget(widget);
// update close button of top item // update close button of top item
if (d->m_widgets.size() == 1) if (d->m_widgets.size() == 1)

4
src/plugins/coreplugin/sidebar.h
View File

@@ -113,8 +113,8 @@ signals:
void availableItemsChanged(); void availableItemsChanged();
private: private:
void splitSubWidget(); void splitSubWidget(Internal::SideBarWidget *widget);
void closeSubWidget(); void closeSubWidget(Internal::SideBarWidget *widget);
void updateWidgets(); void updateWidgets();
Internal::SideBarWidget *insertSideBarWidget(int position, Internal::SideBarWidget *insertSideBarWidget(int position,