diff --git a/effects.cpp b/effects.cpp
index 3565129b2..e939a8b12 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -253,7 +253,7 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene)
         }
     );
     connect(ws, &Workspace::clientActivated, this,
-        [this](KWin::Client *c) {
+        [this](KWin::AbstractClient *c) {
             emit windowActivated(c ? c->effectWindow() : nullptr);
         }
     );
diff --git a/scripting/workspace_wrapper.cpp b/scripting/workspace_wrapper.cpp
index 9de5a4348..9f80555ff 100644
--- a/scripting/workspace_wrapper.cpp
+++ b/scripting/workspace_wrapper.cpp
@@ -43,7 +43,7 @@ WorkspaceWrapper::WorkspaceWrapper(QObject* parent) : QObject(parent)
     connect(ws, SIGNAL(clientAdded(KWin::Client*)), SIGNAL(clientAdded(KWin::Client*)));
     connect(ws, SIGNAL(clientAdded(KWin::Client*)), SLOT(setupClientConnections(KWin::Client*)));
     connect(ws, SIGNAL(clientRemoved(KWin::Client*)), SIGNAL(clientRemoved(KWin::Client*)));
-    connect(ws, SIGNAL(clientActivated(KWin::Client*)), SIGNAL(clientActivated(KWin::Client*)));
+    connect(ws, &Workspace::clientActivated, this, &WorkspaceWrapper::clientActivated);
     connect(vds, SIGNAL(countChanged(uint,uint)), SIGNAL(numberDesktopsChanged(uint)));
     connect(vds, SIGNAL(layoutChanged(int,int)), SIGNAL(desktopLayoutChanged()));
     connect(ws, SIGNAL(clientDemandsAttentionChanged(KWin::Client*,bool)), SIGNAL(clientDemandsAttentionChanged(KWin::Client*,bool)));
diff --git a/scripting/workspace_wrapper.h b/scripting/workspace_wrapper.h
index b9f7b6efc..2f86a772d 100644
--- a/scripting/workspace_wrapper.h
+++ b/scripting/workspace_wrapper.h
@@ -98,7 +98,7 @@ Q_SIGNALS:
     void clientRestored(KWin::Client *client);
     void clientMaximizeSet(KWin::Client *client, bool h, bool v);
     void killWindowCalled(KWin::Client *client);
-    void clientActivated(KWin::Client *client);
+    void clientActivated(KWin::AbstractClient *client);
     void clientFullScreenSet(KWin::Client *client, bool fullScreen, bool user);
     void clientSetKeepAbove(KWin::Client *client, bool keepAbove);
     /**
diff --git a/workspace.cpp b/workspace.cpp
index 46882f84c..e10ef4627 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -152,7 +152,7 @@ Workspace::Workspace(bool restore)
     options->loadConfig();
     options->loadCompositingConfig(false);
     ColorMapper *colormaps = new ColorMapper(this);
-    connect(this, SIGNAL(clientActivated(KWin::Client*)), colormaps, SLOT(update()));
+    connect(this, &Workspace::clientActivated, colormaps, &ColorMapper::update);
 
     delayFocusTimer = 0;
 
@@ -226,7 +226,7 @@ void Workspace::init()
     screenEdges->init();
     connect(options, SIGNAL(configChanged()), screenEdges, SLOT(reconfigure()));
     connect(VirtualDesktopManager::self(), SIGNAL(layoutChanged(int,int)), screenEdges, SLOT(updateLayout()));
-    connect(this, SIGNAL(clientActivated(KWin::Client*)), screenEdges, SIGNAL(checkBlocking()));
+    connect(this, &Workspace::clientActivated, screenEdges, &ScreenEdges::checkBlocking);
 
     FocusChain *focusChain = FocusChain::create(this);
     connect(this, &Workspace::clientRemoved, focusChain, &FocusChain::remove);
diff --git a/workspace.h b/workspace.h
index 499f22182..ff3a9be05 100644
--- a/workspace.h
+++ b/workspace.h
@@ -445,7 +445,7 @@ Q_SIGNALS:
     void currentDesktopChanged(int, KWin::AbstractClient*);
     void clientAdded(KWin::Client*);
     void clientRemoved(KWin::Client*);
-    void clientActivated(KWin::Client*);
+    void clientActivated(KWin::AbstractClient*);
     void clientDemandsAttentionChanged(KWin::Client*, bool);
     void groupAdded(KWin::Group*);
     void unmanagedAdded(KWin::Unmanaged*);