diff --git a/ksmserver/logout-greeter/CMakeLists.txt b/ksmserver/logout-greeter/CMakeLists.txt --- a/ksmserver/logout-greeter/CMakeLists.txt +++ b/ksmserver/logout-greeter/CMakeLists.txt @@ -1,4 +1,4 @@ -set(KSMSERVER_LOGOUT_GREETER_SRCS main.cpp ../shutdowndlg.cpp ../ksmserver_debug.cpp) +set(KSMSERVER_LOGOUT_GREETER_SRCS main.cpp shutdowndlg.cpp ../ksmserver_debug.cpp) add_executable(ksmserver-logout-greeter ${KSMSERVER_LOGOUT_GREETER_SRCS}) target_link_libraries(ksmserver-logout-greeter PW::KWorkspace diff --git a/ksmserver/logout-greeter/main.cpp b/ksmserver/logout-greeter/main.cpp --- a/ksmserver/logout-greeter/main.cpp +++ b/ksmserver/logout-greeter/main.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "../shutdowndlg.h" +#include "shutdowndlg.h" #include diff --git a/ksmserver/shutdowndlg.h b/ksmserver/logout-greeter/shutdowndlg.h rename from ksmserver/shutdowndlg.h rename to ksmserver/logout-greeter/shutdowndlg.h --- a/ksmserver/shutdowndlg.h +++ b/ksmserver/logout-greeter/shutdowndlg.h @@ -25,22 +25,9 @@ #ifndef SHUTDOWNDLG_H #define SHUTDOWNDLG_H -#include -#include +#include #include -class QMenu; -class QTimer; -class QTimeLine; -class QLabel; -class LogoutEffect; - -namespace Plasma -{ - class Svg; - class FrameSvg; -} - namespace KWayland { namespace Client @@ -50,10 +37,8 @@ } } -class QQuickView; - // The confirmation dialog -class KSMShutdownDlg : public QQuickView +class KSMShutdownDlg : public KQuickAddons::QuickViewSharedEngine { Q_OBJECT diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/logout-greeter/shutdowndlg.cpp rename from ksmserver/shutdowndlg.cpp rename to ksmserver/logout-greeter/shutdowndlg.cpp --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/logout-greeter/shutdowndlg.cpp @@ -56,7 +56,6 @@ #include #include #include -#include #include #include @@ -77,7 +76,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWindow* parent, bool maysd, bool choose, KWorkSpace::ShutdownType sdtype, KWayland::Client::PlasmaShell *plasmaShell) - : QQuickView(parent), + : QuickViewSharedEngine(parent), m_result(false), m_waylandPlasmaShell(plasmaShell) // this is a WType_Popup on purpose. Do not change that! Not @@ -87,7 +86,7 @@ setClearBeforeRendering(true); setColor(QColor(Qt::transparent)); - setResizeMode(QQuickView::SizeRootObjectToView); + setResizeMode(KQuickAddons::QuickViewSharedEngine::SizeRootObjectToView); // Qt doesn't set this on unmanaged windows //FIXME: or does it? @@ -196,7 +195,7 @@ 0.4, (backgroundColor.value() > 128 ? 1.6 : 0.3), 1.7); - QQuickView::showFullScreen(); + KQuickAddons::QuickViewSharedEngine::showFullScreen(); requestActivate(); KWindowSystem::setState(winId(), NET::SkipTaskbar|NET::SkipPager); @@ -206,7 +205,7 @@ void KSMShutdownDlg::resizeEvent(QResizeEvent *e) { - QQuickView::resizeEvent( e ); + KQuickAddons::QuickViewSharedEngine::resizeEvent( e ); if( KWindowSystem::compositingActive()) { //TODO: reenable window mask when we are without composite? @@ -230,7 +229,7 @@ break; } } - return QQuickView::event(e); + return KQuickAddons::QuickViewSharedEngine::event(e); } void KSMShutdownDlg::setupWaylandIntegration()