┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/admin/workerintegration.cpp4
-rw-r--r--src/dolphinmainwindow.cpp6
-rw-r--r--src/dolphinnavigatorswidgetaction.cpp6
-rw-r--r--src/dolphintabpage.cpp4
-rw-r--r--src/dolphinviewcontainer.cpp8
-rw-r--r--src/kitemviews/accessibility/kitemlistcontaineraccessible.cpp6
-rw-r--r--src/kitemviews/accessibility/kitemlistviewaccessible.cpp6
-rw-r--r--src/kitemviews/kitemlistview.cpp2
-rw-r--r--src/selectionmode/actiontexthelper.cpp2
-rw-r--r--src/selectionmode/actionwithwidget.cpp4
-rw-r--r--src/selectionmode/actionwithwidget.h2
-rw-r--r--src/selectionmode/bottombarcontentscontainer.cpp4
-rw-r--r--src/tests/dolphinmainwindowtest.cpp2
13 files changed, 28 insertions, 28 deletions
diff --git a/src/admin/workerintegration.cpp b/src/admin/workerintegration.cpp
index c0cc5ac83..8a24619ab 100644
--- a/src/admin/workerintegration.cpp
+++ b/src/admin/workerintegration.cpp
@@ -112,8 +112,8 @@ WorkerIntegration::WorkerIntegration(DolphinMainWindow *parent, QAction *actAsAd
: QObject{parent}
, m_actAsAdminAction{actAsAdminAction}
{
- Q_CHECK_PTR(parent);
- Q_CHECK_PTR(actAsAdminAction);
+ Q_ASSERT(parent);
+ Q_ASSERT(actAsAdminAction);
connect(parent, &DolphinMainWindow::urlChanged, this, &WorkerIntegration::updateActAsAdminAction);
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index baf94ef3e..018a6c95a 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -189,11 +189,11 @@ DolphinMainWindow::DolphinMainWindow()
connect(m_actionHandler, &DolphinViewActionHandler::selectionModeChangeTriggered, this, &DolphinMainWindow::slotSetSelectionMode);
QAction *newDirAction = actionCollection()->action(QStringLiteral("create_dir"));
- Q_CHECK_PTR(newDirAction);
+ Q_ASSERT(newDirAction);
m_newFileMenu->setNewFolderShortcutAction(newDirAction);
QAction *newFileAction = actionCollection()->action(QStringLiteral("create_file"));
- Q_CHECK_PTR(newFileAction);
+ Q_ASSERT(newFileAction);
m_newFileMenu->setNewFileShortcutAction(newFileAction);
m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler);
@@ -271,7 +271,7 @@ DolphinMainWindow::~DolphinMainWindow()
disconnect(QGuiApplication::clipboard(), &QClipboard::dataChanged, this, &DolphinMainWindow::updatePasteAction);
// This fixes a crash in dolphinmainwindowtest where the connection below fires even though the KMainWindow destructor of this object is already running.
- Q_CHECK_PTR(qobject_cast<DolphinDockWidget *>(m_placesPanel->parent()));
+ Q_ASSERT(qobject_cast<DolphinDockWidget *>(m_placesPanel->parent()));
disconnect(static_cast<DolphinDockWidget *>(m_placesPanel->parent()),
&DolphinDockWidget::visibilityChanged,
this,
diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp
index 93d6859b1..c44b7e796 100644
--- a/src/dolphinnavigatorswidgetaction.cpp
+++ b/src/dolphinnavigatorswidgetaction.cpp
@@ -326,8 +326,8 @@ DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper(QWidge
: m_navigatorsWidget{navigatorsWidget}
, m_navigatorsWidgetAction{navigatorsWidgetAction}
{
- Q_CHECK_PTR(navigatorsWidget);
- Q_CHECK_PTR(navigatorsWidgetAction);
+ Q_ASSERT(navigatorsWidget);
+ Q_ASSERT(navigatorsWidgetAction);
}
bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *watched, QEvent *event)
@@ -351,7 +351,7 @@ bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *w
void DolphinNavigatorsWidgetAction::ViewGeometriesHelper::setViewContainers(QWidget *primaryViewContainer, QWidget *secondaryViewContainer)
{
- Q_CHECK_PTR(primaryViewContainer);
+ Q_ASSERT(primaryViewContainer);
if (m_primaryViewContainer) {
m_primaryViewContainer->removeEventFilter(this);
}
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index ce091cfc1..ca47130c0 100644
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -425,7 +425,7 @@ void DolphinTabPage::slotAnimationFinished()
void DolphinTabPage::slotAnimationValueChanged(const QVariant &value)
{
- Q_CHECK_PTR(m_expandingContainer);
+ Q_ASSERT(m_expandingContainer);
const int indexOfExpandingContainer = m_splitter->indexOf(m_expandingContainer);
int indexOfNonExpandingContainer = -1;
if (m_expandingContainer == m_primaryViewContainer) {
@@ -533,7 +533,7 @@ DolphinViewContainer *DolphinTabPage::createViewContainer(const QUrl &url) const
void DolphinTabPage::startExpandViewAnimation(DolphinViewContainer *expandingContainer)
{
- Q_CHECK_PTR(expandingContainer);
+ Q_ASSERT(expandingContainer);
Q_ASSERT(expandingContainer == m_primaryViewContainer || expandingContainer == m_secondaryViewContainer);
m_expandingContainer = expandingContainer;
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index f6fd01de2..fb83be453 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -284,10 +284,10 @@ DolphinView *DolphinViewContainer::view()
void DolphinViewContainer::connectUrlNavigator(DolphinUrlNavigator *urlNavigator)
{
- Q_CHECK_PTR(urlNavigator);
+ Q_ASSERT(urlNavigator);
Q_ASSERT(!m_urlNavigatorConnected);
Q_ASSERT(m_urlNavigator.get() != urlNavigator);
- Q_CHECK_PTR(m_view);
+ Q_ASSERT(m_view);
urlNavigator->setLocationUrl(m_view->url());
urlNavigator->setShowHiddenFolders(m_view->hiddenFilesShown());
@@ -413,8 +413,8 @@ void DolphinViewContainer::setSelectionModeEnabled(bool enabled, KActionCollecti
if (!wasEnabled) {
return; // nothing to do here
}
- Q_CHECK_PTR(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once.
- Q_CHECK_PTR(m_selectionModeBottomBar);
+ Q_ASSERT(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once.
+ Q_ASSERT(m_selectionModeBottomBar);
m_selectionModeTopBar->setVisible(false, WithAnimation);
m_selectionModeBottomBar->setVisible(false, WithAnimation);
Q_EMIT selectionModeChanged(false);
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
diff --git a/src/selectionmode/actiontexthelper.cpp b/src/selectionmode/actiontexthelper.cpp
index b54e9b004..1e331860a 100644
--- a/src/selectionmode/actiontexthelper.cpp
+++ b/src/selectionmode/actiontexthelper.cpp
@@ -16,7 +16,7 @@ ActionTextHelper::ActionTextHelper(QObject *parent)
void ActionTextHelper::registerTextWhenNothingIsSelected(QAction *action, QString registeredText)
{
- Q_CHECK_PTR(action);
+ Q_ASSERT(action);
m_registeredActionTextChanges.emplace_back(action, registeredText, TextWhenNothingIsSelected);
}
diff --git a/src/selectionmode/actionwithwidget.cpp b/src/selectionmode/actionwithwidget.cpp
index cc407d334..2ab613ba2 100644
--- a/src/selectionmode/actionwithwidget.cpp
+++ b/src/selectionmode/actionwithwidget.cpp
@@ -28,7 +28,7 @@ ActionWithWidget::ActionWithWidget(QAction *action, QAbstractButton *button)
QWidget *ActionWithWidget::newWidget(QWidget *parent)
{
- Q_CHECK_PTR(m_action);
+ Q_ASSERT(m_action);
Q_ASSERT(!m_widget);
if (m_action->isSeparator()) {
@@ -45,7 +45,7 @@ QWidget *ActionWithWidget::newWidget(QWidget *parent)
QAbstractButton *SelectionMode::newButtonForAction(QAction *action, QWidget *parent)
{
- Q_CHECK_PTR(action);
+ Q_ASSERT(action);
Q_ASSERT(!action->isSeparator());
if (action->priority() == QAction::LowPriority) {
diff --git a/src/selectionmode/actionwithwidget.h b/src/selectionmode/actionwithwidget.h
index e56729a6f..8e09e92e0 100644
--- a/src/selectionmode/actionwithwidget.h
+++ b/src/selectionmode/actionwithwidget.h
@@ -44,7 +44,7 @@ public:
/** @returns the action of this object. */
inline QAction *action()
{
- Q_CHECK_PTR(m_action);
+ Q_ASSERT(m_action);
return m_action;
};
diff --git a/src/selectionmode/bottombarcontentscontainer.cpp b/src/selectionmode/bottombarcontentscontainer.cpp
index bb858b871..3f7e681dd 100644
--- a/src/selectionmode/bottombarcontentscontainer.cpp
+++ b/src/selectionmode/bottombarcontentscontainer.cpp
@@ -42,7 +42,7 @@ void BottomBarContentsContainer::resetContents(BottomBar::Contents contents)
updateExplanatoryLabelVisibility();
});
- Q_CHECK_PTR(m_actionCollection);
+ Q_ASSERT(m_actionCollection);
m_contents = contents;
switch (contents) {
case BottomBar::CopyContents:
@@ -499,7 +499,7 @@ std::vector<QAction *> BottomBarContentsContainer::contextActionsFor(const KFile
// We are going to add the actions from the right-click context menu for the selected items.
auto *dolphinMainWindow = qobject_cast<DolphinMainWindow *>(window());
- Q_CHECK_PTR(dolphinMainWindow);
+ Q_ASSERT(dolphinMainWindow);
if (!m_fileItemActions) {
m_fileItemActions = new KFileItemActions(this);
m_fileItemActions->setParentWidget(dolphinMainWindow);
diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp
index fb3c95383..f68f07cbc 100644
--- a/src/tests/dolphinmainwindowtest.cpp
+++ b/src/tests/dolphinmainwindowtest.cpp
@@ -863,7 +863,7 @@ void DolphinMainWindowTest::testAccessibilityTree()
QTRY_VERIFY_WITH_TIMEOUT(QApplication::activeWindow() != nullptr, 100);
QAccessibleInterface *accessibleInterfaceOfMainWindow = QAccessible::queryAccessibleInterface(m_mainWindow.get());
- Q_CHECK_PTR(accessibleInterfaceOfMainWindow);
+ Q_ASSERT(accessibleInterfaceOfMainWindow);
/// Test the accessibility of objects while traversing forwards (Tab key) and backwards (Shift+Tab).
int testedObjectsSizeAfterTraversingForwards = 0;
generated by cgit v1.3 (git 2.53.0) at 2026-04-18 04:08:11 +0000