Rename a number of classes to enhance compatibility with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent dffee3468e
commit 5d44a8d2b8

@ -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() );

@ -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() );

@ -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() );

Loading…
Cancel
Save