[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:12:26 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=72cf3fb
The following commit has been merged in the master branch:
commit 72cf3fbeacd6bd2bf2e5cd1641881ad2c20c22f2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Mon Feb 11 02:58:14 2013 +0000
Use ContactsModel from k-c-i
---
CMakeLists.txt | 1 -
contact-list-widget.cpp | 16 ++++++----------
contact-list-widget.h | 1 -
contact-list-widget_p.h | 6 ++----
contacts-model.cpp | 8 ++++----
contacts-model.h | 48 ------------------------------------------------
context-menu.cpp | 3 ++-
7 files changed, 14 insertions(+), 69 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7df2017..9712de2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ set (ktp_contactlist_SRCS
contact-delegate-overlay.cpp
contact-delegate.cpp
contact-delegate-compact.cpp
- contacts-model.cpp
account-button.cpp
account-buttons-panel.cpp
filter-bar.cpp
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index a2b9556..23aee97 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -27,11 +27,8 @@
#include <KTp/types.h>
-#include <KTp/Models/contacts-list-model.h>
-#include <KTp/Models/contacts-filter-model.h>
-#include <KTp/Models/accounts-tree-proxy-model.h>
-#include <KTp/Models/groups-tree-proxy-model.h>
-
+#include <KTp/Models/contacts-model.h>
+#include <KTp/global-contact-manager.h>
#include <KTp/actions.h>
#include <KTp/contact.h>
@@ -74,11 +71,10 @@ ContactListWidget::ContactListWidget(QWidget *parent)
d->delegate = new ContactDelegate(this);
d->compactDelegate = new ContactDelegateCompact(ContactDelegateCompact::Normal, this);
- d->modelFilter = new ContactsModel2(this);
+ d->modelFilter = new KTp::ContactsModel(this);
d->modelFilter->setDynamicSortFilter(true);
d->modelFilter->setSortRole(Qt::DisplayRole);
-
setModel(d->modelFilter);
setSortingEnabled(true);
@@ -294,9 +290,9 @@ void ContactListWidget::toggleGroups(bool show)
if (show) {
- d->modelFilter->setGroupMode(ContactsModel2::GroupGrouping);
+ d->modelFilter->setGroupMode(KTp::ContactsModel::GroupGrouping);
} else {
- d->modelFilter->setGroupMode(ContactsModel2::AccountGrouping);
+ d->modelFilter->setGroupMode(KTp::ContactsModel::AccountGrouping);
}
for (int i = 0; i < d->modelFilter->rowCount(); i++) {
@@ -542,7 +538,7 @@ void ContactListWidget::mousePressEvent(QMouseEvent *event)
d->dragSourceGroup.clear();
// no drag when grouping by accounts
- if (d->modelFilter->groupMode() == ContactsModel2::AccountGrouping) {
+ if (d->modelFilter->groupMode() == KTp::ContactsModel::AccountGrouping) {
return;
}
diff --git a/contact-list-widget.h b/contact-list-widget.h
index 9a58094..ab2191c 100644
--- a/contact-list-widget.h
+++ b/contact-list-widget.h
@@ -24,7 +24,6 @@
#include <TelepathyQt/Types>
#include <TelepathyQt/Connection>
-class ContactsModel;
class ContactListWidgetPrivate;
namespace Tp {
diff --git a/contact-list-widget_p.h b/contact-list-widget_p.h
index ecb70ec..a34ed14 100644
--- a/contact-list-widget_p.h
+++ b/contact-list-widget_p.h
@@ -23,11 +23,9 @@
#include <TelepathyQt/Types>
namespace KTp {
- class ContactsListModel;
+ class ContactsModel;
}
-class ContactsModel2;
-class AccountsFilterModel;
class ContactDelegate;
class ContactDelegateCompact;
@@ -40,7 +38,7 @@ public:
shouldDrag(false),
showOffline(false) {}
- ContactsModel2 *modelFilter;
+ KTp::ContactsModel *modelFilter;
ContactDelegate *delegate;
ContactDelegateCompact *compactDelegate;
QRect dropIndicatorRect;
diff --git a/contacts-model.cpp b/contacts-model.cpp
index db4138b..d44c9aa 100644
--- a/contacts-model.cpp
+++ b/contacts-model.cpp
@@ -3,7 +3,7 @@
#include <KTp/Models/accounts-tree-proxy-model.h>
#include <KTp/Models/groups-tree-proxy-model.h>
-ContactsModel2::ContactsModel2(QObject *parent)
+KTp::ContactsModel::KTp::ContactsModel(QObject *parent)
: KTp::ContactsFilterModel(parent),
m_groupMode(NoGrouping),
m_source(new KTp::ContactsListModel(this))
@@ -11,7 +11,7 @@ ContactsModel2::ContactsModel2(QObject *parent)
}
-void ContactsModel2::setAccountManager(const Tp::AccountManagerPtr &accountManager)
+void KTp::ContactsModel::setAccountManager(const Tp::AccountManagerPtr &accountManager)
{
m_accountManager = accountManager;
@@ -19,7 +19,7 @@ void ContactsModel2::setAccountManager(const Tp::AccountManagerPtr &accountManag
m_source->setAccountManager(accountManager);
}
-void ContactsModel2::setGroupMode(ContactsModel2::GroupMode mode)
+void KTp::ContactsModel::setGroupMode(KTp::ContactsModel::GroupMode mode)
{
m_groupMode = mode;
@@ -47,7 +47,7 @@ void ContactsModel2::setGroupMode(ContactsModel2::GroupMode mode)
}
}
-ContactsModel2::GroupMode ContactsModel2::groupMode() const
+KTp::ContactsModel::GroupMode KTp::ContactsModel::groupMode() const
{
return m_groupMode;
}
diff --git a/contacts-model.h b/contacts-model.h
index be11bfb..e69de29 100644
--- a/contacts-model.h
+++ b/contacts-model.h
@@ -1,48 +0,0 @@
-/*
- * Model of all accounts with inbuilt grouping and filtering
- *
- * Copyright (C) 2011 David Edmundson <kde at davidedmundson.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef CONTACTSMODEL2_H
-#define CONTACTSMODEL2_H
-
-#include <KTp/Models/contacts-filter-model.h>
-#include <KTp/Models/contacts-list-model.h>
-#include <KTp/Models/abstract-grouping-proxy-model.h>
-
-#include <TelepathyQt/Types>
-
-class ContactsModel2 : public KTp::ContactsFilterModel
-{
-public:
- enum GroupMode {NoGrouping, AccountGrouping, GroupGrouping};
-
- ContactsModel2(QObject *parent);
- void setAccountManager (const Tp::AccountManagerPtr &accountManager);
-
- void setGroupMode(GroupMode mode);
- GroupMode groupMode() const;
-
-private:
- GroupMode m_groupMode;
- QWeakPointer<KTp::AbstractGroupingProxyModel> m_proxy;
- KTp::ContactsListModel *m_source;
- Tp::AccountManagerPtr m_accountManager;
-};
-
-#endif // CONTACTSMODEL_H
diff --git a/context-menu.cpp b/context-menu.cpp
index 877641f..1f9babf 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -34,6 +34,7 @@
#include <KTp/Widgets/notificationconfigdialog.h>
#include <KTp/contact-info-dialog.h>
#include <KTp/types.h>
+#include <KTp/Models/contacts-model.h>
#include <TelepathyQt/ContactManager>
#include <TelepathyQt/Account>
@@ -196,7 +197,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
menu->addSeparator();
- if (m_mainWidget->d_ptr->modelFilter->groupMode() == ContactsModel2::GroupGrouping) {
+ if (m_mainWidget->d_ptr->modelFilter->groupMode() == KTp::ContactsModel::GroupGrouping) {
// remove contact from group action, must be QAction because menu->addAction returns QAction
QAction *groupRemoveAction = menu->addAction(KIcon(), i18n("Remove Contact From This Group"));
connect(groupRemoveAction, SIGNAL(triggered(bool)), this, SLOT(onRemoveContactFromGroupTriggered()));
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list