TDE integration

Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e

9 files changed, 103 insertions, 9 deletions

diff --git a/vcl/unx/kde/FPServiceInfo.hxx b/vcl/unx/kde/FPServiceInfo.hxx
index 9e4cbf1ac44d..17d2dd64cee7 100644
--- a/vcl/unx/kde/FPServiceInfo.hxx
+++ b/vcl/unx/kde/FPServiceInfo.hxx
@@ -30,11 +30,21 @@
 #ifndef _FPSERVICEINFO_HXX_
 #define _FPSERVICEINFO_HXX_
 
+#ifdef ENABLE_TDE
+
 // the service names
-#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.KDEFilePicker"
+#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.TDEFilePicker"
 
-// the implementation names
-#define FILE_PICKER_IMPL_NAME    "com.sun.star.ui.dialogs.UnxFilePicker"
+// the registry key names
+// a key under which this service will be registered,
+// Format: -> "/ImplName/UNO/SERVICES/ServiceName"
+//  <Implementation-Name></UNO/SERVICES/><Service-Name>
+#define FILE_PICKER_REGKEY_NAME  "/com.sun.star.ui.dialogs.UnxFilePicker/UNO/SERVICES/com.sun.star.ui.dialogs.TDEFilePicker"
+
+#else // ENABLE_TDE
+
+// the service names
+#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.KDEFilePicker"
 
 // the registry key names
 // a key under which this service will be registered,
@@ -42,6 +52,11 @@
 //  <Implementation-Name></UNO/SERVICES/><Service-Name>
 #define FILE_PICKER_REGKEY_NAME  "/com.sun.star.ui.dialogs.UnxFilePicker/UNO/SERVICES/com.sun.star.ui.dialogs.KDEFilePicker"
 
+#endif // ENABLE_TDE
+
+// the implementation names
+#define FILE_PICKER_IMPL_NAME    "com.sun.star.ui.dialogs.UnxFilePicker"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx
index b68ddb0030c4..6aeea9bfbca6 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.cxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx
@@ -30,7 +30,11 @@
 
 #include <kdecommandthread.hxx>
 
+#ifdef ENABLE_TDE
+#include <tqstringlist.h>
+#else // ENABLE_TDE
 #include <qstringlist.h>
+#endif // ENABLE_TDE
 
 #include <kapplication.h>
 
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.hxx b/vcl/unx/kde/fpicker/kdecommandthread.hxx
index 7486bf9192f6..07b81f8b7835 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.hxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.hxx
@@ -29,9 +29,19 @@
 #ifndef _KDECOMMANDTHREAD_HXX_
 #define _KDECOMMANDTHREAD_HXX_
 
+#ifdef ENABLE_TDE
+#include <shell/tde_defines.h>
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include <tqevent.h>
+#include <tqmutex.h>
+#include <tqthread.h>
+#else // ENABLE_TDE
 #include <qevent.h>
 #include <qmutex.h>
 #include <qthread.h>
