Revert "Configurable Show hidden files and folders last toggle"

[dolphin.git] / src / views / dolphinviewactionhandler.cpp

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 4acc420b023ca1ba7920d767a839d26ad2dc47f7..c9bab5f82f793e5a66f508a5c3781756fcdbc769 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -259,7 +259,7 @@ void DolphinViewActionHandler::createActions()
     KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("sort"));
     sortByActionMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-sort")));
     sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
-    sortByActionMenu->setDelayed(false);
+    sortByActionMenu->setPopupMode(QToolButton::InstantPopup);
 
     const auto sortByActionGroupActions = sortByActionGroup->actions();
     for (QAction* action : sortByActionGroupActions) {
@@ -294,7 +294,7 @@ void DolphinViewActionHandler::createActions()
     KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("additional_info"));
     visibleRolesMenu->setText(i18nc("@action:inmenu View", "Show Additional Information"));
     visibleRolesMenu->setIcon(QIcon::fromTheme(QStringLiteral("documentinfo")));
-    visibleRolesMenu->setDelayed(false);
+    visibleRolesMenu->setPopupMode(QToolButton::InstantPopup);
 
     const auto visibleRolesGroupActions = visibleRolesGroup->actions();
     for (QAction* action : visibleRolesGroupActions) {
@@ -793,7 +793,6 @@ void DolphinViewActionHandler::slotSelectionChanged(const KFileItemList& selecti
     basicActionsMenu->setText(basicActionsMenuText);
 
     // Add or remove contextual actions
-    auto basicActionsMenuActions = basicActionsMenu->menu()->actions();
     while (!basicActionsMenu->menu()->actions().constLast()->isSeparator()) {
         basicActionsMenu->menu()->removeAction(basicActionsMenu->menu()->actions().last());
     }