diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:40 -0600 |
| commit | 4557744068049916272a5e2edf304b59e95ca8a7 (patch) | |
| tree | 1ee17348c29a779d642b894f68efb1b2f5543508 /libreoffice/3.3.3/patches/libreoffice-trinity.diff | |
| parent | 9ad40fa87ef0008bdf586a390c1fb7638161dac5 (diff) | |
| download | thirdparty-4557744068049916272a5e2edf304b59e95ca8a7.tar.gz thirdparty-4557744068049916272a5e2edf304b59e95ca8a7.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/3.3.3/patches/libreoffice-trinity.diff')
| -rw-r--r-- | libreoffice/3.3.3/patches/libreoffice-trinity.diff | 30 |
1 files changed, 15 insertions, 15 deletions
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 |