Update TDE (Trinity Desktop Environment) integration files

Change-Id: I48a5da0d01ad3532b9a77ff864f8f9e4d14e734c
Reviewed-on: https://gerrit.libreoffice.org/2374
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>

6 files changed, 42 insertions, 10 deletions

diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk
index 4c912e4779ad..10af256719ba 100644
--- a/vcl/Executable_tdefilepicker.mk
+++ b/vcl/Executable_tdefilepicker.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\
 
 $(eval $(call gb_Executable_add_libs,tdefilepicker,\
 	$(TDE_LIBS) \
-	-lkio -lX11 \
+	-ltdeio -lX11 \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx
index 1f9f663fa15d..064d06c610bd 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.cxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx
@@ -25,11 +25,11 @@
 
 #ifdef ENABLE_TDE
 #include <tqstringlist.h>
+#include <tdeapplication.h>
 #else // ENABLE_TDE
 #include <qstringlist.h>
-#endif // ENABLE_TDE
-
 #include <kapplication.h>
+#endif // ENABLE_TDE
 
 #if OSL_DEBUG_LEVEL > 1
 #include <iostream>
@@ -121,12 +121,18 @@ void KDECommandThread::handleCommand( const QString &rString, bool &bQuit )
 
     QString qCommand = pTokens->front();
     pTokens->pop_front();
+#if OSL_DEBUG_LEVEL > 1
+    ::std::cerr << "kdefilepicker first command: " << qCommand.latin1() << ::std::endl;
+#endif
 
     if ( qCommand == "exit" )
     {
         bQuit = true;
         kapp->exit();
         kapp->wakeUpGuiThread();
+#if OSL_DEBUG_LEVEL > 1
+        ::std::cerr << "kdefilepicker: exiting" << ::std::endl;
+#endif
     }
     else
         kapp->postEvent( m_pObject, new KDECommandEvent( qCommand, pTokens ) );
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index b0d20e4a43f4..5163079b4eb8 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -42,13 +42,13 @@
 #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>
+#include <tdediroperator.h>
+#include <tdefiledialog.h>
+#include <tdefilefiltercombo.h>
+#include <tdeio/netaccess.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 #else // ENABLE_TDE
 
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx
index e7638eaa0e91..046a1bc92645 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx
@@ -28,8 +28,13 @@
 
 #include <cstddef>
 
+#ifdef ENABLE_TDE
+#include <tdefiledialog.h>
+#include <tdefilefiltercombo.h>
+#else // ENABLE_TDE
 #include <kfiledialog.h>
 #include <kfilefiltercombo.h>
+#endif // ENABLE_TDE
 
 class QGrid;
 class QHBox;
diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx
index a18a9695f2f7..df39e01e43ca 100644
--- a/vcl/unx/kde/fpicker/kdefpmain.cxx
+++ b/vcl/unx/kde/fpicker/kdefpmain.cxx
@@ -23,9 +23,16 @@
 #include <kdefilepicker.hxx>
 #include <kdecommandthread.hxx>
 
+#ifdef ENABLE_TDE
+#include <tqeventloop.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#else // ENABLE_TDE
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
+#endif // ENABLE_TDE
 
 #include <iostream>
 #include <stdlib.h>
@@ -40,6 +47,15 @@
 #define THIS_DESKENV_NAME_LOW "kde"
 #endif // ENABLE_TDE
 
+#ifdef ENABLE_TDE
+#define KAboutData TDEAboutData
+#define KCmdLineArgs TDECmdLineArgs
+#define KCmdLineOptions TDECmdLineOptions
+#define KCmdLineLastOption TDECmdLineLastOption
+#define KApplication TDEApplication
+#define KLocale TDELocale
+#endif // ENABLE_TDE
+
 //////////////////////////////////////////////////////////////////////////
 // Main
 //////////////////////////////////////////////////////////////////////////
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
index 5c8c482478fe..2c1f03475425 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
@@ -21,8 +21,13 @@
 
 #include <kdemodalityfilter.hxx>
 
+#ifdef ENABLE_TDE
+#include <tdeapplication.h>
+#include <kdialogbase.h>
+#else // ENABLE_TDE
 #include <kapplication.h>
 #include <kdialogbase.h>
+#endif // ENABLE_TDE
 
 #include <netwm.h>
 #include <X11/Xlib.h>