[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:06:14 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=580dcad
The following commit has been merged in the master branch:
commit 580dcad6d72f8cd90512fd424cb3cc1b9230f2d4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Tue Jan 15 19:40:06 2013 +0000
Port ContactGridWidget/Dialog to new models
REVIEW: 108426
---
KTp/Widgets/contact-grid-dialog.cpp | 18 +++++++++---------
KTp/Widgets/contact-grid-dialog.h | 4 ++--
KTp/Widgets/contact-grid-widget.cpp | 28 ++++++++++++----------------
KTp/Widgets/contact-grid-widget.h | 9 +++++----
4 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/KTp/Widgets/contact-grid-dialog.cpp b/KTp/Widgets/contact-grid-dialog.cpp
index 53f8cc1..a23014a 100644
--- a/KTp/Widgets/contact-grid-dialog.cpp
+++ b/KTp/Widgets/contact-grid-dialog.cpp
@@ -32,8 +32,8 @@
#include <TelepathyQt/PendingReady>
#include <KTp/debug.h>
-#include <KTp/Models/contacts-model.h>
-#include <KTp/Models/accounts-filter-model.h>
+#include <KTp/Models/contacts-list-model.h>
+#include <KTp/Models/contacts-filter-model.h>
#include <KTp/Widgets/contact-grid-widget.h>
#include <telepathy-qt4/TelepathyQt/PendingChannelRequest>
@@ -44,7 +44,7 @@ class KTp::ContactGridDialog::Private
public:
Private(KTp::ContactGridDialog *parent) :
q(parent),
- accountsModel(0),
+ contactsModel(0),
account(0),
contact(0)
{
@@ -53,7 +53,7 @@ public:
KTp::ContactGridDialog * const q;
Tp::AccountManagerPtr accountManager;
- ContactsModel *accountsModel;
+ KTp::ContactsListModel *contactsModel;
KTp::ContactGridWidget *contactGridWidget;
Tp::AccountPtr account;
Tp::ContactPtr contact;
@@ -68,7 +68,7 @@ public Q_SLOTS:
void KTp::ContactGridDialog::Private::_k_onAccountManagerReady()
{
kDebug() << "Account manager is ready";
- accountsModel->setAccountManager(accountManager);
+ contactsModel->setAccountManager(accountManager);
}
void KTp::ContactGridDialog::Private::_k_onOkClicked()
@@ -131,13 +131,13 @@ KTp::ContactGridDialog::ContactGridDialog(QWidget *parent) :
channelFactory,
contactFactory);
- d->accountsModel = new ContactsModel(this);
+ d->contactsModel = new KTp::ContactsListModel(this);
connect(d->accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(_k_onAccountManagerReady()));
- d->contactGridWidget = new KTp::ContactGridWidget(d->accountsModel, this);
+ d->contactGridWidget = new KTp::ContactGridWidget(d->contactsModel, this);
d->contactGridWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
- d->contactGridWidget->filter()->setPresenceTypeFilterFlags(AccountsFilterModel::ShowOnlyConnected);
+ d->contactGridWidget->filter()->setPresenceTypeFilterFlags(KTp::ContactsFilterModel::ShowOnlyConnected);
setMainWidget(d->contactGridWidget);
@@ -166,7 +166,7 @@ Tp::ContactPtr KTp::ContactGridDialog::contact()
return d->contact;
}
-AccountsFilterModel* KTp::ContactGridDialog::filter() const
+KTp::ContactsFilterModel* KTp::ContactGridDialog::filter() const
{
return d->contactGridWidget->filter();
}
diff --git a/KTp/Widgets/contact-grid-dialog.h b/KTp/Widgets/contact-grid-dialog.h
index 5948291..d9d3712 100644
--- a/KTp/Widgets/contact-grid-dialog.h
+++ b/KTp/Widgets/contact-grid-dialog.h
@@ -37,9 +37,9 @@ class PendingOperation;
class ContactsModel;
class QTcpSocket;
-class AccountsFilterModel;
namespace KTp {
class ContactGridWidget;
+class ContactsFilterModel;
class KTP_EXPORT ContactGridDialog : public KDialog
{
@@ -50,7 +50,7 @@ public:
ContactGridDialog(QWidget *parent);
virtual ~ContactGridDialog();
- virtual AccountsFilterModel* filter() const;
+ virtual KTp::ContactsFilterModel* filter() const;
virtual Tp::AccountPtr account();
virtual Tp::ContactPtr contact();
diff --git a/KTp/Widgets/contact-grid-widget.cpp b/KTp/Widgets/contact-grid-widget.cpp
index 73be2ce..b19c423 100644
--- a/KTp/Widgets/contact-grid-widget.cpp
+++ b/KTp/Widgets/contact-grid-widget.cpp
@@ -30,10 +30,9 @@
#include <QtGui/QVBoxLayout>
#include <QtGui/QListView>
+#include <KTp/Models/contacts-list-model.h>
#include <KTp/Models/contacts-model.h>
-#include <KTp/Models/accounts-filter-model.h>
-#include <KTp/Models/contact-model-item.h>
-#include <KTp/Models/flat-model-proxy.h>
+#include <KTp/Models/contacts-filter-model.h>
namespace KTp {
@@ -129,9 +128,8 @@ public:
layout(new QVBoxLayout(parent)),
contactGridView(new QListView(parent)),
contactFilterLineEdit(new KLineEdit(parent)),
- accountsModel(0),
- filterModel(0),
- flatProxyModel(0)
+ contactsModel(0),
+ filterModel(0)
{
}
@@ -145,9 +143,8 @@ public:
QVBoxLayout *layout;
QListView *contactGridView;
KLineEdit *contactFilterLineEdit;
- ContactsModel *accountsModel;
- AccountsFilterModel *filterModel;
- FlatModelProxy *flatProxyModel;
+ KTp::ContactsListModel *contactsModel;
+ KTp::ContactsFilterModel *filterModel;
};
void KTp::ContactGridWidget::Private::_k_onSelectionChanged(QItemSelection newSelection, QItemSelection oldSelection)
@@ -165,15 +162,14 @@ void KTp::ContactGridWidget::Private::_k_onSelectionChanged(QItemSelection newSe
// -----------------------------------------------------------------------------
-KTp::ContactGridWidget::ContactGridWidget(ContactsModel* model, QWidget *parent)
+KTp::ContactGridWidget::ContactGridWidget(KTp::ContactsListModel* model, QWidget *parent)
: QWidget(parent),
d(new Private(this))
{
- d->filterModel = new AccountsFilterModel(this);
- d->flatProxyModel = new FlatModelProxy(d->filterModel);
+ d->filterModel = new KTp::ContactsFilterModel(this);
- d->accountsModel = model;
- d->filterModel->setSourceModel(d->accountsModel);
+ d->contactsModel = model;
+ d->filterModel->setSourceModel(d->contactsModel);
d->contactGridView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
d->contactGridView->setResizeMode(QListView::Adjust);
@@ -189,7 +185,7 @@ KTp::ContactGridWidget::ContactGridWidget(ContactsModel* model, QWidget *parent)
d->layout->addWidget(d->contactFilterLineEdit);
setLayout(d->layout);
- d->contactGridView->setModel(d->flatProxyModel);
+ d->contactGridView->setModel(d->filterModel);
d->contactGridView->setItemDelegate(new ContactGridDelegate(d->contactGridView));
connect(d->contactGridView->selectionModel(),
@@ -254,7 +250,7 @@ Tp::ContactPtr KTp::ContactGridWidget::selectedContact() const
return d->contactGridView->currentIndex().data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
}
-AccountsFilterModel* KTp::ContactGridWidget::filter() const
+KTp::ContactsFilterModel* KTp::ContactGridWidget::filter() const
{
return d->filterModel;
}
diff --git a/KTp/Widgets/contact-grid-widget.h b/KTp/Widgets/contact-grid-widget.h
index 178f1de..d6b5468 100644
--- a/KTp/Widgets/contact-grid-widget.h
+++ b/KTp/Widgets/contact-grid-widget.h
@@ -27,10 +27,11 @@
#include <KTp/ktp-export.h>
class KLineEdit;
-class ContactsModel;
-class AccountsFilterModel;
+
namespace KTp
{
+class ContactsFilterModel;
+class ContactsListModel;
class KTP_EXPORT ContactGridWidget : public QWidget
{
@@ -47,7 +48,7 @@ class KTP_EXPORT ContactGridWidget : public QWidget
WRITE setIconSize
NOTIFY iconSizeChanged)
public:
- explicit ContactGridWidget(ContactsModel *model, QWidget *parent = 0);
+ explicit ContactGridWidget(ContactsListModel *model, QWidget *parent = 0);
virtual ~ContactGridWidget();
virtual QString displayNameFilter() const;
@@ -59,7 +60,7 @@ public:
Q_SLOT virtual void setIconSize(const QSize &iconSize);
Q_SIGNAL void iconSizeChanged(const QSize &iconSize);
- virtual AccountsFilterModel* filter() const;
+ virtual KTp::ContactsFilterModel* filter() const;
virtual KLineEdit* contactFilterLineEdit() const;
virtual bool hasSelection() const;
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list