Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit b22068c8 authored by Volker Krause's avatar Volker Krause

Stop generating vCal drag data here too

Together with a similar fix in calendarsupport, this fixes event DnD from
KOrganizer into KMail.
parent fddc0e67
......@@ -148,7 +148,6 @@ QMimeData *DndFactory::createMimeData()
QMimeData *mimeData = new QMimeData;
ICalDrag::populateMimeData(mimeData, d->mCalendar);
VCalDrag::populateMimeData(mimeData, d->mCalendar);
return mimeData;
}
......@@ -172,7 +171,6 @@ QMimeData *DndFactory::createMimeData(const Incidence::Ptr &incidence)
QMimeData *mimeData = new QMimeData;
ICalDrag::populateMimeData(mimeData, cal);
VCalDrag::populateMimeData(mimeData, cal);
QUrl uri = i->uri();
if (uri.isValid()) {
......@@ -309,7 +307,6 @@ bool DndFactory::copyIncidences(const Incidence::List &incidences)
QMimeData *mimeData = new QMimeData;
ICalDrag::populateMimeData(mimeData, calendar);
VCalDrag::populateMimeData(mimeData, calendar);
if (calendar->incidences().isEmpty()) {
return false;
......
......@@ -35,16 +35,6 @@ QString VCalDrag::mimeType()
return QStringLiteral("text/x-vCalendar");
}
bool VCalDrag::populateMimeData(QMimeData *e, const MemoryCalendar::Ptr &cal)
{
VCalFormat format;
QString calstr(format.toString(cal));
if (e && !calstr.isEmpty()) {
e->setData(mimeType(), calstr.toUtf8());
}
return canDecode(e);
}
bool VCalDrag::canDecode(const QMimeData *me)
{
if (me) {
......
......@@ -37,11 +37,6 @@ namespace VCalDrag {
*/
KCALUTILS_EXPORT QString mimeType();
/**
Sets the vCalendar representation as data of the drag object
*/
KCALUTILS_EXPORT bool populateMimeData(QMimeData *e, const KCalCore::MemoryCalendar::Ptr &cal);
/**
Return, if drag&drop object can be decode to vCalendar.
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment