diff options
| author | Aleix Pol <[email protected]> | 2020-03-31 15:35:33 +0200 |
|---|---|---|
| committer | Aleix Pol <[email protected]> | 2020-03-31 15:35:33 +0200 |
| commit | c01d1b4c0e909af716801e4b82862c50e8def4a4 (patch) | |
| tree | 6b7d4de74f1bd5cdc1534e690647071b1b169103 | |
| parent | 885916b7b486debe6fdc09e4eaf45b49a2f623e8 (diff) | |
Revert "Port deprecated signal (qt5.15)"
This reverts commit e545efee73a869aef4276baef0535169f03933de.
| -rw-r--r-- | src/settings/general/confirmationssettingspage.cpp | 4 | ||||
| -rw-r--r-- | src/settings/viewmodes/viewsettingstab.cpp | 12 | ||||
| -rw-r--r-- | src/settings/viewpropertiesdialog.cpp | 12 |
3 files changed, 0 insertions, 28 deletions
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index 58d49062f..dd4d60f3b 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -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 diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index 2175f75c8..06b0b8cf5 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -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); diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 2f5d55523..c3078d5df 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -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); |