+#endif // ENABLE_TDE
 
 class KDECommandEvent : public QCustomEvent
 {
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index 779a34d894d0..d52a6a772b0a 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -31,6 +31,34 @@
 #include <kdecommandthread.hxx>
 #include <kdefilepicker.hxx>
 
+#ifdef ENABLE_TDE
+
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqgrid.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqobjectlist.h>
+#include <tqpushbutton.h>
+#include <tqregexp.h>
+#include <tqvbox.h>
+
+#ifdef TQT_NO_EMIT
+#define emit
+#endif
+
+#include <tdeversion.h>
+#include <kdiroperator.h>
+#include <kfiledialog.h>
+#include <kfilefiltercombo.h>
+#include <kio/netaccess.h>
+#include <klocale.h>
+#include <kmessagebox.h>
+#include <ktempfile.h>
+
+#else // ENABLE_TDE
+
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qgrid.h>
@@ -55,6 +83,8 @@
 #include <kmessagebox.h>
 #include <ktempfile.h>
 
+#endif // ENABLE_TDE
+
 #include <algorithm>
 #include <iostream>
 
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx
index 4d545ebc76ca..058d6f6da34d 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx
@@ -29,6 +29,10 @@
 #ifndef _KDEFILEPICKER_HXX_
 #define _KDEFILEPICKER_HXX_
 
+#ifdef ENABLE_TDE
+#include <shell/tde_defines.h>
+#endif // ENABLE_TDE
+
 #include <cstddef>
 
 #include <kfiledialog.h>
@@ -40,7 +44,11 @@ class QVBox;
 
 class KDEFileDialog : public KFileDialog
 {
+#ifdef ENABLE_TDE
+    TQ_OBJECT
+#else // ENABLE_TDE
     Q_OBJECT
+#endif // ENABLE_TDE
 
 protected:
     typedef QPair< QString, QString > FilterEntry;
diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx
index be4022664014..558c01ba0e55 100644
--- a/vcl/unx/kde/fpicker/kdefpmain.cxx
+++ b/vcl/unx/kde/fpicker/kdefpmain.cxx
@@ -39,6 +39,14 @@
 #include <iostream>
 #include <stdlib.h>
 
+#ifdef ENABLE_TDE
+#define THIS_DESKENV_NAME_CAP "TDE"
+#define THIS_DESKENV_NAME_LOW "tde"
+#else // ENABLE_TDE
+#define THIS_DESKENV_NAME_CAP "KDE"
+#define THIS_DESKENV_NAME_LOW "kde"
+#endif // ENABLE_TDE
+
 //////////////////////////////////////////////////////////////////////////
 // Main
 //////////////////////////////////////////////////////////////////////////
@@ -54,13 +62,13 @@ int main( int argc, char* argv[] )
     // we fake the name of the application to have "LibreOffice" in the
     // title
     KAboutData qAboutData( "kdefilepicker", I18N_NOOP( "LibreOffice" ),
-            "0.1", I18N_NOOP( "kdefilepicker is an implementation of the KDE file dialog for LibreOffice." ),
+            "0.1", I18N_NOOP( "kdefilepicker is an implementation of the " THIS_DESKENV_NAME_CAP " file dialog for LibreOffice." ),
             KAboutData::License_LGPL,
             "(c) 2004, Jan Holesovsky" );
     qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" );
 
     // Let the user see that this does something...
-    ::std::cerr << "kdefilepicker, an implementation of KDE file dialog for OOo." << ::std::endl
+    ::std::cerr << "kdefilepicker, an implementation of a " THIS_DESKENV_NAME_CAP " file dialog for OOo." << ::std::endl
         << "Type 'exit' and press Enter to finish." << ::std::endl;
 
     KCmdLineArgs::addCmdLineOptions( sOptions );
@@ -77,7 +85,7 @@ int main( int argc, char* argv[] )
 
     KDEModalityFilter qModalityFilter( nWinId );
 
-    KDEFileDialog aFileDialog( NULL, QString(), NULL, "kdefiledialog" );
+    KDEFileDialog aFileDialog( NULL, QString(), NULL, THIS_DESKENV_NAME_LOW "filedialog" );
 
     KDECommandThread qCommandThread( &aFileDialog );
     qCommandThread.start();
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
index 8635694a39e1..e2296ab36651 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
@@ -29,7 +29,15 @@
 #ifndef _KDEMODALITYFILTER_HXX_
 #define _KDEMODALITYFILTER_HXX_
 
+#ifdef ENABLE_TDE
+#include <shell/tde_defines.h>
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include <tqobject.h>
+#else // ENABLE_TDE
 #include <qobject.h>
+#endif // ENABLE_TDE
 
 class KDEModalityFilter : public QObject
 {
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index d66e22719784..195915bc6e39 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -28,7 +28,8 @@
 
 
 #define _SV_SALDATA_CXX
-#include <unx/kde/kde_headers.h>
+
+#include <shell/kde_headers.h>
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -56,6 +57,14 @@
 
 #include "vclpluginapi.h"
 
+#ifdef ENABLE_TDE
+#define THIS_DESKENV_NAME_CAP "TDE"
+#define THIS_DESKENV_NAME_LOW "tde"
+#else // ENABLE_TDE
+#define THIS_DESKENV_NAME_CAP "KDE"
+#define THIS_DESKENV_NAME_LOW "kde"
+#endif // ENABLE_TDE
+
 /* #i59042# override KApplications method for session management
  * since it will interfere badly with our own.
  */
@@ -123,7 +132,7 @@ void KDEXLib::Init()
     KAboutData *kAboutData = new KAboutData( "LibreOffice",
             I18N_NOOP( "LibreOffice" ),
             "1.1.0",
-            I18N_NOOP( "LibreOffice with KDE Native Widget Support." ),
+            I18N_NOOP( "LibreOffice with " THIS_DESKENV_NAME_CAP " Native Widget Support." ),
             KAboutData::License_LGPL,
             "(c) 2003, 2004 Novell, Inc",
             I18N_NOOP( "LibreOffice is an office suite.\n" ),
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 0376e94a8ab4..0a5f79f5282d 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -28,7 +28,9 @@
 
 
 #define _SV_SALNATIVEWIDGETS_KDE_CXX
-#include <unx/kde/kde_headers.h>
+
+#include <shell/kde_headers.h>
+
 #include "UnxFilePicker.hxx"
 
 #include <unx/salunx.h>