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

Drop Qt5: Various plugins: Get rid of QOverload

Browse Source 
Change-Id: I4913044f8897fd3449dbb537e4af6785eb3ad447
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-07-19 23:43:58 +02:00
parent ae4db886f3
commit e32ebe2146
25 changed files with 44 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/help/generalsettingspage.cpp
View File

@@ -245,24 +245,23 @@ QWidget *GeneralSettingsPage::widget()
updateFontStyleSelector();
updateFontFamilySelector();
connect(m_widget->familyComboBox, &QFontComboBox::currentFontChanged, this, [this]() {
connect(m_widget->familyComboBox, &QFontComboBox::currentFontChanged, this, [this] {
updateFont();
updateFontStyleSelector();
updateFontSizeSelector();
updateFont(); // changes that might have happened when updating the selectors
});
connect(m_widget->styleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, [this]() {
connect(m_widget->styleComboBox, &QComboBox::currentIndexChanged, this, [this] {
updateFont();
updateFontSizeSelector();
updateFont(); // changes that might have happened when updating the selectors
});
connect(m_widget->sizeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
connect(m_widget->sizeComboBox, &QComboBox::currentIndexChanged,
this, &GeneralSettingsPage::updateFont);
connect(m_widget->zoomSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
connect(m_widget->zoomSpinBox, &QSpinBox::valueChanged,
this, [this](int value) { m_fontZoom = value; });
m_homePage = LocalHelpManager::homePage();

3
src/plugins/help/helpwidget.cpp
View File

@@ -371,8 +371,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
layout->addWidget(m_filterComboBox);
connect(&LocalHelpManager::helpEngine(), &QHelpEngine::setupFinished,
this, &HelpWidget::setupFilterCombo, Qt::QueuedConnection);
connect(m_filterComboBox, QOverload<int>::of(&QComboBox::activated),
this, &HelpWidget::filterDocumentation);
connect(m_filterComboBox, &QComboBox::activated, this, &HelpWidget::filterDocumentation);
connect(LocalHelpManager::filterEngine(), &QHelpFilterEngine::filterActivated,
this, &HelpWidget::currentFilterChanged);

11
src/plugins/help/openpagesmanager.cpp
View File

@@ -59,15 +59,10 @@ OpenPagesManager::OpenPagesManager(HelpWidget *helpWidget)
m_comboBox = new QComboBox;
m_comboBox->setModel(m_helpWidget->model());
m_comboBox->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_comboBox,
QOverload<int>::of(&QComboBox::activated),
m_helpWidget,
&HelpWidget::setCurrentIndex);
connect(m_comboBox, &QComboBox::activated, m_helpWidget, &HelpWidget::setCurrentIndex);
connect(m_helpWidget, &HelpWidget::currentIndexChanged, m_comboBox, &QComboBox::setCurrentIndex);
connect(m_comboBox,
&QWidget::customContextMenuRequested,
this,
&OpenPagesManager::openPagesContextMenu);
connect(m_comboBox, &QWidget::customContextMenuRequested,
this, &OpenPagesManager::openPagesContextMenu);
m_openPagesSwitcher = new OpenPagesSwitcher(m_helpWidget->model());
connect(m_openPagesSwitcher, &OpenPagesSwitcher::closePage, this,