Rename KStyle to TDEStyle to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 05e000a316
commit 8c5f73ae48

@ -13729,9 +13729,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ kapp->style().inherits( "KThemeStyle" ) || ++ kapp->style().inherits( "KThemeStyle" ) ||
++ kapp->style().inherits( "ThinKeramikStyle" ) ) ++ kapp->style().inherits( "ThinKeramikStyle" ) )
++ { ++ {
++ // Workaround for the workaround in KStyle::drawPrimitive() ++ // Workaround for the workaround in TDEStyle::drawPrimitive()
++ KStyle *pStyle = static_cast< KStyle * >( &kapp->style() ); ++ TDEStyle *pStyle = static_cast< TDEStyle * >( &kapp->style() );
++ pStyle->drawKStylePrimitive( KStyle::KPE_ToolBarHandle, ++ pStyle->drawTDEStylePrimitive( TDEStyle::KPE_ToolBarHandle,
++ &qPainter, pToolBar, qThumbRect, ++ &qPainter, pToolBar, qThumbRect,
++ pWidget->colorGroup(), nStyle ); ++ pWidget->colorGroup(), nStyle );
++ } ++ }

@ -13729,9 +13729,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ kapp->style().inherits( "KThemeStyle" ) || ++ kapp->style().inherits( "KThemeStyle" ) ||
++ kapp->style().inherits( "ThinKeramikStyle" ) ) ++ kapp->style().inherits( "ThinKeramikStyle" ) )
++ { ++ {
++ // Workaround for the workaround in KStyle::drawPrimitive() ++ // Workaround for the workaround in TDEStyle::drawPrimitive()
++ KStyle *pStyle = static_cast< KStyle * >( &kapp->style() ); ++ TDEStyle *pStyle = static_cast< TDEStyle * >( &kapp->style() );
++ pStyle->drawKStylePrimitive( KStyle::KPE_ToolBarHandle, ++ pStyle->drawTDEStylePrimitive( TDEStyle::KPE_ToolBarHandle,
++ &qPainter, pToolBar, qThumbRect, ++ &qPainter, pToolBar, qThumbRect,
++ pWidget->colorGroup(), nStyle ); ++ pWidget->colorGroup(), nStyle );
++ } ++ }

@ -14487,9 +14487,9 @@ index 0000000..7c173cc
+ kapp->style().inherits( "KThemeStyle" ) || + kapp->style().inherits( "KThemeStyle" ) ||
+ kapp->style().inherits( "ThinKeramikStyle" ) ) + kapp->style().inherits( "ThinKeramikStyle" ) )
+ { + {
+ // Workaround for the workaround in KStyle::drawPrimitive() + // Workaround for the workaround in TDEStyle::drawPrimitive()
+ KStyle *pStyle = static_cast< KStyle * >( &kapp->style() ); + TDEStyle *pStyle = static_cast< TDEStyle * >( &kapp->style() );
+ pStyle->drawKStylePrimitive( KStyle::KPE_ToolBarHandle, + pStyle->drawTDEStylePrimitive( TDEStyle::KPE_ToolBarHandle,
+ &qPainter, pToolBar, qThumbRect, + &qPainter, pToolBar, qThumbRect,
+ pWidget->colorGroup(), nStyle ); + pWidget->colorGroup(), nStyle );
+ } + }

Loading…
Cancel
Save