TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename additional header files to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent 9ad40fa87e
commit 4557744068
5 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File

30
libreoffice/3.3.2/patches/libreoffice-trinity.diff
Unescape View File

@ -8155,13 +8155,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#endif ++#endif
++ ++
++#include <tdeversion.h> ++#include <tdeversion.h>
++#include <kdiroperator.h> ++#include <tdediroperator.h>
++#include <tdefiledialog.h> ++#include <tdefiledialog.h>
++#include <tdefilefiltercombo.h> ++#include <tdefilefiltercombo.h>
++#include <tdeio/netaccess.h> ++#include <tdeio/netaccess.h>
++#include <klocale.h> ++#include <tdelocale.h>
++#include <kmessagebox.h> ++#include <tdemessagebox.h>
++#include <ktempfile.h> ++#include <tdetempfile.h>
++ ++
++#include <algorithm> ++#include <algorithm>
++#include <iostream> ++#include <iostream>
@ -12188,22 +12188,22 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <tdecmdlineargs.h> ++#include <tdecmdlineargs.h>
++#include <tdeconfig.h> ++#include <tdeconfig.h>
++#include <tdeversion.h> ++#include <tdeversion.h>
++#include <kemailsettings.h> ++#include <tdeemailsettings.h>
++#include <kglobal.h> ++#include <tdeglobal.h>
++#include <kglobalsettings.h> ++#include <tdeglobalsettings.h>
++#include <klocale.h> ++#include <tdelocale.h>
++#include <tdemainwindow.h> ++#include <tdemainwindow.h>
++#include <kmenubar.h> ++#include <tdemenubar.h>
++#include <kprotocolmanager.h> ++#include <tdeprotocolmanager.h>
++#include <kstartupinfo.h> ++#include <tdestartupinfo.h>
++#include <tdestyle.h> ++#include <tdestyle.h>
++ ++
++ ++
++/* ********* TDE address book connectivity headers */ ++/* ********* TDE address book connectivity headers */
++#include <kabc/addressbook.h> ++#include <tdeabc/addressbook.h>
++#include <kabc/addressee.h> ++#include <tdeabc/addressee.h>
++#include <kabc/field.h> ++#include <tdeabc/field.h>
++#include <kabc/stdaddressbook.h> ++#include <tdeabc/stdaddressbook.h>
++ ++
++ ++
++#endif ++#endif

30
libreoffice/3.3.3/patches/libreoffice-trinity.diff
Unescape View File

@ -8155,13 +8155,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#endif ++#endif
++ ++
++#include <tdeversion.h> ++#include <tdeversion.h>
++#include <kdiroperator.h> ++#include <tdediroperator.h>
++#include <tdefiledialog.h> ++#include <tdefiledialog.h>
++#include <tdefilefiltercombo.h> ++#include <tdefilefiltercombo.h>
++#include <tdeio/netaccess.h> ++#include <tdeio/netaccess.h>
++#include <klocale.h> ++#include <tdelocale.h>
++#include <kmessagebox.h> ++#include <tdemessagebox.h>
++#include <ktempfile.h> ++#include <tdetempfile.h>
++ ++
++#include <algorithm> ++#include <algorithm>
++#include <iostream> ++#include <iostream>
@ -12188,22 +12188,22 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <tdecmdlineargs.h> ++#include <tdecmdlineargs.h>
++#include <tdeconfig.h> ++#include <tdeconfig.h>
++#include <tdeversion.h> ++#include <tdeversion.h>
++#include <kemailsettings.h> ++#include <tdeemailsettings.h>
++#include <kglobal.h> ++#include <tdeglobal.h>
++#include <kglobalsettings.h> ++#include <tdeglobalsettings.h>
++#include <klocale.h> ++#include <tdelocale.h>
++#include <tdemainwindow.h> ++#include <tdemainwindow.h>
++#include <kmenubar.h> ++#include <tdemenubar.h>
++#include <kprotocolmanager.h> ++#include <tdeprotocolmanager.h>
++#include <kstartupinfo.h> ++#include <tdestartupinfo.h>
++#include <tdestyle.h> ++#include <tdestyle.h>
++ ++
++ ++
++/* ********* TDE address book connectivity headers */ ++/* ********* TDE address book connectivity headers */
++#include <kabc/addressbook.h> ++#include <tdeabc/addressbook.h>
++#include <kabc/addressee.h> ++#include <tdeabc/addressee.h>
++#include <kabc/field.h> ++#include <tdeabc/field.h>
++#include <kabc/stdaddressbook.h> ++#include <tdeabc/stdaddressbook.h>
++ ++
++ ++
++#endif ++#endif

4
libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff
Unescape View File

