summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2019-01-29 08:43:17 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2019-01-29 09:53:49 +0100
commitcb50e64a858e6791f9893699be0ec5fe4a259834 (patch)
treece78d8c76a7164cdc7e30ea74a8d386628e7c372
parent7eccf0b3fe771a519dbdaaf536d64b5b193a723f (diff)
Remove some kde4 leftovers
The kde4 VCL Plugin was removed with 6ca3b3648e25ae9d4d2d29a0df83349198ec3f5e, so drop some now superfluous leftovers. Change-Id: I92887b679462a6ac22c3668a24ec6a9fdee8fac1 Reviewed-on: https://gerrit.libreoffice.org/67047 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r--solenv/clang-format/blacklist23
-rw-r--r--vcl/inc/unx/gendata.hxx1
-rw-r--r--vcl/source/app/salplug.cxx2
3 files changed, 1 insertions, 25 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 259dec773128..67797171aa51 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -13085,9 +13085,6 @@ shell/qa/zip/testzipimpl.hxx
shell/qa/zip/ziptest.cxx
shell/source/all/xml_parser.cxx
shell/source/backends/desktopbe/desktopbackend.cxx
-shell/source/backends/kde4be/kde4access.cxx
-shell/source/backends/kde4be/kde4access.hxx
-shell/source/backends/kde4be/kde4backend.cxx
shell/source/backends/localebe/localebackend.cxx
shell/source/backends/localebe/localebackend.hxx
shell/source/backends/localebe/localebecdef.cxx
@@ -18398,26 +18395,6 @@ vcl/unx/gtk3/gtk3hudawareness.cxx
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
vcl/unx/gtk3/gtk3salprn-gtk.cxx
vcl/unx/gtk3/gtkprintwrapper.hxx
-vcl/unx/kde4/FPServiceInfo.hxx
-vcl/unx/kde4/KDE4FilePicker.cxx
-vcl/unx/kde4/KDE4FilePicker.hxx
-vcl/unx/kde4/KDEData.cxx
-vcl/unx/kde4/KDEData.hxx
-vcl/unx/kde4/KDESalDisplay.cxx
-vcl/unx/kde4/KDESalDisplay.hxx
-vcl/unx/kde4/KDESalFrame.cxx
-vcl/unx/kde4/KDESalFrame.hxx
-vcl/unx/kde4/KDESalGraphics.cxx
-vcl/unx/kde4/KDESalGraphics.hxx
-vcl/unx/kde4/KDESalInstance.cxx
-vcl/unx/kde4/KDESalInstance.hxx
-vcl/unx/kde4/KDEXLib.cxx
-vcl/unx/kde4/KDEXLib.hxx
-vcl/unx/kde4/VCLKDEApplication.cxx
-vcl/unx/kde4/VCLKDEApplication.hxx
-vcl/unx/kde4/main.cxx
-vcl/unx/kde4/tst_exclude_posted_events.hxx
-vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
vcl/unx/x11/x11sys.cxx
vcl/unx/x11/xlimits.cxx
vcl/win/app/saldata.cxx
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 12824fb8bc69..15f201931792 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -27,7 +27,6 @@ enum GenericUnixSalDataType
{
SAL_DATA_GTK,
SAL_DATA_GTK3,
- SAL_DATA_KDE4,
SAL_DATA_KDE5,
SAL_DATA_UNX,
SAL_DATA_SVP,
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index 938780d11879..555cfe04f5d7 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -263,7 +263,7 @@ SalInstance *CreateSalInstance()
#ifdef MACOSX
"osx"
#else
- "gtk3", "gtk", "kde5", "kde4", "gen"
+ "gtk3", "gtk", "kde5", "gen"
#endif
#endif
};