summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2020-07-06 03:01:51 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-07-10 01:34:54 +0200
commit493ae7a6bb0c3ad50615db0090e7ae8d391bc327 (patch)
tree9f60f522f1ff9dde6a8131d155654f4d47b37fd0 /include
parent005f5db47b8e1bbd7ebddee92009be072e835fd5 (diff)
replace usage of blacklist with denylist
.. and a few cases of instead doing blacklist->excludelist where that made more sense. Background and motivation: https://tools.ietf.org/html/draft-knodel-terminology-02 [API CHANGE] officecfg::Office::Canvas::DeviceBlacklist -> DeviceDenylist [API CHANGE] officecfg::Office::Canvas::BlacklistCurrentDevice -> DenylistCurrentDevice [API CHANGE] officecfg::Office::Common::Misc::OpenCLBlackList -> OpenCLDenyList Change-Id: Ia35e25496bf0cc0692d5de4cb66bfc232d3a869e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98180 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'include')
-rw-r--r--include/onlineupdate/mozilla/Attributes.h24
-rw-r--r--include/opencl/openclconfig.hxx2
-rw-r--r--include/sfx2/filedlghelper.hxx6
-rw-r--r--include/sfx2/sfxsids.hrc2
-rw-r--r--include/vcl/opengl/OpenGLHelper.hxx4
5 files changed, 19 insertions, 19 deletions
diff --git a/include/onlineupdate/mozilla/Attributes.h b/include/onlineupdate/mozilla/Attributes.h
index 6c2cc02892c1..74b77a38d082 100644
--- a/include/onlineupdate/mozilla/Attributes.h
+++ b/include/onlineupdate/mozilla/Attributes.h
@@ -245,42 +245,42 @@
#endif
/*
- * MOZ_ASAN_BLACKLIST is a macro to tell AddressSanitizer (a compile-time
+ * MOZ_ASAN_DENYLIST is a macro to tell AddressSanitizer (a compile-time
* instrumentation shipped with Clang and GCC) to not instrument the annotated
* function. Furthermore, it will prevent the compiler from inlining the
- * function because inlining currently breaks the blacklisting mechanism of
+ * function because inlining currently breaks the denylisting mechanism of
* AddressSanitizer.
*/
#if defined(__has_feature)
# if __has_feature(address_sanitizer)
-# define MOZ_HAVE_ASAN_BLACKLIST
+# define MOZ_HAVE_ASAN_DENYLIST
# endif
#elif defined(__GNUC__)
# if defined(__SANITIZE_ADDRESS__)
-# define MOZ_HAVE_ASAN_BLACKLIST
+# define MOZ_HAVE_ASAN_DENYLIST
# endif
#endif
-#if defined(MOZ_HAVE_ASAN_BLACKLIST)
-# define MOZ_ASAN_BLACKLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_address))
+#if defined(MOZ_HAVE_ASAN_DENYLIST)
+# define MOZ_ASAN_DENYLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_address))
#else
-# define MOZ_ASAN_BLACKLIST /* nothing */
+# define MOZ_ASAN_DENYLIST /* nothing */
#endif
/*
- * MOZ_TSAN_BLACKLIST is a macro to tell ThreadSanitizer (a compile-time
+ * MOZ_TSAN_DENYLIST is a macro to tell ThreadSanitizer (a compile-time
* instrumentation shipped with Clang) to not instrument the annotated function.
* Furthermore, it will prevent the compiler from inlining the function because
- * inlining currently breaks the blacklisting mechanism of ThreadSanitizer.
+ * inlining currently breaks the denylisting mechanism of ThreadSanitizer.
*/
#if defined(__has_feature)
# if __has_feature(thread_sanitizer)
-# define MOZ_TSAN_BLACKLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_thread))
+# define MOZ_TSAN_DENYLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_thread))
# else
-# define MOZ_TSAN_BLACKLIST /* nothing */
+# define MOZ_TSAN_DENYLIST /* nothing */
# endif
#else
-# define MOZ_TSAN_BLACKLIST /* nothing */
+# define MOZ_TSAN_DENYLIST /* nothing */
#endif
/**
diff --git a/include/opencl/openclconfig.hxx b/include/opencl/openclconfig.hxx
index c7a188a73203..c1b73a66485a 100644
--- a/include/opencl/openclconfig.hxx
+++ b/include/opencl/openclconfig.hxx
@@ -76,7 +76,7 @@ struct OPENCL_DLLPUBLIC OpenCLConfig
typedef std::set<ImplMatcher> ImplMatcherSet;
- ImplMatcherSet maBlackList;
+ ImplMatcherSet maDenyList;
ImplMatcherSet maWhiteList;
OpenCLConfig();
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 42d6b53c0cfb..a0a436f12e9c 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -120,7 +120,7 @@ public:
SfxFilterFlags nMust,
SfxFilterFlags nDont,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList,
+ const css::uno::Sequence< OUString >& rDenyList,
weld::Window* pPreferredParent);
FileDialogHelper(sal_Int16 nDialogType,
@@ -128,7 +128,7 @@ public:
const OUString& aFilterUIName,
const OUString& aExtName,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList,
+ const css::uno::Sequence< OUString >& rDenyList,
weld::Window* pPreferredParent);
virtual ~FileDialogHelper();
@@ -253,7 +253,7 @@ ErrCode FileOpenDialog_Impl( weld::Window* pParent,
const OUString* pPath,
sal_Int16 nDialog,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >());
+ const css::uno::Sequence< OUString >& rDenyList = css::uno::Sequence< OUString >());
ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, OUString const & aURL, SfxItemSet* pSet, const css::uno::Reference<css::awt::XWindow>& rParent);
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index a42f43c2a702..23d7382f062d 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -153,7 +153,7 @@ class SvxSearchItem;
#define SID_PATH (SID_SFX_START + 308)
#define SID_SAVEDOCS (SID_SFX_START + 309)
#define SID_STANDARD_DIR (SID_SFX_START + 450)
-#define SID_BLACK_LIST (SID_SFX_START + 451)
+#define SID_DENY_LIST (SID_SFX_START + 451)
// browse-ids
#define SID_BROWSE_FORWARD (SID_SFX_START + 1300)
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 4f365c2e44ff..493fd5d2e014 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -100,9 +100,9 @@ public:
static void debugMsgStreamWarn(std::ostringstream const &pStream);
/**
- * checks if the device/driver pair is on our OpenGL blacklist
+ * checks if the device/driver pair is on our OpenGL denylist
*/
- static bool isDeviceBlacklisted();
+ static bool isDeviceDenylisted();
/**
* checks if the system supports all features that are necessary for the OpenGL VCL support