mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Port deprecated signal (qt5.15)
This commit is contained in:
parent
4c923a531f
commit
e545efee73
|
@ -110,7 +110,11 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
|
||||||
connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
|
connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
|
||||||
connect(m_confirmEmptyTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
|
connect(m_confirmEmptyTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
|
||||||
connect(m_confirmDelete, &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);
|
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);
|
connect(m_confirmClosingMultipleTabs, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
|
||||||
|
|
||||||
#ifdef HAVE_TERMINAL
|
#ifdef HAVE_TERMINAL
|
||||||
|
|
|
@ -120,11 +120,23 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
|
||||||
|
|
||||||
switch (m_mode) {
|
switch (m_mode) {
|
||||||
case IconsMode:
|
case IconsMode:
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||||
connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
|
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);
|
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;
|
break;
|
||||||
case CompactMode:
|
case CompactMode:
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||||
connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
|
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;
|
break;
|
||||||
case DetailsMode:
|
case DetailsMode:
|
||||||
connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
|
connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
|
||||||
|
|
|
@ -163,11 +163,23 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
|
||||||
layout->addRow(QString(), m_showInGroups);
|
layout->addRow(QString(), m_showInGroups);
|
||||||
layout->addRow(QString(), m_showHiddenFiles);
|
layout->addRow(QString(), m_showHiddenFiles);
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||||
connect(m_viewMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
connect(m_viewMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||||
|
#else
|
||||||
|
connect(m_viewMode, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
|
||||||
|
#endif
|
||||||
this, &ViewPropertiesDialog::slotViewModeChanged);
|
this, &ViewPropertiesDialog::slotViewModeChanged);
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||||
connect(m_sorting, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
connect(m_sorting, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||||
|
#else
|
||||||
|
connect(m_sorting, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
|
||||||
|
#endif
|
||||||
this, &ViewPropertiesDialog::slotSortingChanged);
|
this, &ViewPropertiesDialog::slotSortingChanged);
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||||
connect(m_sortOrder, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
connect(m_sortOrder, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||||
|
#else
|
||||||
|
connect(m_sortOrder, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
|
||||||
|
#endif
|
||||||
this, &ViewPropertiesDialog::slotSortOrderChanged);
|
this, &ViewPropertiesDialog::slotSortOrderChanged);
|
||||||
connect(m_sortFoldersFirst, &QCheckBox::clicked,
|
connect(m_sortFoldersFirst, &QCheckBox::clicked,
|
||||||
this, &ViewPropertiesDialog::slotSortFoldersFirstChanged);
|
this, &ViewPropertiesDialog::slotSortFoldersFirstChanged);
|
||||||
|
|
Loading…
Reference in a new issue