From 64701b273d041411bc75caaf9527ea2183ee6679 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Sat, 20 Jun 2015 18:29:31 +0300
Subject: [PATCH] LineEdits for ID values accept drops with a proper type

---
 apps/opencs/view/widget/droplineedit.cpp        | 9 ++++++++-
 apps/opencs/view/widget/droplineedit.hpp        | 5 +++--
 apps/opencs/view/world/idcompletiondelegate.cpp | 2 +-
 apps/opencs/view/world/util.cpp                 | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/widget/droplineedit.cpp b/apps/opencs/view/widget/droplineedit.cpp
index 0b2ac6381..f3500dcd2 100644
--- a/apps/opencs/view/widget/droplineedit.cpp
+++ b/apps/opencs/view/widget/droplineedit.cpp
@@ -13,13 +13,20 @@ namespace
     }
 }
 
-CSVWidget::DropLineEdit::DropLineEdit(QWidget *parent, CSMWorld::UniversalId::Type type) 
+CSVWidget::DropLineEdit::DropLineEdit(CSMWorld::UniversalId::Type type, QWidget *parent) 
     : QLineEdit(parent),
       mDropType(type)
 {
     setAcceptDrops(true);
 }
 
+CSVWidget::DropLineEdit::DropLineEdit(CSMWorld::ColumnBase::Display display, QWidget *parent)
+    : QLineEdit(parent),
+      mDropType(CSMWorld::TableMimeData::convertEnums(display))
+{
+    setAcceptDrops(true);
+}
+
 void CSVWidget::DropLineEdit::dragEnterEvent(QDragEnterEvent *event)
 {
     if (canAcceptEventData(event))
diff --git a/apps/opencs/view/widget/droplineedit.hpp b/apps/opencs/view/widget/droplineedit.hpp
index e49c947b4..7ba0513cc 100644
--- a/apps/opencs/view/widget/droplineedit.hpp
+++ b/apps/opencs/view/widget/droplineedit.hpp
@@ -3,6 +3,7 @@
 
 #include <QLineEdit>
 
+#include "../../model/world/columnbase.hpp"
 #include "../../model/world/universalid.hpp"
 
 namespace CSMDoc
@@ -33,8 +34,8 @@ namespace CSVWidget
             ///< \return -1 if there is no suitable data (ID type)
 
         public:
-            DropLineEdit(QWidget *parent = 0,
-                         CSMWorld::UniversalId::Type type = CSMWorld::UniversalId::Type_None);
+            DropLineEdit(CSMWorld::UniversalId::Type type, QWidget *parent = 0);
+            DropLineEdit(CSMWorld::ColumnBase::Display display, QWidget *parent = 0);
 
         protected:
             void dragEnterEvent(QDragEnterEvent *event);
diff --git a/apps/opencs/view/world/idcompletiondelegate.cpp b/apps/opencs/view/world/idcompletiondelegate.cpp
index 5c92e6576..970490828 100644
--- a/apps/opencs/view/world/idcompletiondelegate.cpp
+++ b/apps/opencs/view/world/idcompletiondelegate.cpp
@@ -28,7 +28,7 @@ QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
     }
 
     CSMWorld::IdCompletionManager &completionManager = getDocument().getIdCompletionManager();
-    CSVWidget::DropLineEdit *editor = new CSVWidget::DropLineEdit(parent);
+    CSVWidget::DropLineEdit *editor = new CSVWidget::DropLineEdit(display, parent);
     editor->setCompleter(completionManager.getCompleter(display).get());
     return editor;
 }
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 684327fc2..d3969dad4 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -253,7 +253,7 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
         case CSMWorld::ColumnBase::Display_Video:
         case CSMWorld::ColumnBase::Display_GlobalVariable:
 
-            return new CSVWidget::DropLineEdit(parent);
+            return new CSVWidget::DropLineEdit(CSMWorld::UniversalId::Type_None, parent);
 
         case CSMWorld::ColumnBase::Display_ScriptLines: