TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of classes to enhance compatibility with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent dffee3468e
commit 5d44a8d2b8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
libreoffice/3.3.2/patches/libreoffice-trinity.diff
Unescape View File

@ -14982,7 +14982,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ int flash_time = TQApplication::cursorFlashTime(); ++ int flash_time = TQApplication::cursorFlashTime();
++ aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME ); ++ aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
++ ++
++ KMainWindow qMainWindow; ++ TDEMainWindow qMainWindow;
++ qMainWindow.createGUI( "/dev/null" ); // hack ++ qMainWindow.createGUI( "/dev/null" ); // hack
++ ++
++ // Menu ++ // Menu
@ -15036,7 +15036,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } ++ }
++ ++
++ // Tool bar ++ // Tool bar
++ KToolBar *pToolBar = qMainWindow.toolBar(); ++ TDEToolBar *pToolBar = qMainWindow.toolBar();
++ if ( pToolBar ) ++ if ( pToolBar )
++ { ++ {
++ aFont = toFont( pToolBar->font(), rSettings.GetUILocale() ); ++ aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );

4
libreoffice/3.3.3/patches/libreoffice-trinity.diff
Unescape View File

@ -14982,7 +14982,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ int flash_time = TQApplication::cursorFlashTime(); ++ int flash_time = TQApplication::cursorFlashTime();
++ aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME ); ++ aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
++ ++
++ KMainWindow qMainWindow; ++ TDEMainWindow qMainWindow;
++ qMainWindow.createGUI( "/dev/null" ); // hack ++ qMainWindow.createGUI( "/dev/null" ); // hack
++ ++
++ // Menu ++ // Menu
@ -15036,7 +15036,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } ++ }
++ ++
++ // Tool bar ++ // Tool bar
++ KToolBar *pToolBar = qMainWindow.toolBar(); ++ TDEToolBar *pToolBar = qMainWindow.toolBar();
++ if ( pToolBar ) ++ if ( pToolBar )
++ { ++ {
++ aFont = toFont( pToolBar->font(), rSettings.GetUILocale() ); ++ aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );

4
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
Unescape View File

@ -15740,7 +15740,7 @@ index 0000000..7c173cc
+ int flash_time = TQApplication::cursorFlashTime(); + int flash_time = TQApplication::cursorFlashTime();
+ aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME ); + aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
+ +
+ KMainWindow qMainWindow; + TDEMainWindow qMainWindow;
+ qMainWindow.createGUI( "/dev/null" ); // hack + qMainWindow.createGUI( "/dev/null" ); // hack
+ +
+ // Menu + // Menu
@ -15794,7 +15794,7 @@ index 0000000..7c173cc
+ } + }
+ +
+ // Tool bar + // Tool bar
+ KToolBar *pToolBar = qMainWindow.toolBar(); + TDEToolBar *pToolBar = qMainWindow.toolBar();
+ if ( pToolBar ) + if ( pToolBar )
+ { + {
+ aFont = toFont( pToolBar->font(), rSettings.GetUILocale() ); + aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );

Write Preview
Loading…
Cancel
Save