diff options
| -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, 28 insertions, 0 deletions
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index dd4d60f3b..58d49062f 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -110,7 +110,11 @@ 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 06b0b8cf5..2175f75c8 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -120,11 +120,23 @@ 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 c3078d5df..2f5d55523 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -163,11 +163,23 @@ 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); |