remove KDE3 support, --enable-kde and --enable-kdeab

With the new RHEL6-era baseline TDF can finally ship KDE4 support.

Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3
Reviewed-on: https://gerrit.libreoffice.org/18267
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 1 insertions, 162 deletions

diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk
deleted file mode 100644
index 430118607c08..000000000000
--- a/vcl/CustomTarget_kde_moc.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker))
-
-$(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \
-	$(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx
-
-$(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_TDE' | $(MOC) -o $@ -f$<
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk
deleted file mode 100644
index 1fd01b2115eb..000000000000
--- a/vcl/Executable_kdefilepicker.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Executable_Executable,kdefilepicker))
-
-$(eval $(call gb_Executable_add_defs,kdefilepicker,\
-	$(KDE_CFLAGS) \
-))
-
-$(eval $(call gb_Executable_use_libraries,kdefilepicker,\
-	sal \
-))
-
-$(eval $(call gb_Executable_add_libs,kdefilepicker,\
-	$(KDE_LIBS) \
-	-lkio -lX11 \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,kdefilepicker,\
-	vcl/unx/kde/fpicker/kdecommandthread \
-	vcl/unx/kde/fpicker/kdefilepicker \
-	vcl/unx/kde/fpicker/kdefpmain \
-	vcl/unx/kde/fpicker/kdemodalityfilter \
-))
-
-$(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\
-	CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc \
-))
-
-# KDE/Qt consider -Wshadow more trouble than benefit
-$(eval $(call gb_Executable_add_cxxflags,kdefilepicker,\
-	-Wno-shadow \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
deleted file mode 100644
index 40714224f438..000000000000
--- a/vcl/Library_vclplug_kde.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Library_Library,vclplug_kde))
-
-$(eval $(call gb_Library_set_include,vclplug_kde,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/vcl/inc \
-))
-
-$(eval $(call gb_Library_add_defs,vclplug_kde,\
-    -DVCLPLUG_KDE_IMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_sdk_api,vclplug_kde))
-
-$(eval $(call gb_Library_use_libraries,vclplug_kde,\
-    vclplug_gen \
-    vcl \
-    tl \
-    utl \
-    sot \
-    ucbhelper \
-    basegfx \
-    comphelper \
-    cppuhelper \
-    i18nlangtag \
-    i18nutil \
-    $(if $(ENABLE_JAVA), \
-        jvmaccess) \
-    cppu \
-    sal \
-))
-
-$(eval $(call gb_Library_use_externals,vclplug_kde,\
-	boost_headers \
-	icuuc \
-	kde \
-	glew \
-))
-
-$(eval $(call gb_Library_add_libs,vclplug_kde,\
-	-lX11 \
-	-lXext \
-	-lSM \
-	-lICE \
-))
-
-$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
-    vcl/unx/kde/kdedata \
-    vcl/unx/kde/salnativewidgets-kde \
-	vcl/unx/kde/UnxCommandThread \
-	vcl/unx/kde/UnxFilePicker \
-	vcl/unx/kde/UnxNotifyThread \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,vclplug_kde,\
-	-lm \
-	-ldl \
-	-lpthread \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index c949f4275580..1d54172c3d72 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -73,13 +73,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
     Library_vclplug_tde \
 ))
 endif
-ifneq ($(ENABLE_KDE),)
-$(eval $(call gb_Module_add_targets,vcl,\
-    CustomTarget_kde_moc \
-    Executable_kdefilepicker \
-    Library_vclplug_kde \
-))
-endif
 ifneq ($(ENABLE_KDE4),)
 $(eval $(call gb_Module_add_targets,vcl,\
     CustomTarget_kde4_moc \
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 20fa9e8c698a..337e4d494688 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -171,9 +171,6 @@ static SalInstance* autodetect_plugin()
 #if ENABLE_KDE4
         "kde4",
 #endif
-#if ENABLE_KDE
-        "kde",
-#endif
         "gtk3", "gtk", "gen", 0
     };
 
@@ -182,9 +179,6 @@ static SalInstance* autodetect_plugin()
 #if ENABLE_KDE4
         "kde4",
 #endif
-#if ENABLE_KDE
-        "kde",
-#endif
         "gtk3", "gtk", "gen", 0
     };
 
@@ -208,15 +202,11 @@ static SalInstance* autodetect_plugin()
     else if ( desktop == DESKTOP_GNOME ||
               desktop == DESKTOP_UNITY ||
               desktop == DESKTOP_XFCE  ||
+              desktop == DESKTOP_KDE3 ||
               desktop == DESKTOP_MATE )
         pList = pStandardFallbackList;
     else if( desktop == DESKTOP_TDE )
         pList = pTDEFallbackList;
-    else if( desktop == DESKTOP_KDE3 )
-    {
-        pList = pKDEFallbackList;
-        nListEntry = 1;
-    }
     else if( desktop == DESKTOP_KDE4 || desktop == DESKTOP_KDE5 )
         pList = pKDEFallbackList;