From d37fb29b36efce0348e46c921745d33920cf6a88 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 5 May 2024 15:39:55 +0200
Subject: [PATCH] Gui: fix some linter warnings

---
 src/Gui/Tree.cpp | 12 ++++++++----
 src/Gui/Tree.h   | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
index bc475b624d..6bffebdbea 100644
--- a/src/Gui/Tree.cpp
+++ b/src/Gui/Tree.cpp
@@ -2006,7 +2006,8 @@ TreeWidget::TargetItemInfo TreeWidget::getTargetInfo(QEvent* ev)
     return targetInfo;
 }
 
-bool TreeWidget::dropInDocument(QDropEvent* event, TargetItemInfo& targetInfo, std::vector<std::pair<DocumentObjectItem*, std::vector<std::string> > > items)
+bool TreeWidget::dropInDocument(QDropEvent* event, TargetItemInfo& targetInfo,
+                                std::vector<TreeWidget::ObjectItemSubname> items)
 {
     std::string errMsg;
     auto da = event->dropAction();
@@ -2210,7 +2211,8 @@ bool TreeWidget::dropInDocument(QDropEvent* event, TargetItemInfo& targetInfo, s
     return touched;
 }
 
-bool TreeWidget::dropInObject(QDropEvent* event, TargetItemInfo& targetInfo, std::vector<std::pair<DocumentObjectItem*, std::vector<std::string> > > items)
+bool TreeWidget::dropInObject(QDropEvent* event, TargetItemInfo& targetInfo,
+                              std::vector<TreeWidget::ObjectItemSubname> items)
 {
     std::string errMsg;
     auto da = event->dropAction();
@@ -2577,7 +2579,7 @@ void TreeWidget::dropEvent(QDropEvent* event)
     }
 
     // filter out the selected items we cannot handle
-    std::vector<std::pair<DocumentObjectItem*, std::vector<std::string> > > items;
+    std::vector<ObjectItemSubname> items;
     items = DropHandler::filterItems(selectedItems(), targetInfo.targetItem);
     if (items.empty()) {
         return; // nothing needs to be done
@@ -3058,7 +3060,9 @@ void TreeWidget::onItemEntered(QTreeWidgetItem* item)
         Selection().rmvPreselect();
 }
 
-void TreeWidget::leaveEvent(QEvent*) {
+void TreeWidget::leaveEvent(QEvent* event)
+{
+    Q_UNUSED(event)
     if (!updateBlocked && TreeParams::getPreSelection()) {
         preselectTimer->stop();
         Selection().rmvPreselect();
diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h
index 85a4a579b3..4768714771 100644
--- a/src/Gui/Tree.h
+++ b/src/Gui/Tree.h
@@ -141,6 +141,8 @@ protected:
     void dragLeaveEvent(QDragLeaveEvent * event) override;
     void dragMoveEvent(QDragMoveEvent *event) override;
     void dropEvent(QDropEvent *event) override;
+
+private:
     struct TargetItemInfo {
         QTreeWidgetItem* targetItem = nullptr; //target may be the parent of underMouse
         QTreeWidgetItem* underMouseItem = nullptr;
@@ -150,19 +152,23 @@ protected:
         bool inThresholdZone = false;
     };
     TargetItemInfo getTargetInfo(QEvent* ev);
-    bool dropInObject(QDropEvent* event, TargetItemInfo& targetInfo, std::vector<std::pair<DocumentObjectItem*, std::vector<std::string> > > items);
-    bool dropInDocument(QDropEvent* event, TargetItemInfo& targetInfo, std::vector<std::pair<DocumentObjectItem*, std::vector<std::string> > > items);
+    using ObjectItemSubname = std::pair<DocumentObjectItem*, std::vector<std::string>>;
+    bool dropInObject(QDropEvent* event, TargetItemInfo& targetInfo, std::vector<ObjectItemSubname> items);
+    bool dropInDocument(QDropEvent* event, TargetItemInfo& targetInfo, std::vector<ObjectItemSubname> items);
     void sortDroppedObjects(TargetItemInfo& targetInfo, std::vector<App::DocumentObject*> draggedObjects);
     //@}
+
+protected:
     bool event(QEvent *e) override;
     void keyPressEvent(QKeyEvent *event) override;
     void mousePressEvent(QMouseEvent * event) override;
     void mouseDoubleClickEvent(QMouseEvent * event) override;
 
-protected:
-    void showEvent(QShowEvent *) override;
-    void hideEvent(QHideEvent *) override;
-    void leaveEvent(QEvent *) override;
+    void showEvent(QShowEvent *ev) override;
+    void hideEvent(QHideEvent *ev) override;
+    void leaveEvent(QEvent *event) override;
+
+private:
     void _updateStatus(bool delay=true);
 
 protected Q_SLOTS: