diff options
| author | Timothy Pearson <[email protected]> | 2013-02-03 23:04:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-03 23:04:13 -0600 |
| commit | 8c5f73ae48a29b136425255cb6cbecb5470f7f1a (patch) | |
| tree | f4c228a0a7f6486f494f75ef2e1efc618913f814 | |
| parent | 05e000a316a8cb11359c01c403c614c12dc7f611 (diff) | |
| download | thirdparty-8c5f73ae48a29b136425255cb6cbecb5470f7f1a.tar.gz thirdparty-8c5f73ae48a29b136425255cb6cbecb5470f7f1a.zip | |
Rename KStyle to TDEStyle to avoid conflicts with KDE4
| -rw-r--r-- | libreoffice/3.3.2/patches/libreoffice-trinity.diff | 6 | ||||
| -rw-r--r-- | libreoffice/3.3.3/patches/libreoffice-trinity.diff | 6 | ||||
| -rw-r--r-- | libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff index ebb98e1..d660eb9 100644 --- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff @@ -13729,9 +13729,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ kapp->style().inherits( "KThemeStyle" ) || ++ kapp->style().inherits( "ThinKeramikStyle" ) ) ++ { -++ // Workaround for the workaround in KStyle::drawPrimitive() -++ KStyle *pStyle = static_cast< KStyle * >( &kapp->style() ); -++ pStyle->drawKStylePrimitive( KStyle::KPE_ToolBarHandle, +++ // Workaround for the workaround in TDEStyle::drawPrimitive() +++ TDEStyle *pStyle = static_cast< TDEStyle * >( &kapp->style() ); +++ pStyle->drawTDEStylePrimitive( TDEStyle::KPE_ToolBarHandle, ++ &qPainter, pToolBar, qThumbRect, ++ pWidget->colorGroup(), nStyle ); ++ } diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff index 17e777a..c190a2e 100644 --- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff @@ -13729,9 +13729,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ kapp->style().inherits( "KThemeStyle" ) || ++ kapp->style().inherits( "ThinKeramikStyle" ) ) ++ { -++ // Workaround for the workaround in KStyle::drawPrimitive() -++ KStyle *pStyle = static_cast< KStyle * >( &kapp->style() ); -++ pStyle->drawKStylePrimitive( KStyle::KPE_ToolBarHandle, +++ // Workaround for the workaround in TDEStyle::drawPrimitive() +++ TDEStyle *pStyle = static_cast< TDEStyle * >( &kapp->style() ); +++ pStyle->drawTDEStylePrimitive( TDEStyle::KPE_ToolBarHandle, ++ &qPainter, pToolBar, qThumbRect, ++ pWidget->colorGroup(), nStyle ); ++ } diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff index 0d76fdc..9423239 100644 --- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff +++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff @@ -14487,9 +14487,9 @@ index 0000000..7c173cc + kapp->style().inherits( "KThemeStyle" ) || + kapp->style().inherits( "ThinKeramikStyle" ) ) + { -+ // Workaround for the workaround in KStyle::drawPrimitive() -+ KStyle *pStyle = static_cast< KStyle * >( &kapp->style() ); -+ pStyle->drawKStylePrimitive( KStyle::KPE_ToolBarHandle, ++ // Workaround for the workaround in TDEStyle::drawPrimitive() ++ TDEStyle *pStyle = static_cast< TDEStyle * >( &kapp->style() ); ++ pStyle->drawTDEStylePrimitive( TDEStyle::KPE_ToolBarHandle, + &qPainter, pToolBar, qThumbRect, + pWidget->colorGroup(), nStyle ); + } |