diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2017-09-20 12:48:13 +0300 |
---|---|---|
committer | Olivier Goffart <olivier@woboq.com> | 2017-09-21 15:05:39 +0300 |
commit | 35e4fe061d3db7cdb5852bafe290071e5f512e82 (patch) | |
tree | 70616738b939f3746155ca0671407b84aaa5dff3 /src/gui/activitywidget.cpp | |
parent | 02924ad83e4a44c381f7c7d9ef1db981e4810d1d (diff) |
Port to new signal-slot syntax what cannot be done automatically
Some slot were protected or private but needed to be public.
Some needed a static_cast (can't use qOverload because it is in Qt 5.7)
This is not only a partial change.
Diffstat (limited to 'src/gui/activitywidget.cpp')
-rw-r--r-- | src/gui/activitywidget.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp index 9091b80bc..b089fef9b 100644 --- a/src/gui/activitywidget.cpp +++ b/src/gui/activitywidget.cpp @@ -90,8 +90,7 @@ ActivityWidget::ActivityWidget(QWidget *parent) connect(_model, &QAbstractItemModel::rowsInserted, this, &ActivityWidget::rowsInserted); - connect(_ui->_activityList, SIGNAL(activated(QModelIndex)), this, - SLOT(slotOpenFile(QModelIndex))); + connect(_ui->_activityList, &QListView::activated, this, &ActivityWidget::slotOpenFile); connect(&_removeTimer, &QTimer::timeout, this, &ActivityWidget::slotCheckToCleanWidgets); _removeTimer.setInterval(1000); @@ -113,8 +112,8 @@ void ActivityWidget::slotRefreshNotifications(AccountState *ptr) // are running if (_notificationRequestsRunning == 0) { ServerNotificationHandler *snh = new ServerNotificationHandler; - connect(snh, SIGNAL(newNotificationList(ActivityList)), this, - SLOT(slotBuildNotificationDisplay(ActivityList))); + connect(snh, &ServerNotificationHandler::newNotificationList, + this, &ActivityWidget::slotBuildNotificationDisplay); snh->slotFetchNotifications(ptr); } else { @@ -388,8 +387,8 @@ void ActivityWidget::slotSendNotificationRequest(const QString &accountName, con job->setWidget(theSender); connect(job, &AbstractNetworkJob::networkError, this, &ActivityWidget::slotNotifyNetworkError); - connect(job, SIGNAL(jobFinished(QString, int)), - this, SLOT(slotNotifyServerFinished(QString, int))); + connect(job, &NotificationConfirmJob::jobFinished, + this, &ActivityWidget::slotNotifyServerFinished); job->start(); // count the number of running notification requests. If this member var |