summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:16:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:16:03 -0600
commit5d44a8d2b82caef96937c4452cf2c02045d595e4 (patch)
tree6d606fb7555a990550a6f4a9c9aa5af3ded5b5bc
parentdffee3468e31b04b6cdb6fb52e1e8ae2a5446c69 (diff)
downloadthirdparty-5d44a8d2b82caef96937c4452cf2c02045d595e4.tar.gz
thirdparty-5d44a8d2b82caef96937c4452cf2c02045d595e4.zip
Rename a number of classes to enhance compatibility with KDE4
-rw-r--r--libreoffice/3.3.2/patches/libreoffice-trinity.diff4
-rw-r--r--libreoffice/3.3.3/patches/libreoffice-trinity.diff4
-rw-r--r--libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff4
3 files changed, 6 insertions, 6 deletions
diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 27c11ec..650f162 100644
--- 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() );
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index 6f8e6a1..43faf2d 100644
--- 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() );
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 95b7efd..9bb3d7b 100644
--- 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() );