From 56fee1e3a78d2fa75404d19c1ea44eb15a427be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Wed, 20 Nov 2019 11:49:50 +0100 Subject: [PATCH] Port remaining old-style connects --- CMakeLists.txt | 2 ++ containments/homescreen/applicationlistmodel.cpp | 5 ++--- containments/taskpanel/taskpanel.cpp | 6 ++++-- dialer/src/call-manager.cpp | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa0dfb74..b37f3ce0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,8 @@ set(KF5_MIN_VERSION "5.0.0") set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_CXX_STANDARD 14) + find_package(ECM 5.41.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake) diff --git a/containments/homescreen/applicationlistmodel.cpp b/containments/homescreen/applicationlistmodel.cpp index 5300d21f..776f171d 100644 --- a/containments/homescreen/applicationlistmodel.cpp +++ b/containments/homescreen/applicationlistmodel.cpp @@ -39,9 +39,8 @@ ApplicationListModel::ApplicationListModel(HomeScreen *parent) : QAbstractListModel(parent), m_homeScreen(parent) { - //can't use the new syntax as this signal is overloaded - connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), - this, SLOT(sycocaDbChanged(QStringList))); + connect(KSycoca::self(), qOverload(&KSycoca::databaseChanged), + this, &ApplicationListModel::sycocaDbChanged); loadSettings(); } diff --git a/containments/taskpanel/taskpanel.cpp b/containments/taskpanel/taskpanel.cpp index 818a931f..174a9981 100644 --- a/containments/taskpanel/taskpanel.cpp +++ b/containments/taskpanel/taskpanel.cpp @@ -87,8 +87,10 @@ void TaskPanel::initWayland() ); //FIXME //connect(m_windowManagement, &PlasmaWindowManagement::activeWindowChanged, this, &TaskPanel::updateActiveWindow, Qt::QueuedConnection); - - connect(m_windowManagement, SIGNAL(activeWindowChanged()), m_activeTimer, SLOT(start())); + + connect(m_windowManagement, &KWayland::Client::PlasmaWindowManagement::activeWindowChanged, + m_activeTimer, qOverload<>(&QTimer::start)); + updateActiveWindow(); } ); diff --git a/dialer/src/call-manager.cpp b/dialer/src/call-manager.cpp index f08f9a96..9c369a50 100644 --- a/dialer/src/call-manager.cpp +++ b/dialer/src/call-manager.cpp @@ -47,8 +47,8 @@ CallManager::CallManager(const Tp::CallChannelPtr &callChannel, DialerUtils *dia d->dialerUtils = dialerUtils; d->callChannel = callChannel; - connect(callChannel.data(), SIGNAL(callStateChanged(Tp::CallState)), - SLOT(onCallStateChanged(Tp::CallState))); + connect(callChannel.data(), &Tp::CallChannel::callStateChanged, + this, &CallManager::onCallStateChanged); connect(d->dialerUtils, &DialerUtils::acceptCall, this, &CallManager::onCallAccepted); connect(d->dialerUtils, &DialerUtils::rejectCall, this, &CallManager::onCallRejected);