kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-15 18:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Port deprecated signal (qt5.15)"

Browse source 
This reverts commit e545efee73.

(Cherry-picked from c01d1b4c0e)
This commit is contained in:
Aleix Pol 2020-03-31 15:35:33 +02:00 committed by Heiko Becker
parent 9b82b08fb1
commit d868568d81
3 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/settings/general/confirmationssettingspage.cpp
View file

@ -110,11 +110,7 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
connect(m_confirmEmptyTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
connect(m_confirmDelete, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_confirmScriptExecution, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ConfirmationsSettingsPage::changed);
#else
connect(m_confirmScriptExecution, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &ConfirmationsSettingsPage::changed);
#endif
connect(m_confirmClosingMultipleTabs, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
#ifdef HAVE_TERMINAL

12
src/settings/viewmodes/viewsettingstab.cpp
View file

@ -120,23 +120,11 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
switch (m_mode) {
case IconsMode:
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
#else
connect(m_widthBox, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_maxLinesBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
#else
connect(m_maxLinesBox, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
#endif
break;
case CompactMode:
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
#else
connect(m_widthBox, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
#endif
break;
case DetailsMode:
connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);

12
src/settings/viewpropertiesdialog.cpp
View file

@ -163,23 +163,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
layout->addRow(QString(), m_showInGroups);
layout->addRow(QString(), m_showHiddenFiles);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_viewMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
#else
connect(m_viewMode, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
#endif
this, &ViewPropertiesDialog::slotViewModeChanged);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_sorting, QOverload<int>::of(&QComboBox::currentIndexChanged),
#else
connect(m_sorting, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
#endif
this, &ViewPropertiesDialog::slotSortingChanged);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(m_sortOrder, QOverload<int>::of(&QComboBox::currentIndexChanged),
#else
connect(m_sortOrder, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
#endif
this, &ViewPropertiesDialog::slotSortOrderChanged);
connect(m_sortFoldersFirst, &QCheckBox::clicked,
this, &ViewPropertiesDialog::slotSortFoldersFirstChanged);