@ -339,9 +339,9 @@
} }
+#ifdef ENABLE_TDE +#ifdef ENABLE_TDE
+void KDEFileDialog::fileHighlightedCommand( const TQString & ) +void TDEFileDialog::fileHighlightedCommand( const TQString & )
+#else // ENABLE_TDE +#else // ENABLE_TDE
void KDEFileDialog::fileHighlightedCommand( const QString & ) void TDEFileDialog::fileHighlightedCommand( const QString & )
+#endif // ENABLE_TDE +#endif // ENABLE_TDE
{ {
if ( canNotifySelection() ) if ( canNotifySelection() )

70
libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
Unescape View File

@ -1365,8 +1365,8 @@ index 7ec45fd..eb33f8e 100644
#include "sal/config.h" #include "sal/config.h"
@@ -93,6 +99,8 @@ @@ -93,6 +99,8 @@
#include <kabc/field.h> #include <tdeabc/field.h>
#include <kabc/stdaddressbook.h> #include <tdeabc/stdaddressbook.h>
+#endif // ENABLE_TDE +#endif // ENABLE_TDE
+ +
@ -1553,22 +1553,22 @@ index 0000000..d0f1444
+#include <tdecmdlineargs.h> +#include <tdecmdlineargs.h>
+#include <tdeconfig.h> +#include <tdeconfig.h>
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kemailsettings.h> +#include <tdeemailsettings.h>
+#include <kglobal.h> +#include <tdeglobal.h>
+#include <kglobalsettings.h> +#include <tdeglobalsettings.h>
+#include <klocale.h> +#include <tdelocale.h>
+#include <tdemainwindow.h> +#include <tdemainwindow.h>
+#include <kmenubar.h> +#include <tdemenubar.h>
+#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h>
+#include <kstartupinfo.h> +#include <tdestartupinfo.h>
+#include <tdestyle.h> +#include <tdestyle.h>
+ +
+ +
+/* ********* TDE address book connectivity headers */ +/* ********* TDE address book connectivity headers */
+#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h>
+#include <kabc/addressee.h> +#include <tdeabc/addressee.h>
+#include <kabc/field.h> +#include <tdeabc/field.h>
+#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h>
+ +
+#include "tde_defines.h" +#include "tde_defines.h"
+ +
@ -2107,8 +2107,8 @@ index 7ec45fd..eb33f8e 100644
#include "sal/config.h" #include "sal/config.h"
@@ -93,6 +99,8 @@ @@ -93,6 +99,8 @@
#include <kabc/field.h> #include <tdeabc/field.h>
#include <kabc/stdaddressbook.h> #include <tdeabc/stdaddressbook.h>
+#endif // ENABLE_TDE +#endif // ENABLE_TDE
+ +
@ -2295,22 +2295,22 @@ index 0000000..d0f1444
+#include <tdecmdlineargs.h> +#include <tdecmdlineargs.h>
+#include <tdeconfig.h> +#include <tdeconfig.h>
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kemailsettings.h> +#include <tdeemailsettings.h>
+#include <kglobal.h> +#include <tdeglobal.h>
+#include <kglobalsettings.h> +#include <tdeglobalsettings.h>
+#include <klocale.h> +#include <tdelocale.h>
+#include <tdemainwindow.h> +#include <tdemainwindow.h>
+#include <kmenubar.h> +#include <tdemenubar.h>
+#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h>
+#include <kstartupinfo.h> +#include <tdestartupinfo.h>
+#include <tdestyle.h> +#include <tdestyle.h>
+ +
+ +
+/* ********* TDE address book connectivity headers */ +/* ********* TDE address book connectivity headers */
+#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h>
+#include <kabc/addressee.h> +#include <tdeabc/addressee.h>
+#include <kabc/field.h> +#include <tdeabc/field.h>
+#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h>
+ +
+#include "tde_defines.h" +#include "tde_defines.h"
+ +
@ -2721,13 +2721,13 @@ index 779a34d..d52a6a7 100644
+#endif +#endif
+ +
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kdiroperator.h> +#include <tdediroperator.h>
+#include <tdefiledialog.h> +#include <tdefiledialog.h>
+#include <tdefilefiltercombo.h> +#include <tdefilefiltercombo.h>
+#include <tdeio/netaccess.h> +#include <tdeio/netaccess.h>
+#include <klocale.h> +#include <tdelocale.h>
+#include <kmessagebox.h> +#include <tdemessagebox.h>
+#include <ktempfile.h> +#include <tdetempfile.h>
+ +
+#else // ENABLE_TDE +#else // ENABLE_TDE
+ +
@ -2735,8 +2735,8 @@ index 779a34d..d52a6a7 100644
#include <qcombobox.h> #include <qcombobox.h>
#include <qgrid.h> #include <qgrid.h>
@@ -55,6 +83,8 @@ @@ -55,6 +83,8 @@
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <ktempfile.h> #include <tdetempfile.h>
+#endif // ENABLE_TDE +#endif // ENABLE_TDE
+ +
@ -2760,7 +2760,7 @@ index 4d545eb..b0482d8 100644
#include <tdefiledialog.h> #include <tdefiledialog.h>
@@ -40,7 +44,11 @@ class QVBox; @@ -40,7 +44,11 @@ class QVBox;
class KDEFileDialog : public KFileDialog class TDEFileDialog : public KFileDialog
{ {
+#ifdef ENABLE_TDE +#ifdef ENABLE_TDE
+ TQ_OBJECT + TQ_OBJECT
@ -2809,8 +2809,8 @@ index be40226..558c01b 100644
KDEModalityFilter qModalityFilter( nWinId ); KDEModalityFilter qModalityFilter( nWinId );
- KDEFileDialog aFileDialog( NULL, QString(), NULL, "kdefiledialog" ); - TDEFileDialog aFileDialog( NULL, QString(), NULL, "kdefiledialog" );
+ KDEFileDialog aFileDialog( NULL, QString(), NULL, THIS_DESKENV_NAME_LOW "filedialog" ); + TDEFileDialog aFileDialog( NULL, QString(), NULL, THIS_DESKENV_NAME_LOW "filedialog" );
KDECommandThread qCommandThread( &aFileDialog ); KDECommandThread qCommandThread( &aFileDialog );
qCommandThread.start(); qCommandThread.start();

52
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
Unescape View File

@ -8474,13 +8474,13 @@ index 0000000..46ab20d
+#endif +#endif
+ +
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kdiroperator.h> +#include <tdediroperator.h>
+#include <tdefiledialog.h> +#include <tdefiledialog.h>
+#include <tdefilefiltercombo.h> +#include <tdefilefiltercombo.h>
+#include <tdeio/netaccess.h> +#include <tdeio/netaccess.h>
+#include <klocale.h> +#include <tdelocale.h>
+#include <kmessagebox.h> +#include <tdemessagebox.h>
+#include <ktempfile.h> +#include <tdetempfile.h>
+ +
+#include <algorithm> +#include <algorithm>
+#include <iostream> +#include <iostream>
@ -12225,22 +12225,22 @@ index 0000000..91f59f9
+#include <tdecmdlineargs.h> +#include <tdecmdlineargs.h>
+#include <tdeconfig.h> +#include <tdeconfig.h>
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kemailsettings.h> +#include <tdeemailsettings.h>
+#include <kglobal.h> +#include <tdeglobal.h>
+#include <kglobalsettings.h> +#include <tdeglobalsettings.h>
+#include <klocale.h> +#include <tdelocale.h>
+#include <tdemainwindow.h> +#include <tdemainwindow.h>
+#include <kmenubar.h> +#include <tdemenubar.h>
+#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h>
+#include <kstartupinfo.h> +#include <tdestartupinfo.h>
+#include <tdestyle.h> +#include <tdestyle.h>
+ +
+ +
+/* ********* TDE address book connectivity headers */ +/* ********* TDE address book connectivity headers */
+#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h>
+#include <kabc/addressee.h> +#include <tdeabc/addressee.h>
+#include <kabc/field.h> +#include <tdeabc/field.h>
+#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h>
+ +
+ +
+#endif +#endif
@ -13516,22 +13516,22 @@ index 0000000..9c9f008
+#include <tdecmdlineargs.h> +#include <tdecmdlineargs.h>
+#include <tdeconfig.h> +#include <tdeconfig.h>
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kemailsettings.h> +#include <tdeemailsettings.h>
+#include <kglobal.h> +#include <tdeglobal.h>
+#include <kglobalsettings.h> +#include <tdeglobalsettings.h>
+#include <klocale.h> +#include <tdelocale.h>
+#include <tdemainwindow.h> +#include <tdemainwindow.h>
+#include <kmenubar.h> +#include <tdemenubar.h>
+#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h>
+#include <kstartupinfo.h> +#include <tdestartupinfo.h>
+#include <tdestyle.h> +#include <tdestyle.h>
+ +
+ +
+/* ********* TDE address book connectivity headers */ +/* ********* TDE address book connectivity headers */
+#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h>
+#include <kabc/addressee.h> +#include <tdeabc/addressee.h>
+#include <kabc/field.h> +#include <tdeabc/field.h>
+#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h>
+ +
+#endif +#endif
+ +

Write Preview
Loading…
Cancel
Save