From 4557744068049916272a5e2edf304b59e95ca8a7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:40 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 libreoffice/3.3.2/patches/libreoffice-trinity.diff | 30 +++++-----
 libreoffice/3.3.3/patches/libreoffice-trinity.diff | 30 +++++-----
 .../3.6.0/patches/libreoffice-fix-tde-vcl.diff     |  4 +-
 .../patches/libreoffice-trinity.diff               | 70 +++++++++++-----------
 .../patches/libreoffice-trinity.diff               | 52 ++++++++--------
 5 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 6902d3e..170bc1a 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -8155,13 +8155,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++#endif
 ++
 ++#include <tdeversion.h>
-++#include <kdiroperator.h>
+++#include <tdediroperator.h>
 ++#include <tdefiledialog.h>
 ++#include <tdefilefiltercombo.h>
 ++#include <tdeio/netaccess.h>
-++#include <klocale.h>
-++#include <kmessagebox.h>
-++#include <ktempfile.h>
+++#include <tdelocale.h>
+++#include <tdemessagebox.h>
+++#include <tdetempfile.h>
 ++
 ++#include <algorithm>
 ++#include <iostream>
@@ -12188,22 +12188,22 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++#include <tdecmdlineargs.h>
 ++#include <tdeconfig.h>
 ++#include <tdeversion.h>
-++#include <kemailsettings.h>
-++#include <kglobal.h>
-++#include <kglobalsettings.h>
-++#include <klocale.h>
+++#include <tdeemailsettings.h>
+++#include <tdeglobal.h>
+++#include <tdeglobalsettings.h>
+++#include <tdelocale.h>
 ++#include <tdemainwindow.h>
-++#include <kmenubar.h>
-++#include <kprotocolmanager.h>
-++#include <kstartupinfo.h>
+++#include <tdemenubar.h>
+++#include <tdeprotocolmanager.h>
+++#include <tdestartupinfo.h>
 ++#include <tdestyle.h>
 ++
 ++
 ++/* ********* TDE address book connectivity headers */
-++#include <kabc/addressbook.h>
-++#include <kabc/addressee.h>
-++#include <kabc/field.h>
-++#include <kabc/stdaddressbook.h>
+++#include <tdeabc/addressbook.h>
+++#include <tdeabc/addressee.h>
+++#include <tdeabc/field.h>
+++#include <tdeabc/stdaddressbook.h>
 ++
 ++
 ++#endif
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index 4079f73..9d8fdf9 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -8155,13 +8155,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++#endif
 ++
 ++#include <tdeversion.h>
-++#include <kdiroperator.h>
+++#include <tdediroperator.h>
 ++#include <tdefiledialog.h>
 ++#include <tdefilefiltercombo.h>
 ++#include <tdeio/netaccess.h>
-++#include <klocale.h>
-++#include <kmessagebox.h>
-++#include <ktempfile.h>
+++#include <tdelocale.h>
+++#include <tdemessagebox.h>
+++#include <tdetempfile.h>
 ++
 ++#include <algorithm>
 ++#include <iostream>
@@ -12188,22 +12188,22 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++#include <tdecmdlineargs.h>
 ++#include <tdeconfig.h>
 ++#include <tdeversion.h>
-++#include <kemailsettings.h>
-++#include <kglobal.h>
-++#include <kglobalsettings.h>
-++#include <klocale.h>
+++#include <tdeemailsettings.h>
+++#include <tdeglobal.h>
+++#include <tdeglobalsettings.h>
+++#include <tdelocale.h>
 ++#include <tdemainwindow.h>
-++#include <kmenubar.h>
-++#include <kprotocolmanager.h>
-++#include <kstartupinfo.h>
+++#include <tdemenubar.h>
+++#include <tdeprotocolmanager.h>
+++#include <tdestartupinfo.h>
 ++#include <tdestyle.h>
 ++
 ++
 ++/* ********* TDE address book connectivity headers */
-++#include <kabc/addressbook.h>
-++#include <kabc/addressee.h>
-++#include <kabc/field.h>
-++#include <kabc/stdaddressbook.h>
+++#include <tdeabc/addressbook.h>
+++#include <tdeabc/addressee.h>
+++#include <tdeabc/field.h>
+++#include <tdeabc/stdaddressbook.h>
 ++
 ++
 ++#endif
diff --git a/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff b/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff
index a3335de..92138ba 100644
--- a/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff
+++ b/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff
@@ -339,9 +339,9 @@
  }
  
 +#ifdef ENABLE_TDE
