diff --git a/bridge.cpp b/bridge.cpp index 2200ce8b83..9e41d736cc 100644 --- a/bridge.cpp +++ b/bridge.cpp @@ -180,11 +180,6 @@ int Bridge::currentDesktop() const return VirtualDesktopManager::self()->current(); } -QWidget* Bridge::initialParentWidget() const -{ - return NULL; -} - Qt::WindowFlags Bridge::initialWFlags() const { return Qt::WindowDoesNotAcceptFocus; diff --git a/bridge.h b/bridge.h index be099736dd..6958d7a696 100644 --- a/bridge.h +++ b/bridge.h @@ -74,7 +74,6 @@ public: virtual void setKeepAbove(bool) override; virtual void setKeepBelow(bool) override; virtual int currentDesktop() const override; - virtual QWidget* initialParentWidget() const override; virtual Qt::WindowFlags initialWFlags() const override; virtual void grabXServer(bool grab) override; diff --git a/kcmkwin/kwindecoration/preview.cpp b/kcmkwin/kwindecoration/preview.cpp index b5cc73bbf0..887982266e 100644 --- a/kcmkwin/kwindecoration/preview.cpp +++ b/kcmkwin/kwindecoration/preview.cpp @@ -184,11 +184,6 @@ KDecorationPreviewBridge::KDecorationPreviewBridge(KDecorationPreview* p, bool a { } -QWidget* KDecorationPreviewBridge::initialParentWidget() const -{ - return preview; -} - Qt::WindowFlags KDecorationPreviewBridge::initialWFlags() const { return 0; diff --git a/kcmkwin/kwindecoration/preview.h b/kcmkwin/kwindecoration/preview.h index 13fc79be57..d38895864f 100644 --- a/kcmkwin/kwindecoration/preview.h +++ b/kcmkwin/kwindecoration/preview.h @@ -106,7 +106,6 @@ public: virtual void setKeepAbove(bool) override; virtual void setKeepBelow(bool) override; virtual int currentDesktop() const override; - virtual QWidget* initialParentWidget() const override; virtual Qt::WindowFlags initialWFlags() const override; virtual void grabXServer(bool grab) override; diff --git a/libkdecorations/kcommondecoration.cpp b/libkdecorations/kcommondecoration.cpp index 5e2eda7966..52585f67af 100644 --- a/libkdecorations/kcommondecoration.cpp +++ b/libkdecorations/kcommondecoration.cpp @@ -1323,10 +1323,6 @@ void KCommonDecoration::createMainWidget(Qt::WindowFlags flags) { return d->wrapper->createMainWidget(flags); } -QWidget* KCommonDecoration::initialParentWidget() const -{ - return d->wrapper->initialParentWidget(); -} Qt::WindowFlags KCommonDecoration::initialWFlags() const { return d->wrapper->initialWFlags(); diff --git a/libkdecorations/kcommondecoration.h b/libkdecorations/kcommondecoration.h index 5f5197fc79..199e71f59e 100644 --- a/libkdecorations/kcommondecoration.h +++ b/libkdecorations/kcommondecoration.h @@ -354,7 +354,6 @@ Q_SIGNALS: public: void setMainWidget(QWidget*); void createMainWidget(Qt::WindowFlags flags = 0); - QWidget* initialParentWidget() const; Qt::WindowFlags initialWFlags() const; QWidget* widget(); const QWidget* widget() const; diff --git a/libkdecorations/kdecoration.cpp b/libkdecorations/kdecoration.cpp index a291724d37..efcbecb872 100644 --- a/libkdecorations/kdecoration.cpp +++ b/libkdecorations/kdecoration.cpp @@ -91,7 +91,7 @@ const KDecorationOptions* KDecoration::options() void KDecoration::createMainWidget(Qt::WindowFlags flags) { // FRAME check flags? - QWidget *w = new QWidget(initialParentWidget(), initialWFlags() | flags); + QWidget *w = new QWidget(nullptr, initialWFlags() | flags); w->setObjectName(QLatin1String("decoration widget")); if (options()->showTooltips()) w->setAttribute(Qt::WA_AlwaysShowToolTips); @@ -106,11 +106,6 @@ void KDecoration::setMainWidget(QWidget* w) widget()->resize(geometry().size()); } -QWidget* KDecoration::initialParentWidget() const -{ - return d->bridge->initialParentWidget(); -} - Qt::WindowFlags KDecoration::initialWFlags() const { return d->bridge->initialWFlags(); diff --git a/libkdecorations/kdecoration.h b/libkdecorations/kdecoration.h index adb0420b7e..1ad63ee83a 100644 --- a/libkdecorations/kdecoration.h +++ b/libkdecorations/kdecoration.h @@ -982,10 +982,6 @@ public: * like WX11BypassWM or WStyle_NoBorder are forbidden. */ void createMainWidget(Qt::WindowFlags flags = 0); - /** - * The parent widget that should be used for the main widget. - */ - QWidget* initialParentWidget() const; /** * The flags that should be used when creating the main widget. * It is possible to add more flags when creating the main widget, but only flags diff --git a/libkdecorations/kdecorationbridge.h b/libkdecorations/kdecorationbridge.h index 583f832380..bfdd38fdd6 100644 --- a/libkdecorations/kdecorationbridge.h +++ b/libkdecorations/kdecorationbridge.h @@ -81,7 +81,6 @@ public: virtual void setKeepBelow(bool) = 0; // not part of public API virtual int currentDesktop() const = 0; - virtual QWidget* initialParentWidget() const = 0; virtual Qt::WindowFlags initialWFlags() const = 0; virtual void grabXServer(bool grab) = 0;