diff --git a/kstyles/oxygen/oxygenframeshadow.cpp b/kstyles/oxygen/oxygenframeshadow.cpp index d294e8c7..4229cf8e 100644 --- a/kstyles/oxygen/oxygenframeshadow.cpp +++ b/kstyles/oxygen/oxygenframeshadow.cpp @@ -77,14 +77,6 @@ namespace Oxygen if( !accepted ) return false; - // make sure that the widget is not embedded into a KWebView - QWidget* parent( widget->parentWidget() ); - while( parent && !parent->isTopLevel() ) - { - if( parent->inherits( "KWebView" ) ) return false; - parent = parent->parentWidget(); - } - // store in set _registeredWidgets.insert( widget ); diff --git a/kstyles/oxygen/oxygenstyle.cpp b/kstyles/oxygen/oxygenstyle.cpp index 3a24b295..d387c9f2 100644 --- a/kstyles/oxygen/oxygenstyle.cpp +++ b/kstyles/oxygen/oxygenstyle.cpp @@ -222,14 +222,6 @@ namespace Oxygen } - // adjust layout for K3B themed headers - // FIXME: to be removed when fixed upstream - if( widget->inherits( "K3b::ThemedHeader" ) && widget->layout() ) - { - widget->layout()->setMargin( 0 ); - frameShadowFactory().setHasContrast( widget, true ); - } - // adjust flags for windows and dialogs switch( widget->windowFlags() & Qt::WindowType_Mask ) { @@ -7710,19 +7702,6 @@ namespace Oxygen if( !scrollArea ) return; - // HACK: add exception for KPIM transactionItemView, which is an overlay widget - // and must have filled background. This is a temporary workaround until a more - // robust solution is found. - if( scrollArea->inherits( "KPIM::TransactionItemView" ) ) - { - // also need to make the scrollarea background plain ( using autofill background ) - // so that optional vertical scrollbar background is not transparent either. - // TODO: possibly add an event filter to use the "normal" window background - // instead of something flat. - scrollArea->setAutoFillBackground( true ); - return; - } - // check frame style and background role if( !(scrollArea->frameShape() == QFrame::NoFrame || scrollArea->backgroundRole() == QPalette::Window ) ) { return; } diff --git a/kstyles/oxygen/oxygenwindowmanager.cpp b/kstyles/oxygen/oxygenwindowmanager.cpp index 199f9f22..ca12c5a7 100644 --- a/kstyles/oxygen/oxygenwindowmanager.cpp +++ b/kstyles/oxygen/oxygenwindowmanager.cpp @@ -332,9 +332,6 @@ namespace Oxygen !isDockWidgetTitle( widget ) ) { return true; } - if( widget->inherits( "KScreenSaver" ) && widget->inherits( "KCModule" ) ) - { return true; } - if( isWhiteListed( widget ) ) { return true; }