Commit 6c41a5b2 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧 Committed by Antonio Rojas
Browse files

Revert premature porting

The signal we were porting to was removed in Qt 5.15
parent ba0e68f7
......@@ -118,11 +118,7 @@ ConfigView::ConfigView(QWidget *parent, KTextEditor::MainWindow *mainWin)
m_advanced->hide();
connect(m_targetCombo, &QComboBox::editTextChanged, this, &ConfigView::slotTargetEdited);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_targetCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &ConfigView::slotTargetSelected);
#else
connect(m_targetCombo, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &ConfigView::slotTargetSelected);
#endif
connect(m_addTarget, &QToolButton::clicked, this, &ConfigView::slotAddTarget);
connect(m_copyTarget, &QToolButton::clicked, this, &ConfigView::slotCopyTarget);
connect(m_deleteTarget, &QToolButton::clicked, this, &ConfigView::slotDeleteTarget);
......
......@@ -138,11 +138,7 @@ KatePluginGDBView::KatePluginGDBView(KTextEditor::Plugin *plugin, KTextEditor::M
m_stackTree->setAutoScroll(false);
connect(m_stackTree, &QTreeWidget::itemActivated, this, &KatePluginGDBView::stackFrameSelected);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_threadCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &KatePluginGDBView::threadSelected);
#else
connect(m_threadCombo, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &KatePluginGDBView::threadSelected);
#endif
m_localsView = new LocalsView();
......
......@@ -90,14 +90,8 @@ KateSQLView::KateSQLView(KTextEditor::Plugin *plugin, KTextEditor::MainWindow *m
connect(m_manager, &SQLManager::queryActivated, this, &KateSQLView::slotQueryActivated);
connect(m_manager, &SQLManager::connectionCreated, this, &KateSQLView::slotConnectionCreated);
connect(m_manager, &SQLManager::connectionAboutToBeClosed, this, &KateSQLView::slotConnectionAboutToBeClosed);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_connectionsComboBox, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), this, &KateSQLView::slotConnectionChanged);
#else
connect(m_connectionsComboBox, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, [this](int index, const QString &connection) {
Q_UNUSED(index);
slotConnectionChanged(connection);
});
#endif
stateChanged(QStringLiteral("has_connection_selected"), KXMLGUIClient::StateReverse);
}
......
......@@ -67,11 +67,7 @@ KateProjectInfoViewCodeAnalysis::KateProjectInfoViewCodeAnalysis(KateProjectPlug
* Connect selection change callback
* and attach model to code analysis selector
*/
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_toolSelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &KateProjectInfoViewCodeAnalysis::slotToolSelectionChanged);
#else
connect(m_toolSelector, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &KateProjectInfoViewCodeAnalysis::slotToolSelectionChanged);
#endif
m_toolSelector->setModel(KateProjectCodeAnalysisSelector::model(this));
/**
......
......@@ -83,11 +83,7 @@ KateProjectPluginView::KateProjectPluginView(KateProjectPlugin *plugin, KTextEdi
m_stackedProjectViews = new QStackedWidget(m_toolView);
m_stackedProjectInfoViews = new QStackedWidget(m_toolInfoView);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_projectsCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &KateProjectPluginView::slotCurrentChanged);
#else
connect(m_projectsCombo, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &KateProjectPluginView::slotCurrentChanged);
#endif
connect(m_reloadButton, &QToolButton::clicked, this, &KateProjectPluginView::slotProjectReload);
/**
......
......@@ -419,16 +419,8 @@ KatePluginSearchView::KatePluginSearchView(KTextEditor::Plugin *plugin, KTextEdi
connect(m_ui.searchButton, &QPushButton::clicked, this, &KatePluginSearchView::startSearch);
connect(m_ui.displayOptions, &QToolButton::toggled, this, &KatePluginSearchView::toggleOptions);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_ui.searchPlaceCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &KatePluginSearchView::searchPlaceChanged);
#else
connect(m_ui.searchPlaceCombo, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &KatePluginSearchView::searchPlaceChanged);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_ui.searchPlaceCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, [this](int) {
#else
connect(m_ui.searchPlaceCombo, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, [this](int) {
#endif
if (m_ui.searchPlaceCombo->currentIndex() == Folder) {
m_ui.displayOptions->setChecked(true);
}
......
......@@ -162,11 +162,7 @@ KateConfigDialog::KateConfigDialog(KateMainWindow *parent, KTextEditor::View *vi
m_cmbQuickOpenMatchMode->addItem(i18n("Filepath"), QVariant(KateQuickOpenModel::Columns::FilePath));
m_cmbQuickOpenMatchMode->setCurrentIndex(m_cmbQuickOpenMatchMode->findData(m_mainWindow->quickOpenMatchMode()));
m_mainWindow->setQuickOpenMatchMode(m_cmbQuickOpenMatchMode->currentData().toInt());
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_cmbQuickOpenMatchMode, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &KateConfigDialog::slotChanged);
#else
connect(m_cmbQuickOpenMatchMode, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &KateConfigDialog::slotChanged);
#endif
vbox->addLayout(hlayout);
// quick open list mode
hlayout = new QHBoxLayout;
......@@ -179,11 +175,7 @@ KateConfigDialog::KateConfigDialog(KateMainWindow *parent, KTextEditor::View *vi
m_cmbQuickOpenListMode->addItem(i18n("All Projects Files"), QVariant(KateQuickOpenModel::List::AllProjects));
m_cmbQuickOpenListMode->setCurrentIndex(m_cmbQuickOpenListMode->findData(m_mainWindow->quickOpenListMode()));
m_mainWindow->setQuickOpenListMode(static_cast<KateQuickOpenModel::List>(m_cmbQuickOpenListMode->currentData().toInt()));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_cmbQuickOpenListMode, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &KateConfigDialog::slotChanged);
#else
connect(m_cmbQuickOpenListMode, static_cast<void (QComboBox::*)(int, const QString &)>(&QComboBox::currentIndexChanged) , this, &KateConfigDialog::slotChanged);
#endif
vbox->addLayout(hlayout);
layout->addWidget(buttonGroup);
......
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