diff options
| author | Friedrich W. H. Kossebau <[email protected]> | 2026-01-09 16:16:48 +0100 |
|---|---|---|
| committer | Méven Car <[email protected]> | 2026-01-10 15:14:26 +0000 |
| commit | 5fff1e414a060c0619a97ad8d3f5665e3f5a4878 (patch) | |
| tree | 5ed5b7560ba22bf690f72c399d31490493b87ea3 /src/kitemviews | |
| parent | 3cea7599a110479071919e92d6c91959020c33df (diff) | |
Use Q_ASSERT instead of Q_CHECK_PTR for plain checks of pointer value
Q_CHECK_PTR (other than the name suggests) is intended only to check the
success of memory allocations.
Using it for any pointers instead can be misleading due to the
"Out of memory" log printed in case of hits.
Diffstat (limited to 'src/kitemviews')
| -rw-r--r-- | src/kitemviews/accessibility/kitemlistcontaineraccessible.cpp | 6 | ||||
| -rw-r--r-- | src/kitemviews/accessibility/kitemlistviewaccessible.cpp | 6 | ||||
| -rw-r--r-- | src/kitemviews/kitemlistview.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/kitemviews/accessibility/kitemlistcontaineraccessible.cpp b/src/kitemviews/accessibility/kitemlistcontaineraccessible.cpp index 6abf45025..6facae06c 100644 --- a/src/kitemviews/accessibility/kitemlistcontaineraccessible.cpp +++ b/src/kitemviews/accessibility/kitemlistcontaineraccessible.cpp @@ -47,7 +47,7 @@ int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface *child QAccessibleInterface *KItemListContainerAccessible::child(int index) const { if (index == 0) { - Q_CHECK_PTR(static_cast<KItemListViewAccessible *>(QAccessible::queryAccessibleInterface(container()->controller()->view()))); + Q_ASSERT(static_cast<KItemListViewAccessible *>(QAccessible::queryAccessibleInterface(container()->controller()->view()))); return QAccessible::queryAccessibleInterface(container()->controller()->view()); } qWarning("Calling KItemListContainerAccessible::child(index) with index != 0 is always pointless."); @@ -70,7 +70,7 @@ QAccessible::State KItemListContainerAccessible::state() const void KItemListContainerAccessible::doAction(const QString &actionName) { auto view = static_cast<KItemListViewAccessible *>(child(0)); - Q_CHECK_PTR(view); // A container should always have a view. Otherwise it has no reason to exist. + Q_ASSERT(view); // A container should always have a view. Otherwise it has no reason to exist. if (actionName == setFocusAction() && view) { view->doAction(actionName); return; @@ -80,6 +80,6 @@ void KItemListContainerAccessible::doAction(const QString &actionName) const KItemListContainer *KItemListContainerAccessible::container() const { - Q_CHECK_PTR(qobject_cast<KItemListContainer *>(object())); + Q_ASSERT(qobject_cast<KItemListContainer *>(object())); return static_cast<KItemListContainer *>(object()); } diff --git a/src/kitemviews/accessibility/kitemlistviewaccessible.cpp b/src/kitemviews/accessibility/kitemlistviewaccessible.cpp index 319b69f30..21bf7a3f6 100644 --- a/src/kitemviews/accessibility/kitemlistviewaccessible.cpp +++ b/src/kitemviews/accessibility/kitemlistviewaccessible.cpp @@ -33,7 +33,7 @@ KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_, KItemList , m_parent(parent) { Q_ASSERT(view()); - Q_CHECK_PTR(parent); + Q_ASSERT(parent); m_accessibleDelegates.resize(childCount()); m_announceCurrentItemTimer = new QTimer{view_}; @@ -362,7 +362,7 @@ bool KItemListViewAccessible::clear() bool KItemListViewAccessible::isSelected(QAccessibleInterface *childItem) const { - Q_CHECK_PTR(childItem); + Q_ASSERT(childItem); return static_cast<KItemListDelegateAccessible *>(childItem)->isSelected(); } @@ -435,7 +435,7 @@ QStringList KItemListViewAccessible::keyBindingsForAction(const QString &actionN KItemListView *KItemListViewAccessible::view() const { - Q_CHECK_PTR(qobject_cast<KItemListView *>(object())); + Q_ASSERT(qobject_cast<KItemListView *>(object())); return static_cast<KItemListView *>(object()); } diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index bcfa27eaa..ac3e6720f 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -355,7 +355,7 @@ void KItemListView::setAccessibleParentsObject(KItemListContainer *accessiblePar } KItemListContainerAccessible *KItemListView::accessibleParent() { - Q_CHECK_PTR(m_accessibleParent); // We always want the accessibility tree/hierarchy to be complete. + Q_ASSERT(m_accessibleParent); // We always want the accessibility tree/hierarchy to be complete. return m_accessibleParent; } #endif |
