summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-08-14 10:37:16 +0200
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-08-14 10:37:16 +0200
commita456c693152d35fb00fd321d976d5f5def10aa1c (patch)
tree590346bafbdec0beac4fa1fde13e74192efdb597 /src/control
parentca84b995ca4fb8d0dd95faf3d888306614f194b9 (diff)
control: Rename ControlFlag to AllowInvalidKey
Diffstat (limited to 'src/control')
-rw-r--r--src/control/control.cpp2
-rw-r--r--src/control/controlproxy.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/control/control.cpp b/src/control/control.cpp
index 3a412d7fe7..9b0ae2f9f9 100644
--- a/src/control/control.cpp
+++ b/src/control/control.cpp
@@ -103,7 +103,7 @@ QSharedPointer<ControlDoublePrivate> ControlDoublePrivate::getControl(
double defaultValue) {
VERIFY_OR_DEBUG_ASSERT(key.isValid()) {
qWarning() << "ControlDoublePrivate::getControl returning nullptr"
- << "for invalid ConfigKey.";
+ << "for invalid ConfigKey" << key;
return nullptr;
}
diff --git a/src/control/controlproxy.cpp b/src/control/controlproxy.cpp
index 56b786a5e6..5ca1f04630 100644
--- a/src/control/controlproxy.cpp
+++ b/src/control/controlproxy.cpp
@@ -14,7 +14,7 @@ ControlProxy::ControlProxy(const char* g, const char* i, QObject* pParent, Contr
ControlProxy::ControlProxy(const ConfigKey& key, QObject* pParent, ControlFlags flags)
: QObject(pParent),
m_pControl(nullptr) {
- DEBUG_ASSERT(key.isValid() || flags.testFlag(ControlFlag::AllowEmptyKey));
+ DEBUG_ASSERT(key.isValid() || flags.testFlag(ControlFlag::AllowInvalidKey));
m_key = key;
if (m_key.isValid()) {
@@ -27,7 +27,7 @@ void ControlProxy::initialize(ControlFlags flags) {
DEBUG_ASSERT(!m_pControl);
// Prevent empty keys
- VERIFY_OR_DEBUG_ASSERT(m_key.isValid() || flags.testFlag(ControlFlag::AllowEmptyKey)) {
+ VERIFY_OR_DEBUG_ASSERT(m_key.isValid() || flags.testFlag(ControlFlag::AllowInvalidKey)) {
return;
}