Rename a number of classes to enhance compatibility with KDE4

11 years ago · 5d44a8d2b8
parent dffee3468e
commit 5d44a8d2b8
3 changed files with 6 additions and 6 deletions
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@ -14982,7 +14982,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    int flash_time = TQApplication::cursorFlashTime();
 ++    aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
 ++
-++    KMainWindow qMainWindow;
++    TDEMainWindow qMainWindow;
 ++    qMainWindow.createGUI( "/dev/null" ); // hack
 ++
 ++    // Menu
@ -15036,7 +15036,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    }
 ++
 ++    // Tool bar
-++    KToolBar *pToolBar = qMainWindow.toolBar();
++    TDEToolBar *pToolBar = qMainWindow.toolBar();
 ++    if ( pToolBar )
 ++    {
 ++        aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@ -14982,7 +14982,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    int flash_time = TQApplication::cursorFlashTime();
 ++    aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
 ++
-++    KMainWindow qMainWindow;
++    TDEMainWindow qMainWindow;
 ++    qMainWindow.createGUI( "/dev/null" ); // hack
 ++
 ++    // Menu
@ -15036,7 +15036,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    }
 ++
 ++    // Tool bar
-++    KToolBar *pToolBar = qMainWindow.toolBar();
++    TDEToolBar *pToolBar = qMainWindow.toolBar();
 ++    if ( pToolBar )
 ++    {
 ++        aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@ -15740,7 +15740,7 @@ index 0000000..7c173cc
 +    int flash_time = TQApplication::cursorFlashTime();
 +    aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
 +
-+    KMainWindow qMainWindow;
+    TDEMainWindow qMainWindow;
 +    qMainWindow.createGUI( "/dev/null" ); // hack
 +
 +    // Menu
@ -15794,7 +15794,7 @@ index 0000000..7c173cc
 +    }
 +
 +    // Tool bar
-+    KToolBar *pToolBar = qMainWindow.toolBar();
+    TDEToolBar *pToolBar = qMainWindow.toolBar();
 +    if ( pToolBar )
 +    {
 +        aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );