diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 22:00:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 22:00:40 -0600 |
| commit | 4557744068049916272a5e2edf304b59e95ca8a7 (patch) | |
| tree | 1ee17348c29a779d642b894f68efb1b2f5543508 /libreoffice/git_05_11_2012/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/git_05_11_2012/patches/libreoffice-trinity.diff')
| -rw-r--r-- | libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff | 70 |
1 files changed, 35 insertions, 35 deletions
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(); |