From 00140162c2d92a7da38be0370a332955dedfee63 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 4 Feb 2012 15:39:59 +0000
Subject: fixed drag-and-drop handler

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2581 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Ui/skinned/listwidget.cpp | 14 +++++---------
 src/plugins/Ui/skinned/listwidget.h   |  1 -
 src/qmmpui/playlistmodel.cpp          |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index 6f075c72e..cdbcf272f 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -436,20 +436,16 @@ void ListWidget::dropEvent(QDropEvent *event)
         event->acceptProposedAction();
         QApplication::restoreOverrideCursor();
 
-        foreach(QUrl u,list_urls)
+        foreach(QUrl u, list_urls)
         {
-            QString add_string = u.toString(QUrl::RemoveScheme);
-            if (!add_string.isEmpty())
-                processFileInfo(QFileInfo(add_string));
+            if(u.scheme() == "file")
+                m_model->add(QFileInfo(u.toLocalFile()).absoluteFilePath());
+            else
+                m_model->add(u.toString());
         }
     }
 }
 
-void ListWidget::processFileInfo(const QFileInfo& info)
-{
-    m_model->add(info.absoluteFilePath());
-}
-
 const QString ListWidget::getExtraString(int i)
 {
     QString extra_string;
diff --git a/src/plugins/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h
index c7e9a8a1e..de3bf414a 100644
--- a/src/plugins/Ui/skinned/listwidget.h
+++ b/src/plugins/Ui/skinned/listwidget.h
@@ -121,7 +121,6 @@ private slots:
 
 private:
     void loadColors();
-    void processFileInfo(const QFileInfo&);
     bool m_update;
     bool m_scroll;
     int m_pressed_row;
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 8953b33e8..f1226d2e2 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -819,7 +819,7 @@ void PlayListModel::loadPlaylist(const QString &f_name)
     PlaylistFormat* prs = PlaylistParser::instance()->findByPath(f_name);
     if(!prs)
     {
-        qWarning("PlayListModel: unsupported playlist format");
+        //qWarning("PlayListModel: unsupported playlist format");
         return;
     }
 
-- 
cgit v1.2.3-13-gbd6f