From 8dc174178fae4cc98bf7b95ce44bfafc40b5f39e Mon Sep 17 00:00:00 2001
From: Jan-Marek Glogowski <glogow@fbihome.de>
Date: Fri, 11 Dec 2015 21:48:59 +0100
Subject: Clarify KDE4 and TDE config variables

The configure flag is already --enable-kde4, so rename most build
and configure variables, including the config headers, and the
build module to include the major number.

Also rename the TDE MOC stored as $MOC to $TDE_MOC to prevent
conflicts.

Change-Id: Ib947ae4b80349cc52eac7812cb93e8a42606b526
---
 vcl/CustomTarget_tde_moc.mk |  2 +-
 vcl/Library_vclplug_kde4.mk |  6 +++---
 vcl/unx/kde4/KDEXLib.cxx    | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'vcl')

diff --git a/vcl/CustomTarget_tde_moc.mk b/vcl/CustomTarget_tde_moc.mk
index c6a44edefebc..72c8699f741d 100644
--- a/vcl/CustomTarget_tde_moc.mk
+++ b/vcl/CustomTarget_tde_moc.mk
@@ -16,6 +16,6 @@ $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\
 		$(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \
 		| $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
-	cat $< | grep -v 'FILTER_OUT_KDE' | $(MOC) -o $@ -f$<
+	cat $< | grep -v 'FILTER_OUT_KDE' | $(TDE_MOC) -o $@ -f$<
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 645d6c9aac33..30c406961427 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -64,13 +64,13 @@ $(eval $(call gb_Library_add_libs,vclplug_kde4,\
 	-lICE \
 ))
 
-ifneq ($(KDE_HAVE_GLIB),)
+ifneq ($(KDE4_HAVE_GLIB),)
 $(eval $(call gb_Library_add_defs,vclplug_kde4,\
-    $(KDE_GLIB_CFLAGS) \
+    $(KDE4_GLIB_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_add_libs,vclplug_kde4,\
-    $(KDE_GLIB_LIBS) \
+    $(KDE4_GLIB_LIBS) \
 ))
 endif
 
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 1d8f64a5030e..38f515097827 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -41,7 +41,7 @@
 
 #include "KDESalDisplay.hxx"
 
-#if KDE_HAVE_GLIB
+#if KDE4_HAVE_GLIB
 #include "KDE4FilePicker.hxx"
 #include "tst_exclude_socket_notifiers.moc"
 #include "tst_exclude_posted_events.moc"
@@ -181,7 +181,7 @@ void KDEXLib::Init()
 
     KApplication::setQuitOnLastWindowClosed(false);
 
-#if KDE_HAVE_GLIB
+#if KDE4_HAVE_GLIB
     m_isGlibEventLoopType = QAbstractEventDispatcher::instance()->inherits( "QEventDispatcherGlib" );
     // Using KDE dialogs (and their nested event loops) works only with a proper event loop integration
     // that will release SolarMutex when waiting for more events.
@@ -209,7 +209,7 @@ void KDEXLib::Init()
 // needs to be unlocked shortly before entering the main sleep (e.g. select()) and locked
 // immediately after. So we need to know which event loop implementation is used and
 // hook accordingly.
-#if KDE_HAVE_GLIB
+#if KDE4_HAVE_GLIB
 #include <glib.h>
 
 static GPollFunc old_gpoll = nullptr;
@@ -234,7 +234,7 @@ static bool qt_event_filter( void* m )
 void KDEXLib::setupEventLoop()
 {
     old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter );
-#if KDE_HAVE_GLIB
+#if KDE4_HAVE_GLIB
     if( m_isGlibEventLoopType )
     {
         old_gpoll = g_main_context_get_poll_func( nullptr );
@@ -416,7 +416,7 @@ using namespace com::sun::star;
 uno::Reference< ui::dialogs::XFilePicker2 > KDEXLib::createFilePicker(
         const uno::Reference< uno::XComponentContext >& xMSF )
 {
-#if KDE_HAVE_GLIB
+#if KDE4_HAVE_GLIB
     if( qApp->thread() != QThread::currentThread()) {
         SalYieldMutexReleaser aReleaser;
         return Q_EMIT createFilePickerSignal( xMSF );
-- 
cgit