vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Workspace::clientActivated signal changed to AbstractClient 

connections changed to new connect syntax to ensure they are correct.
icc-effect-5.14.5
Martin Gräßlin 2015-03-06 13:58:24 +01:00
parent 3ad117ac28
commit 8cfe0a9316
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
effects.cpp
View File

@ -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);
}
);

2
scripting/workspace_wrapper.cpp
View File

@ -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)));

2
scripting/workspace_wrapper.h
View File

@ -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);
/**

4
workspace.cpp
View File

@ -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);

2
workspace.h
View File

@ -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*);