From f2ea46d7a4739f00c0a917d9fdd16a52acefdc59 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <gennady.pospelov@gmail.com>
Date: Tue, 12 Jan 2021 17:58:41 +0100
Subject: [PATCH] Replace SIGNAL/SLOT by the non-macro versions.
---
.../Views/CommonWidgets/ItemSelectorWidget.cpp | 10 ++++------
.../Views/CommonWidgets/ItemStackWidget.cpp | 15 ++++++++-------
GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
index df38ff57ec8..6e9b9cb3fff 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -33,8 +33,8 @@ ItemSelectorWidget::ItemSelectorWidget(QWidget* parent)
m_listView->setContextMenuPolicy(Qt::CustomContextMenu);
m_listView->setAttribute(Qt::WA_MacShowFocusRect, false);
- connect(m_listView, SIGNAL(customContextMenuRequested(const QPoint&)), this,
- SLOT(onCustomContextMenuRequested(const QPoint&)));
+ connect(m_listView, &QListView::customContextMenuRequested, this,
+ &ItemSelectorWidget::onCustomContextMenuRequested);
}
ItemSelectorWidget::~ItemSelectorWidget() = default;
@@ -118,10 +118,8 @@ void ItemSelectorWidget::connectModel()
m_decorationModel = std::make_unique<SessionDecorationModel>(nullptr, m_model);
m_listView->setModel(m_decorationModel.get());
- connect(m_listView->selectionModel(),
- SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this,
- SLOT(onSelectionChanged(const QItemSelection&, const QItemSelection&)),
- Qt::UniqueConnection);
+ connect(m_listView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
+ &ItemSelectorWidget::onSelectionChanged, Qt::UniqueConnection);
}
void ItemSelectorWidget::disconnectModel()
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
index 1c934ab0ecd..a8f72b230c1 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
@@ -76,11 +76,11 @@ void ItemStackWidget::connectModel()
if (!m_model)
return;
- connect(m_model, SIGNAL(modelAboutToBeReset()), this, SLOT(onModelAboutToBeReset()),
- Qt::UniqueConnection);
+ connect(m_model, &SessionModel::modelAboutToBeReset, this,
+ &ItemStackWidget::onModelAboutToBeReset, Qt::UniqueConnection);
- connect(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this,
- SLOT(onRowsAboutToBeRemoved(QModelIndex, int, int)), Qt::UniqueConnection);
+ connect(m_model, &SessionModel::rowsAboutToBeRemoved, this,
+ &ItemStackWidget::onRowsAboutToBeRemoved, Qt::UniqueConnection);
}
void ItemStackWidget::disconnectModel()
@@ -88,10 +88,11 @@ void ItemStackWidget::disconnectModel()
if (!m_model)
return;
- disconnect(m_model, SIGNAL(modelAboutToBeReset()), this, SLOT(onModelAboutToBeReset()));
+ disconnect(m_model, &SessionModel::modelAboutToBeReset, this,
+ &ItemStackWidget::onModelAboutToBeReset);
- disconnect(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this,
- SLOT(onRowsAboutToBeRemoved(QModelIndex, int, int)));
+ disconnect(m_model, &SessionModel::rowsAboutToBeRemoved, this,
+ &ItemStackWidget::onRowsAboutToBeRemoved);
}
//! Checks if model was set correctly.
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp b/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
index d5f1d87c92e..95293bed9e4 100644
--- a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
+++ b/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
@@ -24,7 +24,7 @@ UpdateTimer::UpdateTimer(int timerInterval, QObject* parent)
{
m_timer->setInterval(m_timer_interval);
m_timer->setSingleShot(true);
- connect(m_timer, SIGNAL(timeout()), this, SLOT(onTimerTimeout()));
+ connect(m_timer, &QTimer::timeout, this, &UpdateTimer::onTimerTimeout);
}
void UpdateTimer::reset()
--
GitLab