Rename KStyle to TDEStyle to avoid conflicts with KDE4

11 years ago · 8c5f73ae48
parent 05e000a316
commit 8c5f73ae48
3 changed files with 9 additions and 9 deletions
--- 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()
++                // 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,
 ++                        pWidget->colorGroup(), nStyle );
 ++            }
--- 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()
++                // 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,
 ++                        pWidget->colorGroup(), nStyle );
 ++            }
--- 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()
+                // 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,
 +                        pWidget->colorGroup(), nStyle );
 +            }