From 8040340e8b5f28be02c42d608aebef52a6784c14 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 3 Jul 2023 12:35:48 +0300 Subject: [PATCH] dolphin: remove now unused KItemListController setters and getters Signed-off-by: Ivailo Monev --- .../src/kitemviews/kitemlistcontroller.cpp | 26 +------------------ dolphin/src/kitemviews/kitemlistcontroller.h | 20 -------------- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/dolphin/src/kitemviews/kitemlistcontroller.cpp b/dolphin/src/kitemviews/kitemlistcontroller.cpp index a6b5942f..6215bdc3 100644 --- a/dolphin/src/kitemviews/kitemlistcontroller.cpp +++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp @@ -47,8 +47,6 @@ KItemListController::KItemListController(KItemModelBase* model, KItemListView* v m_selectionTogglePressed(false), m_clearSelectionIfItemsAreNotDragged(false), m_selectionBehavior(NoSelection), - m_autoActivationBehavior(ActivationAndExpansion), - m_mouseDoubleClickAction(ActivateItemOnly), m_model(0), m_view(0), m_selectionManager(new KItemListSelectionManager(this)), @@ -159,26 +157,6 @@ KItemListController::SelectionBehavior KItemListController::selectionBehavior() return m_selectionBehavior; } -void KItemListController::setAutoActivationBehavior(AutoActivationBehavior behavior) -{ - m_autoActivationBehavior = behavior; -} - -KItemListController::AutoActivationBehavior KItemListController::autoActivationBehavior() const -{ - return m_autoActivationBehavior; -} - -void KItemListController::setMouseDoubleClickAction(MouseDoubleClickAction action) -{ - m_mouseDoubleClickAction = action; -} - -KItemListController::MouseDoubleClickAction KItemListController::mouseDoubleClickAction() const -{ - return m_mouseDoubleClickAction; -} - void KItemListController::setAutoActivationDelay(int delay) { m_autoActivationTimer->setInterval(delay); @@ -491,9 +469,7 @@ void KItemListController::slotAutoActivationTimeout() * See Bug 293200 and 305783 */ if (m_model->supportsDropping(index) && m_view->isUnderMouse()) { - if (m_autoActivationBehavior != ExpansionOnly) { - emit itemActivated(index); - } + emit itemActivated(index); } } diff --git a/dolphin/src/kitemviews/kitemlistcontroller.h b/dolphin/src/kitemviews/kitemlistcontroller.h index 5b5979e3..04ffd16c 100644 --- a/dolphin/src/kitemviews/kitemlistcontroller.h +++ b/dolphin/src/kitemviews/kitemlistcontroller.h @@ -65,8 +65,6 @@ class DOLPHINPRIVATE_EXPORT KItemListController : public QObject Q_PROPERTY(KItemModelBase* model READ model WRITE setModel) Q_PROPERTY(KItemListView *view READ view WRITE setView) Q_PROPERTY(SelectionBehavior selectionBehavior READ selectionBehavior WRITE setSelectionBehavior) - Q_PROPERTY(AutoActivationBehavior autoActivationBehavior READ autoActivationBehavior WRITE setAutoActivationBehavior) - Q_PROPERTY(MouseDoubleClickAction mouseDoubleClickAction READ mouseDoubleClickAction WRITE setMouseDoubleClickAction) public: enum SelectionBehavior { @@ -75,16 +73,6 @@ public: MultiSelection }; - enum AutoActivationBehavior { - ActivationAndExpansion, - ExpansionOnly - }; - - enum MouseDoubleClickAction { - ActivateAndExpandItem, - ActivateItemOnly - }; - /** * @param model Model of the controller. The ownership is passed to the controller. * @param view View of the controller. The ownership is passed to the controller. @@ -104,12 +92,6 @@ public: void setSelectionBehavior(SelectionBehavior behavior); SelectionBehavior selectionBehavior() const; - void setAutoActivationBehavior(AutoActivationBehavior behavior); - AutoActivationBehavior autoActivationBehavior() const; - - void setMouseDoubleClickAction(MouseDoubleClickAction action); - MouseDoubleClickAction mouseDoubleClickAction() const; - /** * Sets the delay in milliseconds when dragging an object above an item * until the item gets activated automatically. A value of -1 indicates @@ -303,8 +285,6 @@ private: bool m_selectionTogglePressed; bool m_clearSelectionIfItemsAreNotDragged; SelectionBehavior m_selectionBehavior; - AutoActivationBehavior m_autoActivationBehavior; - MouseDoubleClickAction m_mouseDoubleClickAction; KItemModelBase* m_model; KItemListView* m_view; KItemListSelectionManager* m_selectionManager;