yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify code that destroys plugins and color manager

Browse source 
This reduces some code duplication and ensures that plugins and the
color manager are destroyed while Platform is still valid.
This commit is contained in:
Vlad Zahorodnii 2021-02-23 12:28:48 +02:00
parent e1279e516c
commit 6c9e0781cd
4 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autotests/integration/kwin_wayland_test.cpp
View file

@ -80,7 +80,6 @@ WaylandTestApplication::~WaylandTestApplication()
if (effects) { if (effects) {
static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects(); static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects();
} }
destroyPlugins();
delete m_xwayland; delete m_xwayland;
m_xwayland = nullptr; m_xwayland = nullptr;
destroyWorkspace(); destroyWorkspace();
@ -90,7 +89,6 @@ WaylandTestApplication::~WaylandTestApplication()
} }
waylandServer()->terminateClientConnections(); waylandServer()->terminateClientConnections();
destroyCompositor(); destroyCompositor();
destroyColorManager();
} }
void WaylandTestApplication::performStartup() void WaylandTestApplication::performStartup()

2
src/main.cpp
View file

@ -148,6 +148,8 @@ void Application::start()
Application::~Application() Application::~Application()
{ {
delete options; delete options;
destroyPlugins();
destroyColorManager();
destroyAtoms(); destroyAtoms();
destroyPlatform(); destroyPlatform();
} }

2
src/main_wayland.cpp
View file

@ -136,7 +136,6 @@ ApplicationWayland::~ApplicationWayland()
if (effects) { if (effects) {
static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects(); static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects();
} }
destroyPlugins();
delete m_xwayland; delete m_xwayland;
m_xwayland = nullptr; m_xwayland = nullptr;
destroyWorkspace(); destroyWorkspace();
@ -147,7 +146,6 @@ ApplicationWayland::~ApplicationWayland()
} }
waylandServer()->terminateClientConnections(); waylandServer()->terminateClientConnections();
destroyCompositor(); destroyCompositor();
destroyColorManager();
} }
void ApplicationWayland::performStartup() void ApplicationWayland::performStartup()

2
src/main_x11.cpp
View file

@ -190,8 +190,6 @@ void ApplicationX11::setReplace(bool replace)
void ApplicationX11::lostSelection() void ApplicationX11::lostSelection()
{ {
sendPostedEvents(); sendPostedEvents();
destroyPlugins();
destroyColorManager();
destroyCompositor(); destroyCompositor();
destroyWorkspace(); destroyWorkspace();
// Remove windowmanager privileges // Remove windowmanager privileges