Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit c1e2b135 authored by Kåre Särs's avatar Kåre Särs

Fix a couple of regressions in the conversion to modern connect()

Fix Toggle Locale action in SQL plug-in
Fix Next button and search-combo-box context-menu in Search & Replace
Fix update timer connection in SymbolViewer plug-in

BUG: 388752
parent 4ff85449
......@@ -92,7 +92,7 @@ DataOutputWidget::DataOutputWidget(QWidget *parent)
KToggleAction *toggleAction = new KToggleAction( QIcon::fromTheme(QLatin1String("applications-education-language")), i18nc("@action:intoolbar", "Use system locale"), this);
toolbar->addAction(toggleAction);
connect(action, &QAction::triggered, this, &DataOutputWidget::slotToggleLocale);
connect(toggleAction, &QAction::triggered, this, &DataOutputWidget::slotToggleLocale);
m_dataLayout->addWidget(m_view);
......
......@@ -299,14 +299,14 @@ m_mainWindow (mainWin)
connect(m_ui.searchCombo, &QComboBox::editTextChanged, &m_changeTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(m_ui.matchCase, &QToolButton::toggled, &m_changeTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(m_ui.matchCase, &QToolButton::toggled, [=]{
connect(m_ui.matchCase, &QToolButton::toggled, this, [=]{
Results *res = qobject_cast<Results *>(m_ui.resultTabWidget->currentWidget());
if (res) {
res->matchCase = m_ui.matchCase->isChecked();
}
});
connect(m_ui.useRegExp, &QToolButton::toggled, &m_changeTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(m_ui.useRegExp, &QToolButton::toggled, [=]{
connect(m_ui.useRegExp, &QToolButton::toggled, this, [=]{
Results *res = qobject_cast<Results *>(m_ui.resultTabWidget->currentWidget());
if (res) {
res->useRegExp = m_ui.useRegExp->isChecked();
......@@ -336,7 +336,7 @@ m_mainWindow (mainWin)
connect(m_ui.stopButton, &QPushButton::clicked, &m_folderFilesList, &FolderFilesList::cancelSearch);
connect(m_ui.stopButton, &QPushButton::clicked, &m_replacer, &ReplaceMatches::cancelReplace);
connect(m_ui.newTabButton, &QToolButton::clicked, this, &KatePluginSearchView::goToNextMatch);
connect(m_ui.nextButton, &QToolButton::clicked, this, &KatePluginSearchView::goToNextMatch);
connect(m_ui.replaceButton, &QPushButton::clicked, this, &KatePluginSearchView::replaceSingleMatch);
connect(m_ui.replaceCheckedBtn, &QPushButton::clicked, this, &KatePluginSearchView::replaceChecked);
......@@ -369,7 +369,7 @@ m_mainWindow (mainWin)
// Hook into line edit context menus
m_ui.searchCombo->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui.searchButton, &QPushButton::customContextMenuRequested, this, &KatePluginSearchView::searchContextMenu);
connect(m_ui.searchCombo, &QComboBox::customContextMenuRequested, this, &KatePluginSearchView::searchContextMenu);
m_ui.searchCombo->completer()->setCompletionMode(QCompleter::PopupCompletion);
m_ui.searchCombo->completer()->setCaseSensitivity(Qt::CaseSensitive);
m_ui.searchCombo->setInsertPolicy(QComboBox::NoInsert);
......
......@@ -106,7 +106,7 @@ KatePluginSymbolViewerView::KatePluginSymbolViewerView(KTextEditor::Plugin *plug
func_on = true;
m_updateTimer.setSingleShot(true);
connect(&m_updateTimer, &QTimer::timerId, this, &KatePluginSymbolViewerView::slotRefreshSymbol);
connect(&m_updateTimer, &QTimer::timeout, this, &KatePluginSymbolViewerView::slotRefreshSymbol);
m_currItemTimer.setSingleShot(true);
connect(&m_currItemTimer, &QTimer::timeout, this, &KatePluginSymbolViewerView::updateCurrTreeItem);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment