[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:06 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=d632778
The following commit has been merged in the master branch:
commit d6327788070610768f669e4e4153374efc50e0a7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Fri Dec 28 23:58:46 2012 +0000
Move AccountsFilterModel to ContactsFilterModel
The header file for AccountsFilterModel is kept to allow backwards compatiability
---
KTp/Models/CMakeLists.txt | 3 +-
KTp/Models/accounts-filter-model.h | 281 +--------------------
...-filter-model.cpp => contacts-filter-model.cpp} | 134 +++++-----
...unts-filter-model.h => contacts-filter-model.h} | 14 +-
4 files changed, 85 insertions(+), 347 deletions(-)
diff --git a/KTp/Models/CMakeLists.txt b/KTp/Models/CMakeLists.txt
index 8ce94f1..a95e0c1 100644
--- a/KTp/Models/CMakeLists.txt
+++ b/KTp/Models/CMakeLists.txt
@@ -6,11 +6,11 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
set (ktp_models_private_SRCS
abstract-grouping-proxy-model.cpp
accounts-list-model.cpp
- accounts-filter-model.cpp
accounts-tree-proxy-model.cpp
accounts-model-item.cpp #Deprecated
../capabilities-hack-private.cpp #HACK, COPY INTO BOTH LIBRARIES UNTIL ContactModels IS REPLACED
../service-availability-checker.cpp #
+ contacts-filter-model.cpp
contacts-list-model.cpp
contact-model-item.cpp #Deprecated
contacts-model.cpp #Deprecated
@@ -31,6 +31,7 @@ set (ktp_models_private_HDRS
accounts-model-item.h #Deprecated
contact-model-item.h #Deprecated
contacts-model.h #Deprecated
+ contacts-filter-model.h
contacts-list-model.h
groups-model-item.h #Deprecated
groups-model.h #Deprecated
diff --git a/KTp/Models/accounts-filter-model.h b/KTp/Models/accounts-filter-model.h
index a7ba2c7..61e97a2 100644
--- a/KTp/Models/accounts-filter-model.h
+++ b/KTp/Models/accounts-filter-model.h
@@ -1,8 +1,7 @@
/*
- * Provide some filters on the account model
+ * DEPRECATED transitional header file
*
- * Copyright (C) 2011 David Edmundson <kde at davidedmundson.co.uk>
- * Copyright (C) 2012 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
+ * Copyright (C) 2012 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
@@ -22,276 +21,14 @@
#ifndef ACCOUNTSFILTERMODEL_H
#define ACCOUNTSFILTERMODEL_H
-#include <QSortFilterProxyModel>
-
-#include <KTp/ktp-export.h>
-
-class AccountsModelItem;
-class ContactModelItem;
-
-/**
- * rief Class used to sort and filter the contacts.
- */
-class KTP_EXPORT AccountsFilterModel : public QSortFilterProxyModel
-{
- Q_OBJECT
- Q_DISABLE_COPY(AccountsFilterModel)
-
- Q_ENUMS(SortMode
- PresenceFilterFlag
- CapabilityFilterFlag
- SubscriptionStateFilterFlag)
-
- Q_FLAGS(PresenceTypeFilterFlags
- CapabilityFilterFlags
- SubscriptionStateFilterFlags)
-
- Q_PROPERTY(SortMode sortMode
- READ sortMode
- WRITE setSortMode
- NOTIFY sortModeChanged)
-
- Q_PROPERTY(PresenceTypeFilterFlags presenceTypeFilterFlags
- READ presenceTypeFilterFlags
- RESET clearPresenceTypeFilterFlags
- WRITE setPresenceTypeFilterFlags
- NOTIFY presenceTypeFilterFlagsChanged)
-
- Q_PROPERTY(CapabilityFilterFlags capabilityFilterFlags
- READ capabilityFilterFlags
- RESET clearCapabilityFilterFlags
- WRITE setCapabilityFilterFlags
- NOTIFY capabilityFilterFlagsChanged)
-
- // FIXME This resumes Subscription state, Publish state and blocking state, perhaps we should find a better name
- Q_PROPERTY(SubscriptionStateFilterFlags subscriptionStateFilterFlags
- READ subscriptionStateFilterFlags
- RESET clearSubscriptionStateFilterFlags
- WRITE setSubscriptionStateFilterFlags
- NOTIFY subscriptionStateFilterFlagsChanged)
-
- // Filters on all fields
- Q_PROPERTY(QString globalFilterString
- READ globalFilterString
- RESET clearGlobalFilterString
- WRITE setGlobalFilterString
- NOTIFY globalFilterStringChanged)
- Q_PROPERTY(Qt::MatchFlags globalFilterMatchFlags
- READ globalFilterMatchFlags
- RESET resetGlobalFilterMatchFlags
- WRITE setGlobalFilterMatchFlags
- NOTIFY globalFilterMatchFlagsChanged)
-
- Q_PROPERTY(QString displayNameFilterString
- READ displayNameFilterString
- RESET clearDisplayNameFilterString
- WRITE setDisplayNameFilterString
- NOTIFY displayNameFilterStringChanged)
- Q_PROPERTY(QString nicknameFilterString
- READ nicknameFilterString
- RESET clearNicknameFilterString
- WRITE setNicknameFilterString
- NOTIFY nicknameFilterStringChanged)
- Q_PROPERTY(QString aliasFilterString
- READ aliasFilterString
- RESET clearAliasFilterString
- WRITE setAliasFilterString
- NOTIFY aliasFilterStringChanged)
- Q_PROPERTY(QString groupsFilterString
- READ groupsFilterString
- RESET clearGroupsFilterString
- WRITE setGroupsFilterString
- NOTIFY groupsFilterStringChanged)
- Q_PROPERTY(QString idFilterString
- READ idFilterString
- RESET clearIdFilterString
- WRITE setIdFilterString
- NOTIFY idFilterStringChanged)
- Q_PROPERTY(Qt::MatchFlags displayNameFilterMatchFlags
- READ displayNameFilterMatchFlags
- RESET resetDisplayNameFilterMatchFlags
- WRITE setDisplayNameFilterMatchFlags
- NOTIFY displayNameFilterMatchFlagsChanged)
- Q_PROPERTY(Qt::MatchFlags nicknameFilterMatchFlags
- READ nicknameFilterMatchFlags
- RESET resetNicknameFilterMatchFlags
- WRITE setNicknameFilterMatchFlags
- NOTIFY nicknameFilterMatchFlagsChanged)
- Q_PROPERTY(Qt::MatchFlags aliasFilterMatchFlags
- READ aliasFilterMatchFlags
- RESET resetAliasFilterMatchFlags
- WRITE setAliasFilterMatchFlags
- NOTIFY aliasFilterMatchFlagsChanged)
- Q_PROPERTY(Qt::MatchFlags groupsFilterMatchFlags
- READ groupsFilterMatchFlags
- RESET resetGroupsFilterMatchFlags
- WRITE setGroupsFilterMatchFlags
- NOTIFY groupsFilterMatchFlagsChanged)
- Q_PROPERTY(Qt::MatchFlags idFilterMatchFlags
- READ idFilterMatchFlags
- RESET resetIdFilterMatchFlags
- WRITE setIdFilterMatchFlags
- NOTIFY idFilterMatchFlagsChanged)
+#include "contacts-filter-model.h"
+//temporary hack to ensure compatiability for a while
+class AccountsFilterModel : public ContactsFilterModel {
public:
- enum SortMode {
- DoNotSort = 0,
- SortByPresence,
- SortByNickname,
- SortByAlias
- };
-
- enum PresenceTypeFilterFlag {
- DoNotFilterByPresence = 0x0000,
- HidePresenceTypeUnset = 0x0001,
- HidePresenceTypeOffline = 0x0002,
- HidePresenceTypeAvailable = 0x0004,
- HidePresenceTypeAway = 0x0008,
- HidePresenceTypeExtendedAway = 0x0010,
- HidePresenceTypeHidden = 0x0020,
- HidePresenceTypeBusy = 0x0040,
- HidePresenceTypeUnknown = 0x0080,
- HidePresenceTypeError = 0x0100,
- HideAllOffline = HidePresenceTypeUnset |
- HidePresenceTypeOffline |
- HidePresenceTypeUnknown |
- HidePresenceTypeError,
- HideAllOnline = HidePresenceTypeAvailable |
- HidePresenceTypeAway |
- HidePresenceTypeExtendedAway |
- HidePresenceTypeHidden |
- HidePresenceTypeBusy,
- HideAllUnavailable = HideAllOffline |
- HidePresenceTypeAway |
- HidePresenceTypeExtendedAway |
- HidePresenceTypeBusy,
- ShowOnlyConnected = HideAllOffline,
- ShowOnlyDisconnected = HideAllOnline,
- ShowAll = DoNotFilterByPresence
- };
- Q_DECLARE_FLAGS(PresenceTypeFilterFlags, PresenceTypeFilterFlag)
-
- enum CapabilityFilterFlag {
- DoNotFilterByCapability = 0x0000,
- FilterByTextChatCapability = 0x0001,
- FilterByMediaCallCapability = 0x0002,
- FilterByAudioCallCapability = 0x0004,
- FilterByVideoCallCapability = 0x0008,
- FilterByFileTransferCapability = 0x0010,
- FilterByDesktopSharingCapability = 0x0020,
- FilterBySSHContactCapability = 0x0040,
-
- CustomFilterCapability = 0x10000 // a placemark for custom capabilities in inherited classes
- };
- Q_DECLARE_FLAGS(CapabilityFilterFlags, CapabilityFilterFlag)
-
- enum SubscriptionStateFilterFlag {
- DoNotFilterBySubscription = 0x0000,
- HideSubscriptionStateNo = 0x0001,
- HideSubscriptionStateAsk = 0x0002,
- HideSubscriptionStateYes = 0x0004,
- HidePublishStateNo = 0x0010,
- HidePublishStateAsk = 0x0020,
- HidePublishStateYes = 0x0040,
- HideBlocked = 0x0100,
- HideNonBlocked = 0x0200,
- ShowOnlyBlocked = HideNonBlocked
- };
- Q_DECLARE_FLAGS(SubscriptionStateFilterFlags, SubscriptionStateFilterFlag)
-
- AccountsFilterModel(QObject *parent = 0);
- virtual ~AccountsFilterModel();
-
- virtual QVariant data(const QModelIndex &index, int role) const;
- virtual void setSourceModel(QAbstractItemModel *sourceModel);
- void invalidateFilter();
-
- SortMode sortMode() const;
- void resetSortMode();
- Q_SLOT void setSortMode(SortMode sortMode);
- Q_SIGNAL void sortModeChanged(SortMode sortMode);
-
- PresenceTypeFilterFlags presenceTypeFilterFlags() const;
- Q_SLOT void clearPresenceTypeFilterFlags();
- Q_SLOT void setPresenceTypeFilterFlags(PresenceTypeFilterFlags presenceTypeFilterFlags);
- Q_SIGNAL void presenceTypeFilterFlagsChanged(PresenceTypeFilterFlags presenceTypeFilterFlags);
-
- CapabilityFilterFlags capabilityFilterFlags() const;
- Q_SLOT void clearCapabilityFilterFlags();
- Q_SLOT void setCapabilityFilterFlags(CapabilityFilterFlags capabilityFilterFlags);
- Q_SIGNAL void capabilityFilterFlagsChanged(CapabilityFilterFlags capabilityFilterFlags);
-
- SubscriptionStateFilterFlags subscriptionStateFilterFlags() const;
- Q_SLOT void clearSubscriptionStateFilterFlags();
- Q_SLOT void setSubscriptionStateFilterFlags(SubscriptionStateFilterFlags subscriptionStateFilterFlags);
- Q_SIGNAL void subscriptionStateFilterFlagsChanged(SubscriptionStateFilterFlags subscriptionStateFilterFlags);
-
- QString globalFilterString() const;
- Q_SLOT void clearGlobalFilterString();
- Q_SLOT void setGlobalFilterString(const QString &globalFilterString);
- Q_SIGNAL void globalFilterStringChanged(const QString &globalFilterString);
- Qt::MatchFlags globalFilterMatchFlags() const;
- Q_SLOT void resetGlobalFilterMatchFlags();
- Q_SLOT void setGlobalFilterMatchFlags(Qt::MatchFlags globalStringMatchFlags);
- Q_SIGNAL void globalFilterMatchFlagsChanged(Qt::MatchFlags globalStringMatchFlags);
-
- QString displayNameFilterString() const;
- Q_SLOT void clearDisplayNameFilterString();
- Q_SLOT void setDisplayNameFilterString(const QString &displayNameFilterString);
- Q_SIGNAL void displayNameFilterStringChanged(const QString &displayNameFilterString);
- Qt::MatchFlags displayNameFilterMatchFlags() const;
- Q_SLOT void resetDisplayNameFilterMatchFlags();
- Q_SLOT void setDisplayNameFilterMatchFlags(Qt::MatchFlags displayNameFilterMatchFlags);
- Q_SIGNAL void displayNameFilterMatchFlagsChanged(Qt::MatchFlags displayNameFilterMatchFlags);
-
- QString nicknameFilterString() const;
- Q_SLOT void clearNicknameFilterString();
- Q_SLOT void setNicknameFilterString(const QString &nicknameFilterString);
- Q_SIGNAL void nicknameFilterStringChanged(const QString &nicknameFilterString);
- Qt::MatchFlags nicknameFilterMatchFlags() const;
- Q_SLOT void resetNicknameFilterMatchFlags();
- Q_SLOT void setNicknameFilterMatchFlags(Qt::MatchFlags nicknameFilterMatchFlags);
- Q_SIGNAL void nicknameFilterMatchFlagsChanged(Qt::MatchFlags nicknameFilterMatchFlags);
-
- QString aliasFilterString() const;
- Q_SLOT void clearAliasFilterString();
- Q_SLOT void setAliasFilterString(const QString &aliasFilterString);
- Q_SIGNAL void aliasFilterStringChanged(const QString &aliasFilterString);
- Qt::MatchFlags aliasFilterMatchFlags() const;
- Q_SLOT void resetAliasFilterMatchFlags();
- Q_SLOT void setAliasFilterMatchFlags(Qt::MatchFlags aliasFilterMatchFlags);
- Q_SIGNAL void aliasFilterMatchFlagsChanged(Qt::MatchFlags aliasFilterMatchFlags);
-
- QString groupsFilterString() const;
- Q_SLOT void clearGroupsFilterString();
- Q_SLOT void setGroupsFilterString(const QString &groupsFilterString);
- Q_SIGNAL void groupsFilterStringChanged(const QString &groupsFilterString);
- Qt::MatchFlags groupsFilterMatchFlags() const;
- Q_SLOT void resetGroupsFilterMatchFlags();
- Q_SLOT void setGroupsFilterMatchFlags(Qt::MatchFlags groupsFilterMatchFlags);
- Q_SIGNAL void groupsFilterMatchFlagsChanged(Qt::MatchFlags groupsFilterMatchFlags);
-
- QString idFilterString() const;
- Q_SLOT void clearIdFilterString();
- Q_SLOT void setIdFilterString(const QString &idFilterString);
- Q_SIGNAL void idFilterStringChanged(const QString &idFilterString);
- Qt::MatchFlags idFilterMatchFlags() const;
- Q_SLOT void resetIdFilterMatchFlags();
- Q_SLOT void setIdFilterMatchFlags(Qt::MatchFlags idFilterMatchFlags);
- Q_SIGNAL void idFilterMatchFlagsChanged(Qt::MatchFlags idFilterMatchFlags);
-
- Q_SLOT void countContacts(const QModelIndex &index) const;
-
-protected:
- bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
- bool lessThan (const QModelIndex &left, const QModelIndex &right) const;
- QModelIndexList match(const QModelIndex &start, int role,
- const QVariant &value, int hits,
- Qt::MatchFlags flags) const;
-
-private:
- class Private;
- Private * const d;
+ AccountsFilterModel(QObject *parent = 0) :
+ ContactsFilterModel(parent){}
+
};
-#endif // ACCOUNTFILTERMODEL_H
+#endif
diff --git a/KTp/Models/accounts-filter-model.cpp b/KTp/Models/contacts-filter-model.cpp
similarity index 88%
rename from KTp/Models/accounts-filter-model.cpp
rename to KTp/Models/contacts-filter-model.cpp
index cd68025..269505c 100644
--- a/KTp/Models/accounts-filter-model.cpp
+++ b/KTp/Models/contacts-filter-model.cpp
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "accounts-filter-model.h"
+#include "contacts-filter-model.h"
#include "contacts-model.h"
#include "groups-model.h"
@@ -35,10 +35,10 @@
#include <KDebug>
-class AccountsFilterModel::Private
+class ContactsFilterModel::Private
{
public:
- Private(AccountsFilterModel *parent)
+ Private(ContactsFilterModel *parent)
: q(parent),
presenceTypeFilterFlags(DoNotFilterByCapability),
capabilityFilterFlags(DoNotFilterByCapability),
@@ -52,7 +52,7 @@ public:
{
}
- AccountsFilterModel *q;
+ ContactsFilterModel *q;
PresenceTypeFilterFlags presenceTypeFilterFlags;
CapabilityFilterFlags capabilityFilterFlags;
@@ -80,7 +80,7 @@ public:
QHash<QString, int> m_totalContactsCounts;
};
-bool AccountsFilterModel::Private::filterAcceptsAccount(const QModelIndex &index) const
+bool ContactsFilterModel::Private::filterAcceptsAccount(const QModelIndex &index) const
{
// Hide disabled accounts
if (!index.data(ContactsModel::EnabledRole).toBool()) {
@@ -128,7 +128,7 @@ bool AccountsFilterModel::Private::filterAcceptsAccount(const QModelIndex &index
return true;
}
-bool AccountsFilterModel::Private::filterAcceptsContact(const QModelIndex &index) const
+bool ContactsFilterModel::Private::filterAcceptsContact(const QModelIndex &index) const
{
// Presence type, capability and subscription state are always checked
// Then if global filter is set we can return true if a result is found for
@@ -357,7 +357,7 @@ bool AccountsFilterModel::Private::filterAcceptsContact(const QModelIndex &index
return true;
}
-bool AccountsFilterModel::Private::filterAcceptsGroup(const QModelIndex &index) const
+bool ContactsFilterModel::Private::filterAcceptsGroup(const QModelIndex &index) const
{
QString groupName = index.data(ContactsModel::IdRole).toString();
@@ -386,18 +386,18 @@ bool AccountsFilterModel::Private::filterAcceptsGroup(const QModelIndex &index)
return true;
}
-AccountsFilterModel::AccountsFilterModel(QObject *parent)
+ContactsFilterModel::ContactsFilterModel(QObject *parent)
: QSortFilterProxyModel(parent),
d(new Private(this))
{
}
-AccountsFilterModel::~AccountsFilterModel()
+ContactsFilterModel::~ContactsFilterModel()
{
delete d;
}
-QVariant AccountsFilterModel::data(const QModelIndex &index, int role) const
+QVariant ContactsFilterModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid()) {
return QVariant();
@@ -449,7 +449,7 @@ QVariant AccountsFilterModel::data(const QModelIndex &index, int role) const
return sourceModel()->data(mapToSource(index), role);
}
-void AccountsFilterModel::setSourceModel(QAbstractItemModel *sourceModel)
+void ContactsFilterModel::setSourceModel(QAbstractItemModel *sourceModel)
{
// Disconnect the previous source model
disconnect(this->sourceModel(),
@@ -469,7 +469,7 @@ void AccountsFilterModel::setSourceModel(QAbstractItemModel *sourceModel)
SLOT(countContacts(QModelIndex)));
}
-void AccountsFilterModel::invalidateFilter()
+void ContactsFilterModel::invalidateFilter()
{
// Clear all cached values as they aren't valid anymore because the filter changed.
d->m_onlineContactsCounts.clear();
@@ -477,7 +477,7 @@ void AccountsFilterModel::invalidateFilter()
QSortFilterProxyModel::invalidateFilter();
}
-AccountsFilterModel::SortMode AccountsFilterModel::sortMode() const
+ContactsFilterModel::SortMode ContactsFilterModel::sortMode() const
{
switch (sortRole()) {
case Qt::DisplayRole:
@@ -495,12 +495,12 @@ AccountsFilterModel::SortMode AccountsFilterModel::sortMode() const
}
}
-void AccountsFilterModel::resetSortMode()
+void ContactsFilterModel::resetSortMode()
{
setSortMode(DoNotSort);
}
-void AccountsFilterModel::setSortMode(SortMode sortMode)
+void ContactsFilterModel::setSortMode(SortMode sortMode)
{
switch (sortMode) {
case DoNotSort:
@@ -523,17 +523,17 @@ void AccountsFilterModel::setSortMode(SortMode sortMode)
Q_EMIT sortModeChanged(sortMode);
}
-AccountsFilterModel::PresenceTypeFilterFlags AccountsFilterModel::presenceTypeFilterFlags() const
+ContactsFilterModel::PresenceTypeFilterFlags ContactsFilterModel::presenceTypeFilterFlags() const
{
return d->presenceTypeFilterFlags;
}
-void AccountsFilterModel::clearPresenceTypeFilterFlags()
+void ContactsFilterModel::clearPresenceTypeFilterFlags()
{
setPresenceTypeFilterFlags(DoNotFilterByPresence);
}
-void AccountsFilterModel::setPresenceTypeFilterFlags(AccountsFilterModel::PresenceTypeFilterFlags presenceTypeFilterFlags)
+void ContactsFilterModel::setPresenceTypeFilterFlags(ContactsFilterModel::PresenceTypeFilterFlags presenceTypeFilterFlags)
{
if (d->presenceTypeFilterFlags != presenceTypeFilterFlags) {
d->presenceTypeFilterFlags = presenceTypeFilterFlags;
@@ -542,17 +542,17 @@ void AccountsFilterModel::setPresenceTypeFilterFlags(AccountsFilterModel::Presen
}
}
-AccountsFilterModel::CapabilityFilterFlags AccountsFilterModel::capabilityFilterFlags() const
+ContactsFilterModel::CapabilityFilterFlags ContactsFilterModel::capabilityFilterFlags() const
{
return d->capabilityFilterFlags;
}
-void AccountsFilterModel::clearCapabilityFilterFlags()
+void ContactsFilterModel::clearCapabilityFilterFlags()
{
setCapabilityFilterFlags(DoNotFilterByCapability);
}
-void AccountsFilterModel::setCapabilityFilterFlags(AccountsFilterModel::CapabilityFilterFlags capabilityFilterFlags)
+void ContactsFilterModel::setCapabilityFilterFlags(ContactsFilterModel::CapabilityFilterFlags capabilityFilterFlags)
{
if (d->capabilityFilterFlags != capabilityFilterFlags) {
d->capabilityFilterFlags = capabilityFilterFlags;
@@ -561,17 +561,17 @@ void AccountsFilterModel::setCapabilityFilterFlags(AccountsFilterModel::Capabili
}
}
-AccountsFilterModel::SubscriptionStateFilterFlags AccountsFilterModel::subscriptionStateFilterFlags() const
+ContactsFilterModel::SubscriptionStateFilterFlags ContactsFilterModel::subscriptionStateFilterFlags() const
{
return d->subscriptionStateFilterFlags;
}
-void AccountsFilterModel::clearSubscriptionStateFilterFlags()
+void ContactsFilterModel::clearSubscriptionStateFilterFlags()
{
setSubscriptionStateFilterFlags(DoNotFilterBySubscription);
}
-void AccountsFilterModel::setSubscriptionStateFilterFlags(AccountsFilterModel::SubscriptionStateFilterFlags subscriptionStateFilterFlags)
+void ContactsFilterModel::setSubscriptionStateFilterFlags(ContactsFilterModel::SubscriptionStateFilterFlags subscriptionStateFilterFlags)
{
if (d->subscriptionStateFilterFlags != subscriptionStateFilterFlags) {
d->subscriptionStateFilterFlags = subscriptionStateFilterFlags;
@@ -580,17 +580,17 @@ void AccountsFilterModel::setSubscriptionStateFilterFlags(AccountsFilterModel::S
}
}
-QString AccountsFilterModel::globalFilterString() const
+QString ContactsFilterModel::globalFilterString() const
{
return d->globalFilterString;
}
-void AccountsFilterModel::clearGlobalFilterString()
+void ContactsFilterModel::clearGlobalFilterString()
{
setGlobalFilterString(QString());
}
-void AccountsFilterModel::setGlobalFilterString(const QString &globalFilterString)
+void ContactsFilterModel::setGlobalFilterString(const QString &globalFilterString)
{
if (d->globalFilterString != globalFilterString) {
d->globalFilterString = globalFilterString;
@@ -599,17 +599,17 @@ void AccountsFilterModel::setGlobalFilterString(const QString &globalFilterStrin
}
}
-Qt::MatchFlags AccountsFilterModel::globalFilterMatchFlags() const
+Qt::MatchFlags ContactsFilterModel::globalFilterMatchFlags() const
{
return d->globalFilterMatchFlags;
}
-void AccountsFilterModel::resetGlobalFilterMatchFlags()
+void ContactsFilterModel::resetGlobalFilterMatchFlags()
{
setGlobalFilterMatchFlags(Qt::MatchStartsWith | Qt::MatchWrap);
}
-void AccountsFilterModel::setGlobalFilterMatchFlags(Qt::MatchFlags globalFilterMatchFlags)
+void ContactsFilterModel::setGlobalFilterMatchFlags(Qt::MatchFlags globalFilterMatchFlags)
{
if (d->globalFilterMatchFlags != globalFilterMatchFlags) {
d->globalFilterMatchFlags = globalFilterMatchFlags;
@@ -618,17 +618,17 @@ void AccountsFilterModel::setGlobalFilterMatchFlags(Qt::MatchFlags globalFilterM
}
}
-QString AccountsFilterModel::displayNameFilterString() const
+QString ContactsFilterModel::displayNameFilterString() const
{
return d->displayNameFilterString;
}
-void AccountsFilterModel::clearDisplayNameFilterString()
+void ContactsFilterModel::clearDisplayNameFilterString()
{
setDisplayNameFilterString(QString());
}
-void AccountsFilterModel::setDisplayNameFilterString(const QString &displayNameFilterString)
+void ContactsFilterModel::setDisplayNameFilterString(const QString &displayNameFilterString)
{
if (d->displayNameFilterString != displayNameFilterString) {
d->displayNameFilterString = displayNameFilterString;
@@ -637,17 +637,17 @@ void AccountsFilterModel::setDisplayNameFilterString(const QString &displayNameF
}
}
-Qt::MatchFlags AccountsFilterModel::displayNameFilterMatchFlags() const
+Qt::MatchFlags ContactsFilterModel::displayNameFilterMatchFlags() const
{
return d->displayNameFilterMatchFlags;
}
-void AccountsFilterModel::resetDisplayNameFilterMatchFlags()
+void ContactsFilterModel::resetDisplayNameFilterMatchFlags()
{
setDisplayNameFilterMatchFlags(Qt::MatchStartsWith | Qt::MatchWrap);
}
-void AccountsFilterModel::setDisplayNameFilterMatchFlags(Qt::MatchFlags displayNameFilterMatchFlags)
+void ContactsFilterModel::setDisplayNameFilterMatchFlags(Qt::MatchFlags displayNameFilterMatchFlags)
{
if (d->displayNameFilterMatchFlags != displayNameFilterMatchFlags) {
d->displayNameFilterMatchFlags = displayNameFilterMatchFlags;
@@ -656,17 +656,17 @@ void AccountsFilterModel::setDisplayNameFilterMatchFlags(Qt::MatchFlags displayN
}
}
-QString AccountsFilterModel::nicknameFilterString() const
+QString ContactsFilterModel::nicknameFilterString() const
{
return d->nicknameFilterString;
}
-void AccountsFilterModel::clearNicknameFilterString()
+void ContactsFilterModel::clearNicknameFilterString()
{
setNicknameFilterString(QString());
}
-void AccountsFilterModel::setNicknameFilterString(const QString &nicknameFilterString)
+void ContactsFilterModel::setNicknameFilterString(const QString &nicknameFilterString)
{
if (d->nicknameFilterString != nicknameFilterString) {
d->nicknameFilterString = nicknameFilterString;
@@ -675,17 +675,17 @@ void AccountsFilterModel::setNicknameFilterString(const QString &nicknameFilterS
}
}
-Qt::MatchFlags AccountsFilterModel::nicknameFilterMatchFlags() const
+Qt::MatchFlags ContactsFilterModel::nicknameFilterMatchFlags() const
{
return d->nicknameFilterMatchFlags;
}
-void AccountsFilterModel::resetNicknameFilterMatchFlags()
+void ContactsFilterModel::resetNicknameFilterMatchFlags()
{
setNicknameFilterMatchFlags(Qt::MatchStartsWith | Qt::MatchWrap);
}
-void AccountsFilterModel::setNicknameFilterMatchFlags(Qt::MatchFlags nicknameFilterMatchFlags)
+void ContactsFilterModel::setNicknameFilterMatchFlags(Qt::MatchFlags nicknameFilterMatchFlags)
{
if (d->nicknameFilterMatchFlags != nicknameFilterMatchFlags) {
d->nicknameFilterMatchFlags = nicknameFilterMatchFlags;
@@ -694,17 +694,17 @@ void AccountsFilterModel::setNicknameFilterMatchFlags(Qt::MatchFlags nicknameFil
}
}
-QString AccountsFilterModel::aliasFilterString() const
+QString ContactsFilterModel::aliasFilterString() const
{
return d->aliasFilterString;
}
-void AccountsFilterModel::clearAliasFilterString()
+void ContactsFilterModel::clearAliasFilterString()
{
setAliasFilterString(QString());
}
-void AccountsFilterModel::setAliasFilterString(const QString &aliasFilterString)
+void ContactsFilterModel::setAliasFilterString(const QString &aliasFilterString)
{
if (d->aliasFilterString != aliasFilterString) {
d->aliasFilterString = aliasFilterString;
@@ -713,17 +713,17 @@ void AccountsFilterModel::setAliasFilterString(const QString &aliasFilterString)
}
}
-Qt::MatchFlags AccountsFilterModel::aliasFilterMatchFlags() const
+Qt::MatchFlags ContactsFilterModel::aliasFilterMatchFlags() const
{
return d->aliasFilterMatchFlags;
}
-void AccountsFilterModel::resetAliasFilterMatchFlags()
+void ContactsFilterModel::resetAliasFilterMatchFlags()
{
setAliasFilterMatchFlags(Qt::MatchStartsWith | Qt::MatchWrap);
}
-void AccountsFilterModel::setAliasFilterMatchFlags(Qt::MatchFlags aliasFilterMatchFlags)
+void ContactsFilterModel::setAliasFilterMatchFlags(Qt::MatchFlags aliasFilterMatchFlags)
{
if (d->aliasFilterMatchFlags != aliasFilterMatchFlags) {
d->aliasFilterMatchFlags = aliasFilterMatchFlags;
@@ -732,17 +732,17 @@ void AccountsFilterModel::setAliasFilterMatchFlags(Qt::MatchFlags aliasFilterMat
}
}
-QString AccountsFilterModel::groupsFilterString() const
+QString ContactsFilterModel::groupsFilterString() const
{
return d->groupsFilterString;
}
-void AccountsFilterModel::clearGroupsFilterString()
+void ContactsFilterModel::clearGroupsFilterString()
{
setGroupsFilterString(QString());
}
-void AccountsFilterModel::setGroupsFilterString(const QString &groupsFilterString)
+void ContactsFilterModel::setGroupsFilterString(const QString &groupsFilterString)
{
if (d->groupsFilterString != groupsFilterString) {
d->groupsFilterString = groupsFilterString;
@@ -751,17 +751,17 @@ void AccountsFilterModel::setGroupsFilterString(const QString &groupsFilterStrin
}
}
-Qt::MatchFlags AccountsFilterModel::groupsFilterMatchFlags() const
+Qt::MatchFlags ContactsFilterModel::groupsFilterMatchFlags() const
{
return d->groupsFilterMatchFlags;
}
-void AccountsFilterModel::resetGroupsFilterMatchFlags()
+void ContactsFilterModel::resetGroupsFilterMatchFlags()
{
setGroupsFilterMatchFlags(Qt::MatchStartsWith | Qt::MatchWrap);
}
-void AccountsFilterModel::setGroupsFilterMatchFlags(Qt::MatchFlags groupsFilterMatchFlags)
+void ContactsFilterModel::setGroupsFilterMatchFlags(Qt::MatchFlags groupsFilterMatchFlags)
{
if (d->groupsFilterMatchFlags != groupsFilterMatchFlags) {
d->groupsFilterMatchFlags = groupsFilterMatchFlags;
@@ -770,17 +770,17 @@ void AccountsFilterModel::setGroupsFilterMatchFlags(Qt::MatchFlags groupsFilterM
}
}
-QString AccountsFilterModel::idFilterString() const
+QString ContactsFilterModel::idFilterString() const
{
return d->idFilterString;
}
-void AccountsFilterModel::clearIdFilterString()
+void ContactsFilterModel::clearIdFilterString()
{
setIdFilterString(QString());
}
-void AccountsFilterModel::setIdFilterString(const QString &idFilterString)
+void ContactsFilterModel::setIdFilterString(const QString &idFilterString)
{
if (d->idFilterString != idFilterString) {
d->idFilterString = idFilterString;
@@ -789,17 +789,17 @@ void AccountsFilterModel::setIdFilterString(const QString &idFilterString)
}
}
-Qt::MatchFlags AccountsFilterModel::idFilterMatchFlags() const
+Qt::MatchFlags ContactsFilterModel::idFilterMatchFlags() const
{
return d->idFilterMatchFlags;
}
-void AccountsFilterModel::resetIdFilterMatchFlags()
+void ContactsFilterModel::resetIdFilterMatchFlags()
{
setIdFilterMatchFlags(Qt::MatchStartsWith | Qt::MatchWrap);
}
-void AccountsFilterModel::setIdFilterMatchFlags(Qt::MatchFlags idFilterMatchFlags)
+void ContactsFilterModel::setIdFilterMatchFlags(Qt::MatchFlags idFilterMatchFlags)
{
if (d->idFilterMatchFlags != idFilterMatchFlags) {
d->idFilterMatchFlags = idFilterMatchFlags;
@@ -808,7 +808,7 @@ void AccountsFilterModel::setIdFilterMatchFlags(Qt::MatchFlags idFilterMatchFlag
}
}
-void AccountsFilterModel::countContacts(const QModelIndex &index) const
+void ContactsFilterModel::countContacts(const QModelIndex &index) const
{
QVariant item = index.data(ContactsModel::ItemRole);
if (item.canConvert<GroupsModelItem*>()) {
@@ -835,7 +835,7 @@ void AccountsFilterModel::countContacts(const QModelIndex &index) const
// Save the presenceTypeFilterFlags to reapply them later, because we need to disable
// presence filtering to get the right numbers
PresenceTypeFilterFlags saved = presenceTypeFilterFlags();
- d->presenceTypeFilterFlags = AccountsFilterModel::DoNotFilterByPresence;
+ d->presenceTypeFilterFlags = ContactsFilterModel::DoNotFilterByPresence;
tmpCounter = 0;
for (int i = 0; i < gmItem->size(); ++i) {
@@ -872,7 +872,7 @@ void AccountsFilterModel::countContacts(const QModelIndex &index) const
// Save the presenceTypeFilterFlags to reapply them later, because we need to disable
// presence filtering to get the right numbers
PresenceTypeFilterFlags saved = presenceTypeFilterFlags();
- d->presenceTypeFilterFlags = AccountsFilterModel::DoNotFilterByPresence;
+ d->presenceTypeFilterFlags = ContactsFilterModel::DoNotFilterByPresence;
tmpCounter = 0;
for (int i = 0; i < amItem->size(); ++i) {
@@ -888,7 +888,7 @@ void AccountsFilterModel::countContacts(const QModelIndex &index) const
}
}
-bool AccountsFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+bool ContactsFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
@@ -908,7 +908,7 @@ bool AccountsFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sou
}
}
-bool AccountsFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+bool ContactsFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
QString leftDisplayedName = sourceModel()->data(left).toString();
@@ -967,7 +967,7 @@ bool AccountsFilterModel::lessThan(const QModelIndex &left, const QModelIndex &r
}
-QModelIndexList AccountsFilterModel::match(const QModelIndex &start, int role,
+QModelIndexList ContactsFilterModel::match(const QModelIndex &start, int role,
const QVariant &value, int hits,
Qt::MatchFlags flags) const
{
@@ -1026,4 +1026,4 @@ QModelIndexList AccountsFilterModel::match(const QModelIndex &start, int role,
}
-#include "accounts-filter-model.moc"
+#include "contacts-filter-model.moc"
diff --git a/KTp/Models/accounts-filter-model.h b/KTp/Models/contacts-filter-model.h
similarity index 97%
copy from KTp/Models/accounts-filter-model.h
copy to KTp/Models/contacts-filter-model.h
index a7ba2c7..e7bc1ce 100644
--- a/KTp/Models/accounts-filter-model.h
+++ b/KTp/Models/contacts-filter-model.h
@@ -1,7 +1,7 @@
/*
* Provide some filters on the account model
*
- * Copyright (C) 2011 David Edmundson <kde at davidedmundson.co.uk>
+ * Copyright (C) 2011,2012 David Edmundson <kde at davidedmundson.co.uk>
* Copyright (C) 2012 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
*
* This library is free software; you can redistribute it and/or
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef ACCOUNTSFILTERMODEL_H
-#define ACCOUNTSFILTERMODEL_H
+#ifndef CONTACTSFILTERMODEL_H
+#define CONTACTSFILTERMODEL_H
#include <QSortFilterProxyModel>
@@ -32,10 +32,10 @@ class ContactModelItem;
/**
* rief Class used to sort and filter the contacts.
*/
-class KTP_EXPORT AccountsFilterModel : public QSortFilterProxyModel
+class KTP_EXPORT ContactsFilterModel : public QSortFilterProxyModel
{
Q_OBJECT
- Q_DISABLE_COPY(AccountsFilterModel)
+ Q_DISABLE_COPY(ContactsFilterModel)
Q_ENUMS(SortMode
PresenceFilterFlag
@@ -199,8 +199,8 @@ public:
};
Q_DECLARE_FLAGS(SubscriptionStateFilterFlags, SubscriptionStateFilterFlag)
- AccountsFilterModel(QObject *parent = 0);
- virtual ~AccountsFilterModel();
+ ContactsFilterModel(QObject *parent = 0);
+ virtual ~ContactsFilterModel();
virtual QVariant data(const QModelIndex &index, int role) const;
virtual void setSourceModel(QAbstractItemModel *sourceModel);
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list