From d49b4aa1bc826bc2343f518af6712981228f1c8e Mon Sep 17 00:00:00 2001 From: Méven Car Date: Sat, 13 Jun 2026 14:28:08 +0000 Subject: remove version guards below the build minimums KIO_VERSION and KFILEMETADATA_VERSION checks up to 6.23 are always true given the Qt 6.4 / KF 6.23 minimum versions. --- src/dolphinmainwindow.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/dolphinmainwindow.cpp') diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index d35575624..ed7215b5a 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -159,10 +159,8 @@ DolphinMainWindow::DolphinMainWindow() connect(undoManager, &KIO::FileUndoManager::undoAvailable, this, &DolphinMainWindow::slotUndoAvailable); connect(undoManager, &KIO::FileUndoManager::undoTextChanged, this, &DolphinMainWindow::slotUndoTextChanged); -#if KIO_VERSION >= QT_VERSION_CHECK(6, 17, 0) connect(undoManager, &KIO::FileUndoManager::redoAvailable, this, &DolphinMainWindow::slotRedoAvailable); connect(undoManager, &KIO::FileUndoManager::redoTextChanged, this, &DolphinMainWindow::slotRedoTextChanged); -#endif const bool firstRun = (GeneralSettings::version() < 200); if (firstRun) { @@ -877,7 +875,6 @@ void DolphinMainWindow::undo() KIO::FileUndoManager::self()->undo(); } -#if KIO_VERSION >= QT_VERSION_CHECK(6, 17, 0) void DolphinMainWindow::slotRedoAvailable(bool available) { QAction *redoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Redo)); @@ -899,7 +896,6 @@ void DolphinMainWindow::redo() KIO::FileUndoManager::self()->uiInterface()->setParentWidget(this); KIO::FileUndoManager::self()->redo(); } -#endif void DolphinMainWindow::cut() { @@ -1568,9 +1564,7 @@ void DolphinMainWindow::updateHamburgerMenu() } menu->addAction(ac->action(QStringLiteral("basic_actions"))); menu->addAction(ac->action(KStandardAction::name(KStandardAction::Undo))); -#if KIO_VERSION >= QT_VERSION_CHECK(6, 17, 0) menu->addAction(ac->action(KStandardAction::name(KStandardAction::Redo))); -#endif if (!toolBar()->isVisible() || (!toolbarActions.contains(ac->action(QStringLiteral("toggle_search"))) && !toolbarActions.contains(ac->action(QStringLiteral("open_preferred_search_tool"))))) { @@ -1839,9 +1833,7 @@ void DolphinMainWindow::setupActions() // setup 'Edit' menu KStandardAction::undo(this, &DolphinMainWindow::undo, actionCollection()); -#if KIO_VERSION >= QT_VERSION_CHECK(6, 17, 0) KStandardAction::redo(this, &DolphinMainWindow::redo, actionCollection()); -#endif // i18n: This will be the last paragraph for the whatsthis for all three: // Cut, Copy and Paste @@ -2124,7 +2116,6 @@ void DolphinMainWindow::setupActions() "will ask for your confirmation beforehand.")); undoAction->setEnabled(false); // undo should be disabled by default -#if KIO_VERSION >= QT_VERSION_CHECK(6, 17, 0) auto redoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Redo)); redoAction->setWhatsThis(xi18nc("@info:whatsthis", "This redoes " @@ -2134,7 +2125,6 @@ void DolphinMainWindow::setupActions() "or to the Trash.Any changes that cannot be undone " "will ask for your confirmation beforehand.")); redoAction->setEnabled(false); // redo should be disabled by default -#endif { QScopedPointer forwardAction(KStandardAction::forward(nullptr, nullptr, nullptr)); -- cgit v1.3.1