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

Move registerMetaType for SurfaceInterface* to main.cpp

Browse source 
Toplevel has the SurfaceInterface* exposed as a property which results
in a (incorrect) runtime warning on X11 about not registered meta type.
This commit is contained in:
Martin Gräßlin 2016-08-26 15:27:07 +02:00
parent 440cca918e
commit 1c1dca6da4
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.cpp
View file

@ -42,6 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KLocalizedString> #include <KLocalizedString>
#include <KPluginMetaData> #include <KPluginMetaData>
#include <KSharedConfig> #include <KSharedConfig>
#include <KWayland/Server/surface_interface.h>
// Qt // Qt
#include <qplatformdefs.h> #include <qplatformdefs.h>
#include <qcommandlineparser.h> #include <qcommandlineparser.h>
@ -105,6 +106,7 @@ Application::Application(Application::OperationMode mode, int &argc, char **argv
{ {
qRegisterMetaType<Options::WindowOperation>("Options::WindowOperation"); qRegisterMetaType<Options::WindowOperation>("Options::WindowOperation");
qRegisterMetaType<KWin::EffectWindow*>(); qRegisterMetaType<KWin::EffectWindow*>();
qRegisterMetaType<KWayland::Server::SurfaceInterface *>("KWayland::Server::SurfaceInterface *");
} }
void Application::setConfigLock(bool lock) void Application::setConfigLock(bool lock)

1
wayland_server.cpp
View file

@ -73,7 +73,6 @@ KWIN_SINGLETON_FACTORY(WaylandServer)
WaylandServer::WaylandServer(QObject *parent) WaylandServer::WaylandServer(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
qRegisterMetaType<KWayland::Server::SurfaceInterface *>("KWayland::Server::SurfaceInterface *");
qRegisterMetaType<KWayland::Server::OutputInterface::DpmsMode>(); qRegisterMetaType<KWayland::Server::OutputInterface::DpmsMode>();
connect(kwinApp(), &Application::screensCreated, this, &WaylandServer::initOutputs); connect(kwinApp(), &Application::screensCreated, this, &WaylandServer::initOutputs);