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

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdenetwork/knode
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-05-14 21:26:23
[Download RAW message or body]

CVS commit by waba: 

Unbreak DND


  M +10 -11    kncomposer.cpp   1.142.2.3
  M +2 -2      kncomposer.h   1.43.2.1


--- kdenetwork/knode/kncomposer.cpp  #1.142.2.2:1.142.2.3
@@ -18,5 +18,4 @@
 #include <qtextcodec.h>
 #include <qclipboard.h>
-#include <qdragobject.h>
 #include <qapplication.h>
 
@@ -39,4 +38,5 @@
 #include <kprocess.h>
 #include <kqcstringsplitter.h>
+#include <kurldrag.h>
 
 #include "kngroupselectdialog.h"
@@ -1370,5 +1370,5 @@ void KNComposer::slotDragEnterEvent(QDra
 {
   QStringList files;
-  ev->accept(QUriDrag::canDecode(ev));
+  ev->accept(KURLDrag::canDecode(ev));
 }
 
@@ -1376,12 +1376,11 @@ void KNComposer::slotDragEnterEvent(QDra
 void KNComposer::slotDropEvent(QDropEvent *ev)
 {
-  QStrList urls;
-  char *s;
+  KURL::List urls;
 
-  if (!QUriDrag::decode(ev, urls))
+  if (!KURLDrag::decode(ev, urls))
     return;
 
-  for (s = urls.first(); s != 0; s=urls.next()) {
-    KURL url(s);
+  for (KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it) {
+    const KURL &url = *it;
     KNLoadHelper *helper = new KNLoadHelper(this);
 
@@ -1831,7 +1830,7 @@ void KNComposer::Editor::slotRot13()
 
 
-void KNComposer::Editor::dragEnterEvent(QDragEnterEvent *ev)
+void KNComposer::Editor::contentsDragEnterEvent(QDragEnterEvent *ev)
 {
-  if (QUriDrag::canDecode(ev))
+  if (KURLDrag::canDecode(ev))
     emit(sigDragEnterEvent(ev));
   else
@@ -1840,7 +1839,7 @@ void KNComposer::Editor::dragEnterEvent(
 
 
-void KNComposer::Editor::dropEvent(QDropEvent *ev)
+void KNComposer::Editor::contentsDropEvent(QDropEvent *ev)
 {
-  if (QUriDrag::canDecode(ev))
+  if (KURLDrag::canDecode(ev))
     emit(sigDropEvent(ev));
   else

--- kdenetwork/knode/kncomposer.h  #1.43:1.43.2.1
@@ -241,6 +241,6 @@ class KNComposer::Editor : public KEdit 
 
     // DND handling
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void contentsDragEnterEvent(QDragEnterEvent *);
+    virtual void contentsDropEvent(QDropEvent *);
 
 };


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