marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Port remaining old-style connects

Browse source
This commit is contained in:
Jonah Brüchert 2019-11-20 11:49:50 +01:00 committed by Bhushan Shah
parent 30d0306f63
commit 56fee1e3a7
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -8,6 +8,8 @@ set(KF5_MIN_VERSION "5.0.0")
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_STANDARD 14)
find_package(ECM 5.41.0 REQUIRED NO_MODULE) 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) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)

5
containments/homescreen/applicationlistmodel.cpp
View file

@ -39,9 +39,8 @@ ApplicationListModel::ApplicationListModel(HomeScreen *parent)
: QAbstractListModel(parent), : QAbstractListModel(parent),
m_homeScreen(parent) m_homeScreen(parent)
{ {
//can't use the new syntax as this signal is overloaded connect(KSycoca::self(), qOverload<const QStringList &>(&KSycoca::databaseChanged),
connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this, &ApplicationListModel::sycocaDbChanged);
this, SLOT(sycocaDbChanged(QStringList)));
loadSettings(); loadSettings();
} }

4
containments/taskpanel/taskpanel.cpp
View file

@ -88,7 +88,9 @@ void TaskPanel::initWayland()
//FIXME //FIXME
//connect(m_windowManagement, &PlasmaWindowManagement::activeWindowChanged, this, &TaskPanel::updateActiveWindow, Qt::QueuedConnection); //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(); updateActiveWindow();
} }
); );

4
dialer/src/call-manager.cpp
View file

@ -47,8 +47,8 @@ CallManager::CallManager(const Tp::CallChannelPtr &callChannel, DialerUtils *dia
d->dialerUtils = dialerUtils; d->dialerUtils = dialerUtils;
d->callChannel = callChannel; d->callChannel = callChannel;
connect(callChannel.data(), SIGNAL(callStateChanged(Tp::CallState)), connect(callChannel.data(), &Tp::CallChannel::callStateChanged,
SLOT(onCallStateChanged(Tp::CallState))); this, &CallManager::onCallStateChanged);
connect(d->dialerUtils, &DialerUtils::acceptCall, this, &CallManager::onCallAccepted); connect(d->dialerUtils, &DialerUtils::acceptCall, this, &CallManager::onCallAccepted);
connect(d->dialerUtils, &DialerUtils::rejectCall, this, &CallManager::onCallRejected); connect(d->dialerUtils, &DialerUtils::rejectCall, this, &CallManager::onCallRejected);