Commit 4cef894e authored by Martin Flöser's avatar Martin Flöser

Drop delegating Workspace::slotToggleCompositing

Instead connect global shortcut directly to method in Compositor.
parent 9b182780
...@@ -159,7 +159,7 @@ DEF(I18N_NOOP("Switch to Next Screen"), 0, slotSwitchToNextScreen); ...@@ -159,7 +159,7 @@ DEF(I18N_NOOP("Switch to Next Screen"), 0, slotSwitchToNextScreen);
DEF(I18N_NOOP("Switch to Previous Screen"), 0, slotSwitchToPrevScreen); DEF(I18N_NOOP("Switch to Previous Screen"), 0, slotSwitchToPrevScreen);
DEF(I18N_NOOP("Kill Window"), Qt::CTRL + Qt::ALT + Qt::Key_Escape, slotKillWindow); DEF(I18N_NOOP("Kill Window"), Qt::CTRL + Qt::ALT + Qt::Key_Escape, slotKillWindow);
DEF(I18N_NOOP("Suspend Compositing"), Qt::SHIFT + Qt::ALT + Qt::Key_F12, slotToggleCompositing); DEF6(I18N_NOOP("Suspend Compositing"), Qt::SHIFT + Qt::ALT + Qt::Key_F12, Compositor::self(), Compositor::slotToggleCompositing);
DEF6(I18N_NOOP("Invert Screen Colors"), 0, kwinApp()->platform(), Platform::invertScreen); DEF6(I18N_NOOP("Invert Screen Colors"), 0, kwinApp()->platform(), Platform::invertScreen);
#undef DEF #undef DEF
......
...@@ -34,6 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -34,6 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "useractions.h" #include "useractions.h"
#include "cursor.h" #include "cursor.h"
#include "client.h" #include "client.h"
#include "composite.h"
#include "input.h" #include "input.h"
#include "workspace.h" #include "workspace.h"
#include "effects.h" #include "effects.h"
......
...@@ -1654,13 +1654,6 @@ QString Workspace::supportInformation() const ...@@ -1654,13 +1654,6 @@ QString Workspace::supportInformation() const
return support; return support;
} }
void Workspace::slotToggleCompositing()
{
if (m_compositor) {
m_compositor->slotToggleCompositing();
}
}
Client *Workspace::findClient(std::function<bool (const Client*)> func) const Client *Workspace::findClient(std::function<bool (const Client*)> func) const
{ {
if (Client *ret = Toplevel::findInList(clients, func)) { if (Client *ret = Toplevel::findInList(clients, func)) {
......
...@@ -443,7 +443,6 @@ public Q_SLOTS: ...@@ -443,7 +443,6 @@ public Q_SLOTS:
void slotSetupWindowShortcut(); void slotSetupWindowShortcut();
void setupWindowShortcutDone(bool); void setupWindowShortcutDone(bool);
void slotToggleCompositing();
void updateClientArea(); void updateClientArea();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment