summaryrefslogtreecommitdiffstats
path: root/libreoffice
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:23:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:23:29 -0600
commit05e000a316a8cb11359c01c403c614c12dc7f611 (patch)
tree82005a54034bdc79421dfe98ab415b277f6b70cf /libreoffice
parent5d44a8d2b82caef96937c4452cf2c02045d595e4 (diff)
downloadthirdparty-05e000a316a8cb11359c01c403c614c12dc7f611.tar.gz
thirdparty-05e000a316a8cb11359c01c403c614c12dc7f611.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice')
-rw-r--r--libreoffice/3.3.2/patches/libreoffice-trinity.diff2
-rw-r--r--libreoffice/3.3.3/patches/libreoffice-trinity.diff2
-rw-r--r--libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff4
-rw-r--r--libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff4
4 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 650f162..ebb98e1 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -12192,7 +12192,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <kglobal.h>
++#include <kglobalsettings.h>
++#include <klocale.h>
-++#include <kmainwindow.h>
+++#include <tdemainwindow.h>
++#include <kmenubar.h>
++#include <kprotocolmanager.h>
++#include <kstartupinfo.h>
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index 43faf2d..17e777a 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -12192,7 +12192,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <kglobal.h>
++#include <kglobalsettings.h>
++#include <klocale.h>
-++#include <kmainwindow.h>
+++#include <tdemainwindow.h>
++#include <kmenubar.h>
++#include <kprotocolmanager.h>
++#include <kstartupinfo.h>
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
index f697fb6..2a9bab3 100644
--- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
@@ -1557,7 +1557,7 @@ index 0000000..d0f1444
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
-+#include <kmainwindow.h>
++#include <tdemainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>
@@ -2299,7 +2299,7 @@ index 0000000..d0f1444
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
-+#include <kmainwindow.h>
++#include <tdemainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 9bb3d7b..0d76fdc 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -12229,7 +12229,7 @@ index 0000000..91f59f9
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
-+#include <kmainwindow.h>
++#include <tdemainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>
@@ -13520,7 +13520,7 @@ index 0000000..9c9f008
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
-+#include <kmainwindow.h>
++#include <tdemainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>