[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:04:45 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=02cf20d
The following commit has been merged in the master branch:
commit 02cf20db843d65b149765581a5d3ca26a9c851da
Author: Dominik Cermak <d.cermak at arcor.de>
Date: Sun Dec 25 20:13:48 2011 +0100
Remove all drag and drop code
This code is now in contact-list.
---
KTp/Models/accounts-model.cpp | 34 +---------------
KTp/Models/accounts-model.h | 3 --
KTp/Models/groups-model.cpp | 90 +------------------------------------------
KTp/Models/groups-model.h | 5 ---
4 files changed, 2 insertions(+), 130 deletions(-)
diff --git a/KTp/Models/accounts-model.cpp b/KTp/Models/accounts-model.cpp
index c2a78c3..d348f4c 100644
--- a/KTp/Models/accounts-model.cpp
+++ b/KTp/Models/accounts-model.cpp
@@ -255,12 +255,7 @@ Tp::AccountPtr AccountsModel::accountPtrForPath(const QString& accountPath) cons
Qt::ItemFlags AccountsModel::flags(const QModelIndex &index) const
{
if (index.isValid()) {
- bool isContact = index.data(AccountsModel::ItemRole).userType() == qMetaTypeId<ContactModelItem*>();
- if (isContact) {
- return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
- } else {
- return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
- }
+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
}
return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
@@ -310,31 +305,4 @@ QModelIndex AccountsModel::parent(const QModelIndex &index) const
}
}
-QStringList AccountsModel::mimeTypes() const
-{
- QStringList types;
- types << QLatin1String("application/vnd.telepathy.contact");
- return types;
-}
-
-QMimeData* AccountsModel::mimeData(const QModelIndexList& indexes) const
-{
- QMimeData *mimeData = new QMimeData();
- QByteArray encodedData;
-
- QDataStream stream(&encodedData, QIODevice::WriteOnly);
-
- Q_FOREACH (const QModelIndex &index, indexes) {
- if (index.isValid()) {
- ContactModelItem *c = data(index, AccountsModel::ItemRole).value<ContactModelItem*>();
- //We put a contact ID and its account ID to the stream, so we can later recreate the contact using AccountsModel
- stream << c->contact().data()->id() << accountForContactItem(c).data()->objectPath();
- }
- }
-
- mimeData->setData(QLatin1String("application/vnd.telepathy.contact"), encodedData);
- return mimeData;
-}
-
-
#include "accounts-model.moc"
diff --git a/KTp/Models/accounts-model.h b/KTp/Models/accounts-model.h
index 21c68af..0eb3504 100644
--- a/KTp/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -111,9 +111,6 @@ public:
virtual QModelIndex index(TreeNode *node) const;
virtual QModelIndex parent(const QModelIndex &index) const;
- virtual QStringList mimeTypes() const;
- virtual QMimeData* mimeData(const QModelIndexList &indexes) const;
-
int accountCount() const;
Q_INVOKABLE QObject *accountItemForId(const QString &id) const;
Q_INVOKABLE QObject *contactItemForId(const QString &accountId, const QString &contactId) const;
diff --git a/KTp/Models/groups-model.cpp b/KTp/Models/groups-model.cpp
index 243fb45..9b7c6e1 100644
--- a/KTp/Models/groups-model.cpp
+++ b/KTp/Models/groups-model.cpp
@@ -115,100 +115,12 @@ QVariant GroupsModel::data(const QModelIndex &index, int role) const
Qt::ItemFlags GroupsModel::flags(const QModelIndex &index) const
{
if (index.isValid()) {
- bool isGroup = index.data(AccountsModel::ItemRole).userType() == qMetaTypeId<GroupsModelItem*>();
- if (isGroup) {
- return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
- } else {
- return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
- }
+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
}
return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
}
-Qt::DropActions GroupsModel::supportedDropActions() const
-{
- return Qt::CopyAction | Qt::MoveAction;
-}
-
-QStringList GroupsModel::mimeTypes() const
-{
- QStringList types;
- types << QLatin1String("application/vnd.telepathy.contact");
- return types;
-}
-
-QMimeData* GroupsModel::mimeData(const QModelIndexList& indexes) const
-{
- QMimeData *mimeData = new QMimeData();
- QByteArray encodedData;
-
- QDataStream stream(&encodedData, QIODevice::WriteOnly);
-
- Q_FOREACH (const QModelIndex &index, indexes) {
- if (index.isValid()) {
- ContactModelItem *c = data(index, AccountsModel::ItemRole).value<ContactModelItem*>();
- //We put a contact ID and its account ID to the stream, so we can later recreate the contact using AccountsModel
- stream << c->contact().data()->id() << mPriv->mAM->accountForContactItem(c).data()->objectPath();
- }
- }
-
- mimeData->setData(QLatin1String("application/vnd.telepathy.contact"), encodedData);
- return mimeData;
-}
-
-bool GroupsModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
-{
- Q_UNUSED(row);
-
- if (action == Qt::IgnoreAction) {
- return true;
- }
-
- if (!data->hasFormat(QLatin1String("application/vnd.telepathy.contact"))) {
- return false;
- }
-
- if (column > 0) {
- return false;
- }
-
- QByteArray encodedData = data->data(QLatin1String("application/vnd.telepathy.contact"));
- QDataStream stream(&encodedData, QIODevice::ReadOnly);
- QList<ContactModelItem*> contacts;
-
- while (!stream.atEnd()) {
- QString contact;
- QString account;
-
- //get contact and account out of the stream
- stream >> contact >> account;
-
- Tp::AccountPtr accountPtr = mPriv->mAM->accountPtrForPath(account);
-
- //casted pointer is checked below, before first use
- contacts.append(qobject_cast<ContactModelItem*>(mPriv->mAM->contactItemForId(accountPtr->uniqueIdentifier(), contact)));
- }
-
- Q_FOREACH (ContactModelItem *contact, contacts) {
- Q_ASSERT(contact);
- QString group = parent.data(GroupsModel::GroupNameRole).toString();
-
- kDebug() << contact->contact().data()->alias() << "added to group" << group;
-
- if (group != mPriv->m_ungroupedString) {
- //FIXME: Should we connect this somewhere?
- Tp::PendingOperation *op = contact->contact().data()->manager().data()->addContactsToGroup(group,
- QList<Tp::ContactPtr>() << contact->contact());
-
- connect(op, SIGNAL(finished(Tp::PendingOperation*)),
- this, SIGNAL(operationFinished(Tp::PendingOperation*)));
- }
- }
-
- return true;
-}
-
bool GroupsModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (index.isValid()) {
diff --git a/KTp/Models/groups-model.h b/KTp/Models/groups-model.h
index 8f6d497..8a43764 100644
--- a/KTp/Models/groups-model.h
+++ b/KTp/Models/groups-model.h
@@ -59,7 +59,6 @@ public:
virtual QVariant data(const QModelIndex &index, int role) const;
virtual Qt::ItemFlags flags(const QModelIndex &index) const;
- virtual Qt::DropActions supportedDropActions() const;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
virtual QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
virtual QModelIndex index(TreeNode *node) const;
@@ -72,10 +71,6 @@ public:
void removeContactFromGroup(ProxyTreeNode* proxyNode, const QString& group);
- virtual QStringList mimeTypes() const;
- virtual QMimeData* mimeData(const QModelIndexList &indexes) const;
- virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
-
Q_SIGNALS:
//a signal for reemitting the operation status, used for displaying errors in GUI
void operationFinished(Tp::PendingOperation *op);
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list