[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kicker/kicker
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-10-05 0:21:39
Message-ID: 1128471699.223234.23330.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 467350 by aseigo:

--kurldrag


 M  +1 -1      buttons/nonkdeappbutton.cpp  
 M  +5 -6      core/containerarea.cpp  


--- trunk/KDE/kdebase/kicker/kicker/buttons/nonkdeappbutton.cpp #467349:467350
@@ -168,7 +168,7 @@
     KURL::List fileList = KURL::List::fromMimeData(ev->mimeData());
     QString execStr;
 
-    // according to KURLDrag, we've successfully retrieved
+    // according to KURL, we've successfully retrieved
     // one or more URLs! now we iterate over them one by
     // one ....
     for (KURL::List::ConstIterator it = fileList.begin();
--- trunk/KDE/kdebase/kicker/kicker/core/containerarea.cpp #467349:467350
@@ -60,7 +60,6 @@
 #include <klocale.h>
 #include <kio/netaccess.h>
 #include <kservice.h>
-#include <kurldrag.h>
 #include <kmenu.h>
 #include <kauthorized.h>
 
@@ -999,7 +998,7 @@
     bool canAccept = !isImmutable() &&
                      (PanelDrag::canDecode(ev) ||
                       AppletInfoDrag::canDecode(ev) ||
-                      KURLDrag::canDecode(ev));
+                      KURL::List::canDecode(ev->mimeData()));
     ev->accept(canAccept);
 
     if (!canAccept)
@@ -1207,8 +1206,7 @@
     }
 
     // ok, let's try a KURL drag
-    KURL::List uriList;
-    if (!KURLDrag::decode(ev, uriList))
+    if (!KURL::List::canDecode(ev->mimeData()))
     {
         _dragMoveAC = 0;
         _dragIndicator->hide();
@@ -1218,8 +1216,9 @@
 
     Kicker::self()->setInsertionPoint(_dragIndicator->pos());
 
-    KURL::List::ConstIterator it(uriList.begin());
-    for (; it != uriList.end(); ++it)
+    KURL::List uriList = KURL::List::fromMimeData(ev->mimeData());
+    KURL::List::const_iterator it(uriList.begin());
+    for (; it != uriList.constEnd(); ++it)
     {
         const KURL &url = *it;
 
[prev in list] [next in list] [prev in thread] [next in thread]