From addb38645b41507ae8e0536bb83d3b99d365f664 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Mon, 28 Dec 2020 13:44:26 +0100
Subject: Clean drag&drop of URLs and mods/archives.

---
 src/modlist.h | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'src/modlist.h')

diff --git a/src/modlist.h b/src/modlist.h
index 2ca2fff1..b2eb6be6 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -199,11 +199,13 @@ public: // implementation of virtual functions of QAbstractItemModel
   virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
   virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
   virtual Qt::ItemFlags flags(const QModelIndex &modelIndex) const;
-  virtual Qt::DropActions supportedDropActions() const { return Qt::MoveAction | Qt::CopyAction; }
-  virtual QStringList mimeTypes() const;
-  virtual QMimeData *mimeData(const QModelIndexList &indexes) const;
-  virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
-  virtual bool removeRows(int row, int count, const QModelIndex &parent);
+  virtual bool removeRows(int row, int count, const QModelIndex& parent);
+
+  Qt::DropActions supportedDropActions() const override { return Qt::MoveAction | Qt::CopyAction; }
+  QStringList mimeTypes() const override;
+  QMimeData *mimeData(const QModelIndexList &indexes) const override;
+  bool canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const override;
+  bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
 
   virtual QModelIndex index(int row, int column,
                             const QModelIndex &parent = QModelIndex()) const;
@@ -213,10 +215,8 @@ public: // implementation of virtual functions of QAbstractItemModel
 
 public slots:
 
-  void dropModeUpdate(bool dropOnItems);
 
   void enableSelected(const QItemSelectionModel *selectionModel);
-
   void disableSelected(const QItemSelectionModel *selectionModel);
 
 signals:
@@ -369,6 +369,16 @@ private:
 
 private:
 
+  // retrieve the relative path of file and its origin given a URL from Mime data
+  // returns an empty optional if the URL is not a valid file for dropping
+  //
+  std::optional<std::pair<QString, QString>> relativeUrl(const QUrl&) const;
+
+  // return the source rows from the given mime data for drag&drop of mods or
+  // installation archives
+  //
+  std::vector<int> sourceRows(const QMimeData* mimeData) const;
+
   bool dropURLs(const QMimeData* mimeData, int row, const QModelIndex& parent);
   bool dropMod(const QMimeData* mimeData, int row, const QModelIndex& parent);
   bool dropArchive(const QMimeData* mimeData, int row, const QModelIndex& parent);
@@ -392,8 +402,6 @@ private:
 
   QFontMetrics m_FontMetrics;
 
-  bool m_DropOnItems;
-
   std::set<unsigned int> m_Overwrite;
   std::set<unsigned int> m_Overwritten;
   std::set<unsigned int> m_ArchiveOverwrite;
-- 
cgit v1.3.1