-+void KDEFileDialog::fileHighlightedCommand( const TQString & )
++void TDEFileDialog::fileHighlightedCommand( const TQString & )
 +#else // ENABLE_TDE
- void KDEFileDialog::fileHighlightedCommand( const QString & )
+ void TDEFileDialog::fileHighlightedCommand( const QString & )
 +#endif // ENABLE_TDE
  {
      if ( canNotifySelection() )
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
index dedc390..23ab7ca 100644
--- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
@@ -1365,8 +1365,8 @@ index 7ec45fd..eb33f8e 100644
  #include "sal/config.h"
  
 @@ -93,6 +99,8 @@
- #include <kabc/field.h>
- #include <kabc/stdaddressbook.h>
+ #include <tdeabc/field.h>
+ #include <tdeabc/stdaddressbook.h>
  
 +#endif // ENABLE_TDE
 +
@@ -1553,22 +1553,22 @@ index 0000000..d0f1444
 +#include <tdecmdlineargs.h>
 +#include <tdeconfig.h>
 +#include <tdeversion.h>
-+#include <kemailsettings.h>
-+#include <kglobal.h>
-+#include <kglobalsettings.h>
-+#include <klocale.h>
++#include <tdeemailsettings.h>
++#include <tdeglobal.h>
++#include <tdeglobalsettings.h>
++#include <tdelocale.h>
 +#include <tdemainwindow.h>
-+#include <kmenubar.h>
-+#include <kprotocolmanager.h>
-+#include <kstartupinfo.h>
++#include <tdemenubar.h>
++#include <tdeprotocolmanager.h>
++#include <tdestartupinfo.h>
 +#include <tdestyle.h>
 +
 +
 +/* ********* TDE address book connectivity headers */
-+#include <kabc/addressbook.h>
-+#include <kabc/addressee.h>
-+#include <kabc/field.h>
-+#include <kabc/stdaddressbook.h>
++#include <tdeabc/addressbook.h>
++#include <tdeabc/addressee.h>
++#include <tdeabc/field.h>
++#include <tdeabc/stdaddressbook.h>
 +
 +#include "tde_defines.h"
 +
@@ -2107,8 +2107,8 @@ index 7ec45fd..eb33f8e 100644
  #include "sal/config.h"
  
 @@ -93,6 +99,8 @@
- #include <kabc/field.h>
- #include <kabc/stdaddressbook.h>
+ #include <tdeabc/field.h>
+ #include <tdeabc/stdaddressbook.h>
  
 +#endif // ENABLE_TDE
 +
@@ -2295,22 +2295,22 @@ index 0000000..d0f1444
 +#include <tdecmdlineargs.h>
 +#include <tdeconfig.h>
 +#include <tdeversion.h>
-+#include <kemailsettings.h>
-+#include <kglobal.h>
-+#include <kglobalsettings.h>
-+#include <klocale.h>
++#include <tdeemailsettings.h>
++#include <tdeglobal.h>
++#include <tdeglobalsettings.h>
++#include <tdelocale.h>
 +#include <tdemainwindow.h>
-+#include <kmenubar.h>
-+#include <kprotocolmanager.h>
-+#include <kstartupinfo.h>
++#include <tdemenubar.h>
++#include <tdeprotocolmanager.h>
++#include <tdestartupinfo.h>
 +#include <tdestyle.h>
 +
 +
 +/* ********* TDE address book connectivity headers */
-+#include <kabc/addressbook.h>
-+#include <kabc/addressee.h>
-+#include <kabc/field.h>
-+#include <kabc/stdaddressbook.h>
++#include <tdeabc/addressbook.h>
++#include <tdeabc/addressee.h>
++#include <tdeabc/field.h>
++#include <tdeabc/stdaddressbook.h>
 +
 +#include "tde_defines.h"
 +
@@ -2721,13 +2721,13 @@ index 779a34d..d52a6a7 100644
 +#endif
 +
 +#include <tdeversion.h>
-+#include <kdiroperator.h>
++#include <tdediroperator.h>
 +#include <tdefiledialog.h>
 +#include <tdefilefiltercombo.h>
 +#include <tdeio/netaccess.h>
-+#include <klocale.h>
-+#include <kmessagebox.h>
-+#include <ktempfile.h>
++#include <tdelocale.h>
++#include <tdemessagebox.h>
++#include <tdetempfile.h>
 +
 +#else // ENABLE_TDE
 +
@@ -2735,8 +2735,8 @@ index 779a34d..d52a6a7 100644
  #include <qcombobox.h>
  #include <qgrid.h>
 @@ -55,6 +83,8 @@
- #include <kmessagebox.h>
- #include <ktempfile.h>
+ #include <tdemessagebox.h>
+ #include <tdetempfile.h>
  
 +#endif // ENABLE_TDE
 +
@@ -2760,7 +2760,7 @@ index 4d545eb..b0482d8 100644
  #include <tdefiledialog.h>
 @@ -40,7 +44,11 @@ class QVBox;
  
- class KDEFileDialog : public KFileDialog
+ class TDEFileDialog : public KFileDialog
  {
 +#ifdef ENABLE_TDE
 +    TQ_OBJECT
@@ -2809,8 +2809,8 @@ index be40226..558c01b 100644
  
      KDEModalityFilter qModalityFilter( nWinId );
  
--    KDEFileDialog aFileDialog( NULL, QString(), NULL, "kdefiledialog" );
-+    KDEFileDialog aFileDialog( NULL, QString(), NULL, THIS_DESKENV_NAME_LOW "filedialog" );
+-    TDEFileDialog aFileDialog( NULL, QString(), NULL, "kdefiledialog" );
++    TDEFileDialog aFileDialog( NULL, QString(), NULL, THIS_DESKENV_NAME_LOW "filedialog" );
  
      KDECommandThread qCommandThread( &aFileDialog );
      qCommandThread.start();
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index fba6c6d..6a8a03c 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -8474,13 +8474,13 @@ index 0000000..46ab20d
 +#endif
 +
 +#include <tdeversion.h>
-+#include <kdiroperator.h>
++#include <tdediroperator.h>
 +#include <tdefiledialog.h>
 +#include <tdefilefiltercombo.h>
 +#include <tdeio/netaccess.h>
-+#include <klocale.h>
-+#include <kmessagebox.h>
-+#include <ktempfile.h>
++#include <tdelocale.h>
++#include <tdemessagebox.h>
++#include <tdetempfile.h>
 +
 +#include <algorithm>
 +#include <iostream>
@@ -12225,22 +12225,22 @@ index 0000000..91f59f9
 +#include <tdecmdlineargs.h>
 +#include <tdeconfig.h>
 +#include <tdeversion.h>
-+#include <kemailsettings.h>
-+#include <kglobal.h>
-+#include <kglobalsettings.h>
-+#include <klocale.h>
++#include <tdeemailsettings.h>
++#include <tdeglobal.h>
++#include <tdeglobalsettings.h>
++#include <tdelocale.h>
 +#include <tdemainwindow.h>
-+#include <kmenubar.h>
-+#include <kprotocolmanager.h>
-+#include <kstartupinfo.h>
++#include <tdemenubar.h>
++#include <tdeprotocolmanager.h>
++#include <tdestartupinfo.h>
 +#include <tdestyle.h>
 +
 +
 +/* ********* TDE address book connectivity headers */
-+#include <kabc/addressbook.h>
-+#include <kabc/addressee.h>
-+#include <kabc/field.h>
-+#include <kabc/stdaddressbook.h>
++#include <tdeabc/addressbook.h>
++#include <tdeabc/addressee.h>
++#include <tdeabc/field.h>
++#include <tdeabc/stdaddressbook.h>
 +
 +
 +#endif
@@ -13516,22 +13516,22 @@ index 0000000..9c9f008
 +#include <tdecmdlineargs.h>
 +#include <tdeconfig.h>
 +#include <tdeversion.h>
-+#include <kemailsettings.h>
-+#include <kglobal.h>
-+#include <kglobalsettings.h>
-+#include <klocale.h>
++#include <tdeemailsettings.h>
++#include <tdeglobal.h>
++#include <tdeglobalsettings.h>
++#include <tdelocale.h>
 +#include <tdemainwindow.h>
-+#include <kmenubar.h>
-+#include <kprotocolmanager.h>
-+#include <kstartupinfo.h>
++#include <tdemenubar.h>
++#include <tdeprotocolmanager.h>
++#include <tdestartupinfo.h>
 +#include <tdestyle.h>
 +
 +
 +/* ********* TDE address book connectivity headers */
-+#include <kabc/addressbook.h>
-+#include <kabc/addressee.h>
-+#include <kabc/field.h>
-+#include <kabc/stdaddressbook.h>
++#include <tdeabc/addressbook.h>
++#include <tdeabc/addressee.h>
++#include <tdeabc/field.h>
++#include <tdeabc/stdaddressbook.h>
 +
 +#endif
 +
-- 
cgit v1.2.1