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

List:       kde-commits
Subject:    [calligra/kexi-frameworks7-staniek] kexi/core: KexiDragObjects: update for Qt5 API
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2015-06-30 20:24:27
Message-ID: E1ZA24x-0006Ps-JS () scm ! kde ! org
[Download RAW message or body]

Git commit ed91e5ff6873c0aa93fe46e75e323e41a6792fc2 by Jaroslaw Staniek.
Committed on 30/06/2015 at 20:16.
Pushed by staniek into branch 'kexi-frameworks7-staniek'.

KexiDragObjects: update for Qt5 API

M  +6    -5    kexi/core/kexidragobjects.cpp
M  +1    -1    kexi/core/kexidragobjects.h

http://commits.kde.org/calligra/ed91e5ff6873c0aa93fe46e75e323e41a6792fc2

diff --git a/kexi/core/kexidragobjects.cpp b/kexi/core/kexidragobjects.cpp
index ab5d964..58918cd 100644
--- a/kexi/core/kexidragobjects.cpp
+++ b/kexi/core/kexidragobjects.cpp
@@ -23,12 +23,13 @@
 #include <QDataStream>
 #include <QStringList>
 #include <QDragMoveEvent>
-#include <QDropEvent>
+#include <QDomDocument>
+#include <QMimeData>
 #include <QDebug>
 =

-bool KexiFieldDrag::canDecode(QMimeSource *e)
+bool KexiFieldDrag::canDecode(QDropEvent *e)
 {
-    return e->provides("kexi/fields");
+    return e->mimeData()->hasFormat("kexi/fields");
 }
 =

 bool KexiFieldDrag::decode(QDropEvent* e, QString *sourceMimeType,
@@ -38,7 +39,7 @@ bool KexiFieldDrag::decode(QDropEvent* e, QString *source=
MimeType,
     Q_ASSERT(sourceName);
     Q_ASSERT(fields);
 =

-    QByteArray payload(e->encodedData("kexi/fields"));
+    QByteArray payload(e->mimeData()->data("kexi/fields"));
     if (payload.isEmpty()) {//try single
         return false;
     }
@@ -73,7 +74,7 @@ KexiDataProviderDrag::~KexiDataProviderDrag()
 =

 bool KexiDataProviderDrag::canDecode(QDragMoveEvent *e)
 {
-    return e->provides("kexi/dataprovider");
+    return e->mimeData()->hasFormat("kexi/dataprovider");
 }
 =

 bool KexiDataProviderDrag::decode(QDropEvent* e, QString* sourceMimeType, =
QString *sourceName)
diff --git a/kexi/core/kexidragobjects.h b/kexi/core/kexidragobjects.h
index 9c42f19..6c5ca9e 100644
--- a/kexi/core/kexidragobjects.h
+++ b/kexi/core/kexidragobjects.h
@@ -38,7 +38,7 @@ public:
      can be decoded as "kexi/fields" data. If decoding of "kexi/field"
      type is supported, decoding of "kexi/fields" is always supported.
      */
-    static bool canDecode(QMimeSource* e);
+    static bool canDecode(QDropEvent* e);
 =

     /*! Decodes data of multiple-field drag ("kexi/fields" mime type) comi=
ng with event \a e.
      Sets \a sourceMimeType, \a sourceName and \a fields. Also works with =
"kexi/field" data.

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