Skip to content
Snippets Groups Projects
Commit 33ce5029 authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

[ #60972 ] Port HistoryModel class to D-Pointer

parent 6cbaa25e
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/contactproxymodel.cpp
+ 8
− 8
View file @ 33ce5029
...@@ -54,7 +54,7 @@ class TopLevelItem : public CategorizedCompositeNode { ...@@ -54,7 +54,7 @@ class TopLevelItem : public CategorizedCompositeNode {
friend class ContactProxyModelPrivate; friend class ContactProxyModelPrivate;
friend class ContactTreeBinder; friend class ContactTreeBinder;
public: public:
virtual QObject* getSelf() const; virtual QObject* getSelf() const override;
virtual ~TopLevelItem(); virtual ~TopLevelItem();
private: private:
explicit TopLevelItem(const QString& name) : CategorizedCompositeNode(CategorizedCompositeNode::Type::TOP_LEVEL),m_Name(name), explicit TopLevelItem(const QString& name) : CategorizedCompositeNode(CategorizedCompositeNode::Type::TOP_LEVEL),m_Name(name),
...@@ -69,11 +69,11 @@ class TopLevelItem : public CategorizedCompositeNode { ...@@ -69,11 +69,11 @@ class TopLevelItem : public CategorizedCompositeNode {
class ContactTreeNode : public CategorizedCompositeNode { class ContactTreeNode : public CategorizedCompositeNode {
public: public:
ContactTreeNode(Contact* ct, ContactProxyModel* parent); ContactTreeNode(Contact* ct, ContactProxyModel* parent);
~ContactTreeNode(); virtual ~ContactTreeNode();
Contact* m_pContact; Contact* m_pContact;
TopLevelItem* m_pParent3; TopLevelItem* m_pParent3;
uint m_Index; uint m_Index;
virtual QObject* getSelf() const; virtual QObject* getSelf() const override;
ContactTreeBinder* m_pBinder; ContactTreeBinder* m_pBinder;
}; };
...@@ -113,6 +113,11 @@ TopLevelItem::~TopLevelItem() { ...@@ -113,6 +113,11 @@ TopLevelItem::~TopLevelItem() {
} }
} }
QObject* TopLevelItem::getSelf() const
{
return nullptr;
}
ContactTreeNode::ContactTreeNode(Contact* ct, ContactProxyModel* parent) : CategorizedCompositeNode(CategorizedCompositeNode::Type::CONTACT), ContactTreeNode::ContactTreeNode(Contact* ct, ContactProxyModel* parent) : CategorizedCompositeNode(CategorizedCompositeNode::Type::CONTACT),
m_pContact(ct),m_pParent3(nullptr),m_Index(-1) m_pContact(ct),m_pParent3(nullptr),m_Index(-1)
{ {
...@@ -129,11 +134,6 @@ QObject* ContactTreeNode::getSelf() const ...@@ -129,11 +134,6 @@ QObject* ContactTreeNode::getSelf() const
return m_pContact; return m_pContact;
} }
QObject* TopLevelItem::getSelf() const
{
return nullptr;
}
ContactTreeBinder::ContactTreeBinder(ContactProxyModel* m,ContactTreeNode* n) : ContactTreeBinder::ContactTreeBinder(ContactProxyModel* m,ContactTreeNode* n) :
QObject(),m_pTreeNode(n),m_pModel(m) QObject(),m_pTreeNode(n),m_pModel(m)
{ {
......
src/contactproxymodel.h
+ 11
− 11
View file @ 33ce5029
...@@ -49,17 +49,17 @@ public: ...@@ -49,17 +49,17 @@ public:
void setShowAll(bool showAll); void setShowAll(bool showAll);
//Model implementation //Model implementation
virtual bool setData ( const QModelIndex& index, const QVariant &value, int role ); virtual bool setData ( const QModelIndex& index, const QVariant &value, int role ) override;
virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const; virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const override;
virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const; virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const override;
virtual Qt::ItemFlags flags ( const QModelIndex& index ) const; virtual Qt::ItemFlags flags ( const QModelIndex& index ) const override;
virtual int columnCount ( const QModelIndex& parent = QModelIndex() ) const; virtual int columnCount ( const QModelIndex& parent = QModelIndex() ) const override;
virtual QModelIndex parent ( const QModelIndex& index ) const; virtual QModelIndex parent ( const QModelIndex& index ) const override;
virtual QModelIndex index ( int row, int column, const QModelIndex& parent=QModelIndex()) const; virtual QModelIndex index ( int row, int column, const QModelIndex& parent=QModelIndex()) const override;
virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
virtual QStringList mimeTypes ( ) const; virtual QStringList mimeTypes ( ) const override;
virtual QMimeData* mimeData ( const QModelIndexList &indexes ) const; virtual QMimeData* mimeData ( const QModelIndexList &indexes ) const override;
virtual bool dropMimeData ( const QMimeData*, Qt::DropAction, int, int, const QModelIndex& ); virtual bool dropMimeData ( const QMimeData*, Qt::DropAction, int, int, const QModelIndex& ) override;
//Getter //Getter
static int acceptedPayloadTypes(); static int acceptedPayloadTypes();
......
src/credentialmodel.cpp
+ 33
− 20
View file @ 33ce5029
...@@ -20,8 +20,23 @@ ...@@ -20,8 +20,23 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
class CredentialModelPrivate
{
public:
///@struct CredentialData store credential information
struct CredentialData2 {
QString name ;
QString password;
QString realm ;
};
//Attributes
QList<CredentialData2*> m_lCredentials;
};
///Constructor ///Constructor
CredentialModel::CredentialModel(QObject* par) : QAbstractListModel(par?par:QCoreApplication::instance()) CredentialModel::CredentialModel(QObject* par) : QAbstractListModel(par?par:QCoreApplication::instance()),
d_ptr(new CredentialModelPrivate())
{ {
QHash<int, QByteArray> roles = roleNames(); QHash<int, QByteArray> roles = roleNames();
roles.insert(CredentialModel::Role::NAME ,QByteArray("name")); roles.insert(CredentialModel::Role::NAME ,QByteArray("name"));
...@@ -32,7 +47,7 @@ CredentialModel::CredentialModel(QObject* par) : QAbstractListModel(par?par:QCor ...@@ -32,7 +47,7 @@ CredentialModel::CredentialModel(QObject* par) : QAbstractListModel(par?par:QCor
CredentialModel::~CredentialModel() CredentialModel::~CredentialModel()
{ {
foreach (CredentialData2* data, m_lCredentials) { foreach (CredentialModelPrivate::CredentialData2* data, d_ptr->m_lCredentials) {
delete data; delete data;
} }
} }
...@@ -42,16 +57,16 @@ QVariant CredentialModel::data(const QModelIndex& idx, int role) const { ...@@ -42,16 +57,16 @@ QVariant CredentialModel::data(const QModelIndex& idx, int role) const {
if (idx.column() == 0) { if (idx.column() == 0) {
switch (role) { switch (role) {
case Qt::DisplayRole: case Qt::DisplayRole:
return QVariant(m_lCredentials[idx.row()]->name); return QVariant(d_ptr->m_lCredentials[idx.row()]->name);
break; break;
case CredentialModel::Role::NAME: case CredentialModel::Role::NAME:
return m_lCredentials[idx.row()]->name; return d_ptr->m_lCredentials[idx.row()]->name;
break; break;
case CredentialModel::Role::PASSWORD: case CredentialModel::Role::PASSWORD:
return m_lCredentials[idx.row()]->password; return d_ptr->m_lCredentials[idx.row()]->password;
break; break;
case CredentialModel::Role::REALM: case CredentialModel::Role::REALM:
return m_lCredentials[idx.row()]->realm; return d_ptr->m_lCredentials[idx.row()]->realm;
break; break;
default: default:
break; break;
...@@ -63,7 +78,7 @@ QVariant CredentialModel::data(const QModelIndex& idx, int role) const { ...@@ -63,7 +78,7 @@ QVariant CredentialModel::data(const QModelIndex& idx, int role) const {
///Number of credentials ///Number of credentials
int CredentialModel::rowCount(const QModelIndex& par) const { int CredentialModel::rowCount(const QModelIndex& par) const {
Q_UNUSED(par) Q_UNUSED(par)
return m_lCredentials.size(); return d_ptr->m_lCredentials.size();
} }
///Model flags ///Model flags
...@@ -75,20 +90,20 @@ Qt::ItemFlags CredentialModel::flags(const QModelIndex& idx) const { ...@@ -75,20 +90,20 @@ Qt::ItemFlags CredentialModel::flags(const QModelIndex& idx) const {
///Set credential data ///Set credential data
bool CredentialModel::setData( const QModelIndex& idx, const QVariant &value, int role) { bool CredentialModel::setData( const QModelIndex& idx, const QVariant &value, int role) {
if (!idx.isValid() || idx.row() > m_lCredentials.size()-1) if (!idx.isValid() || idx.row() > d_ptr->m_lCredentials.size()-1)
return false; return false;
if (idx.column() == 0 && role == CredentialModel::Role::NAME) { if (idx.column() == 0 && role == CredentialModel::Role::NAME) {
m_lCredentials[idx.row()]->name = value.toString(); d_ptr->m_lCredentials[idx.row()]->name = value.toString();
emit dataChanged(idx, idx); emit dataChanged(idx, idx);
return true; return true;
} }
else if (idx.column() == 0 && role == CredentialModel::Role::PASSWORD) { else if (idx.column() == 0 && role == CredentialModel::Role::PASSWORD) {
m_lCredentials[idx.row()]->password = value.toString(); d_ptr->m_lCredentials[idx.row()]->password = value.toString();
emit dataChanged(idx, idx); emit dataChanged(idx, idx);
return true; return true;
} }
else if (idx.column() == 0 && role == CredentialModel::Role::REALM) { else if (idx.column() == 0 && role == CredentialModel::Role::REALM) {
m_lCredentials[idx.row()]->realm = value.toString(); d_ptr->m_lCredentials[idx.row()]->realm = value.toString();
emit dataChanged(idx, idx); emit dataChanged(idx, idx);
return true; return true;
} }
...@@ -97,18 +112,16 @@ bool CredentialModel::setData( const QModelIndex& idx, const QVariant &value, in ...@@ -97,18 +112,16 @@ bool CredentialModel::setData( const QModelIndex& idx, const QVariant &value, in
///Add a new credential ///Add a new credential
QModelIndex CredentialModel::addCredentials() { QModelIndex CredentialModel::addCredentials() {
m_lCredentials << new CredentialData2; d_ptr->m_lCredentials << new CredentialModelPrivate::CredentialData2;
emit dataChanged(index(m_lCredentials.size()-1,0), index(m_lCredentials.size()-1,0)); emit dataChanged(index(d_ptr->m_lCredentials.size()-1,0), index(d_ptr->m_lCredentials.size()-1,0));
return index(m_lCredentials.size()-1,0); return index(d_ptr->m_lCredentials.size()-1,0);
} }
///Remove credential at 'idx' ///Remove credential at 'idx'
void CredentialModel::removeCredentials(QModelIndex idx) { void CredentialModel::removeCredentials(QModelIndex idx) {
qDebug() << "REMOVING" << idx.row() << m_lCredentials.size();
if (idx.isValid()) { if (idx.isValid()) {
m_lCredentials.removeAt(idx.row()); d_ptr->m_lCredentials.removeAt(idx.row());
emit dataChanged(idx, index(m_lCredentials.size()-1,0)); emit dataChanged(idx, index(d_ptr->m_lCredentials.size()-1,0));
qDebug() << "DONE" << m_lCredentials.size();
} }
else { else {
qDebug() << "Failed to remove an invalid credential"; qDebug() << "Failed to remove an invalid credential";
...@@ -118,8 +131,8 @@ void CredentialModel::removeCredentials(QModelIndex idx) { ...@@ -118,8 +131,8 @@ void CredentialModel::removeCredentials(QModelIndex idx) {
///Remove everything ///Remove everything
void CredentialModel::clear() void CredentialModel::clear()
{ {
foreach(CredentialData2* data2, m_lCredentials) { foreach(CredentialModelPrivate::CredentialData2* data2, d_ptr->m_lCredentials) {
delete data2; delete data2;
} }
m_lCredentials.clear(); d_ptr->m_lCredentials.clear();
} }
src/credentialmodel.h
+ 7
− 13
View file @ 33ce5029
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#include "typedefs.h" #include "typedefs.h"
class CredentialModelPrivate;
///CredentialModel: A model for account credentials ///CredentialModel: A model for account credentials
class LIB_EXPORT CredentialModel : public QAbstractListModel { class LIB_EXPORT CredentialModel : public QAbstractListModel {
#pragma GCC diagnostic push #pragma GCC diagnostic push
...@@ -42,10 +44,10 @@ public: ...@@ -42,10 +44,10 @@ public:
virtual ~CredentialModel(); virtual ~CredentialModel();
//Abstract model member //Abstract model member
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole ) const; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole ) const override;
int rowCount(const QModelIndex& parent = QModelIndex() ) const; int rowCount(const QModelIndex& parent = QModelIndex() ) const override;
Qt::ItemFlags flags(const QModelIndex& index ) const; Qt::ItemFlags flags(const QModelIndex& index ) const override;
virtual bool setData(const QModelIndex& index, const QVariant &value, int role); virtual bool setData(const QModelIndex& index, const QVariant &value, int role) override;
//Mutator //Mutator
QModelIndex addCredentials(); QModelIndex addCredentials();
...@@ -53,15 +55,7 @@ public: ...@@ -53,15 +55,7 @@ public:
void clear(); void clear();
private: private:
///@struct CredentialData store credential information QScopedPointer<CredentialModelPrivate> d_ptr;
struct CredentialData2 {
QString name ;
QString password;
QString realm ;
};
//Attributes
QList<CredentialData2*> m_lCredentials;
}; };
Q_DECLARE_METATYPE(CredentialModel*) Q_DECLARE_METATYPE(CredentialModel*)
......
src/historymodel.cpp
+ 142
− 60
View file @ 33ce5029
...@@ -38,7 +38,81 @@ ...@@ -38,7 +38,81 @@
* * * *
****************************************************************************/ ****************************************************************************/
HistoryItemNode::HistoryItemNode(HistoryModel* m, Call* c, HistoryModel::HistoryItem* backend) : class HistoryTopLevelItem;
class HistoryModelPrivate : public QObject
{
Q_OBJECT
public:
HistoryModelPrivate(HistoryModel* parent);
//Model
class HistoryItem : public CategorizedCompositeNode {
public:
explicit HistoryItem(Call* call);
virtual ~HistoryItem();
virtual QObject* getSelf() const;
Call* call() const;
int m_Index;
HistoryTopLevelItem* m_pParent;
HistoryItemNode* m_pNode;
private:
Call* m_pCall;
};
//Helpers
HistoryTopLevelItem* getCategory(const Call* call);
//Attributes
static CallMap m_sHistoryCalls;
QVector<AbstractHistoryBackend*> m_lBackends;
//Model categories
QList<HistoryTopLevelItem*> m_lCategoryCounter ;
QHash<int,HistoryTopLevelItem*> m_hCategories ;
QHash<QString,HistoryTopLevelItem*> m_hCategoryByName ;
int m_Role ;
QStringList m_lMimes ;
private:
HistoryModel* q_ptr;
public Q_SLOTS:
void reloadCategories();
void slotChanged(const QModelIndex& idx);
};
class HistoryTopLevelItem : public CategorizedCompositeNode,public QObject {
friend class HistoryModel;
friend class HistoryModelPrivate;
public:
virtual QObject* getSelf() const;
virtual ~HistoryTopLevelItem();
int m_Index;
int m_AbsoluteIndex;
QVector<HistoryModelPrivate::HistoryItem*> m_lChildren;
private:
explicit HistoryTopLevelItem(const QString& name, int index);
QString m_NameStr;
int modelRow;
};
class HistoryItemNode : public QObject //TODO remove this once Qt4 support is dropped
{
Q_OBJECT
public:
HistoryItemNode(HistoryModel* m, Call* c, HistoryModelPrivate::HistoryItem* backend);
Call* m_pCall;
private:
HistoryModelPrivate::HistoryItem* m_pBackend;
HistoryModel* m_pModel;
private Q_SLOTS:
void slotNumberChanged();
Q_SIGNALS:
void changed(const QModelIndex& idx);
};
HistoryItemNode::HistoryItemNode(HistoryModel* m, Call* c, HistoryModelPrivate::HistoryItem* backend) :
m_pCall(c),m_pBackend(backend),m_pModel(m){ m_pCall(c),m_pBackend(backend),m_pModel(m){
connect(c,SIGNAL(changed()),this,SLOT(slotNumberChanged())); connect(c,SIGNAL(changed()),this,SLOT(slotNumberChanged()));
} }
...@@ -49,45 +123,45 @@ void HistoryItemNode::slotNumberChanged() ...@@ -49,45 +123,45 @@ void HistoryItemNode::slotNumberChanged()
} }
HistoryModel* HistoryModel::m_spInstance = nullptr; HistoryModel* HistoryModel::m_spInstance = nullptr;
CallMap HistoryModel::m_sHistoryCalls ; CallMap HistoryModelPrivate::m_sHistoryCalls ;
HistoryModel::TopLevelItem::TopLevelItem(const QString& name, int index) : HistoryTopLevelItem::HistoryTopLevelItem(const QString& name, int index) :
CategorizedCompositeNode(CategorizedCompositeNode::Type::TOP_LEVEL),QObject(nullptr),m_Index(index),m_NameStr(name), CategorizedCompositeNode(CategorizedCompositeNode::Type::TOP_LEVEL),QObject(nullptr),m_Index(index),m_NameStr(name),
m_AbsoluteIndex(-1),modelRow(-1) m_AbsoluteIndex(-1),modelRow(-1)
{} {}
HistoryModel::TopLevelItem::~TopLevelItem() { HistoryTopLevelItem::~HistoryTopLevelItem() {
m_spInstance->m_lCategoryCounter.removeAll(this); HistoryModel::m_spInstance->d_ptr->m_lCategoryCounter.removeAll(this);
while(m_lChildren.size()) { while(m_lChildren.size()) {
HistoryModel::HistoryItem* item = m_lChildren[0]; HistoryModelPrivate::HistoryItem* item = m_lChildren[0];
m_lChildren.remove(0); m_lChildren.remove(0);
delete item; delete item;
} }
} }
QObject* HistoryModel::TopLevelItem::getSelf() const QObject* HistoryTopLevelItem::getSelf() const
{ {
return const_cast<HistoryModel::TopLevelItem*>(this); return const_cast<HistoryTopLevelItem*>(this);
} }
HistoryModel::HistoryItem::HistoryItem(Call* call) : CategorizedCompositeNode(CategorizedCompositeNode::Type::CALL),m_pCall(call), HistoryModelPrivate::HistoryItem::HistoryItem(Call* call) : CategorizedCompositeNode(CategorizedCompositeNode::Type::CALL),m_pCall(call),
m_Index(0),m_pParent(nullptr),m_pNode(nullptr) m_Index(0),m_pParent(nullptr),m_pNode(nullptr)
{ {
} }
HistoryModel::HistoryItem::~HistoryItem() HistoryModelPrivate::HistoryItem::~HistoryItem()
{ {
delete m_pNode; delete m_pNode;
} }
QObject* HistoryModel::HistoryItem::getSelf() const QObject* HistoryModelPrivate::HistoryItem::getSelf() const
{ {
return const_cast<Call*>(m_pCall); return const_cast<Call*>(m_pCall);
} }
Call* HistoryModel::HistoryItem::call() const Call* HistoryModelPrivate::HistoryItem::call() const
{ {
return m_pCall; return m_pCall;
} }
...@@ -99,11 +173,16 @@ Call* HistoryModel::HistoryItem::call() const ...@@ -99,11 +173,16 @@ Call* HistoryModel::HistoryItem::call() const
* * * *
****************************************************************************/ ****************************************************************************/
HistoryModelPrivate::HistoryModelPrivate(HistoryModel* parent) : QObject(parent), q_ptr(parent),
m_Role(Call::Role::FuzzyDate)
{
}
///Constructor ///Constructor
HistoryModel::HistoryModel():QAbstractItemModel(QCoreApplication::instance()),m_Role(Call::Role::FuzzyDate) HistoryModel::HistoryModel():QAbstractItemModel(QCoreApplication::instance()),d_ptr(new HistoryModelPrivate(this))
{ {
m_spInstance = this; m_spInstance = this;
m_lMimes << MIME_PLAIN_TEXT << MIME_PHONENUMBER << MIME_HISTORYID; d_ptr->m_lMimes << MIME_PLAIN_TEXT << MIME_PHONENUMBER << MIME_HISTORYID;
QHash<int, QByteArray> roles = roleNames(); QHash<int, QByteArray> roles = roleNames();
roles.insert(Call::Role::Name ,QByteArray("name" )); roles.insert(Call::Role::Name ,QByteArray("name" ));
roles.insert(Call::Role::Number ,QByteArray("number" )); roles.insert(Call::Role::Number ,QByteArray("number" ));
...@@ -136,12 +215,13 @@ HistoryModel::HistoryModel():QAbstractItemModel(QCoreApplication::instance()),m_ ...@@ -136,12 +215,13 @@ HistoryModel::HistoryModel():QAbstractItemModel(QCoreApplication::instance()),m_
///Destructor ///Destructor
HistoryModel::~HistoryModel() HistoryModel::~HistoryModel()
{ {
for (int i=0; i<m_lCategoryCounter.size();i++) { for (int i=0; i<d_ptr->m_lCategoryCounter.size();i++) {
delete m_lCategoryCounter[i]; delete d_ptr->m_lCategoryCounter[i];
} }
while(m_lCategoryCounter.size()) { while(d_ptr->m_lCategoryCounter.size()) {
TopLevelItem* item = m_lCategoryCounter[0]; HistoryTopLevelItem* item = d_ptr->m_lCategoryCounter[0];
m_lCategoryCounter.removeAt(0); d_ptr->m_lCategoryCounter.removeAt(0);
delete item; delete item;
} }
m_spInstance = nullptr; m_spInstance = nullptr;
...@@ -162,9 +242,9 @@ HistoryModel* HistoryModel::instance() ...@@ -162,9 +242,9 @@ HistoryModel* HistoryModel::instance()
* * * *
****************************************************************************/ ****************************************************************************/
///Get the top level item based on a call ///Get the top level item based on a call
HistoryModel::TopLevelItem* HistoryModel::getCategory(const Call* call) HistoryTopLevelItem* HistoryModelPrivate::getCategory(const Call* call)
{ {
TopLevelItem* category = nullptr; HistoryTopLevelItem* category = nullptr;
QString name; QString name;
int index = -1; int index = -1;
if (m_Role == Call::Role::FuzzyDate) { if (m_Role == Call::Role::FuzzyDate) {
...@@ -177,7 +257,7 @@ HistoryModel::TopLevelItem* HistoryModel::getCategory(const Call* call) ...@@ -177,7 +257,7 @@ HistoryModel::TopLevelItem* HistoryModel::getCategory(const Call* call)
category = m_hCategoryByName[name]; category = m_hCategoryByName[name];
} }
if (!category) { if (!category) {
category = new TopLevelItem(name,index); category = new HistoryTopLevelItem(name,index);
category->modelRow = m_lCategoryCounter.size(); category->modelRow = m_lCategoryCounter.size();
// emit layoutAboutToBeChanged(); //Not necessary // emit layoutAboutToBeChanged(); //Not necessary
// beginInsertRows(QModelIndex(),m_lCategoryCounter.size(),m_lCategoryCounter.size()); // beginInsertRows(QModelIndex(),m_lCategoryCounter.size(),m_lCategoryCounter.size());
...@@ -194,7 +274,7 @@ HistoryModel::TopLevelItem* HistoryModel::getCategory(const Call* call) ...@@ -194,7 +274,7 @@ HistoryModel::TopLevelItem* HistoryModel::getCategory(const Call* call)
const CallMap HistoryModel::getHistoryCalls() const const CallMap HistoryModel::getHistoryCalls() const
{ {
return m_sHistoryCalls; return d_ptr->m_sHistoryCalls;
} }
///Add to history ///Add to history
...@@ -211,19 +291,19 @@ void HistoryModel::add(Call* call) ...@@ -211,19 +291,19 @@ void HistoryModel::add(Call* call)
emit newHistoryCall(call); emit newHistoryCall(call);
emit layoutAboutToBeChanged(); emit layoutAboutToBeChanged();
TopLevelItem* tl = getCategory(call); HistoryTopLevelItem* tl = d_ptr->getCategory(call);
const QModelIndex& parentIdx = index(tl->modelRow,0); const QModelIndex& parentIdx = index(tl->modelRow,0);
beginInsertRows(parentIdx,tl->m_lChildren.size(),tl->m_lChildren.size()); beginInsertRows(parentIdx,tl->m_lChildren.size(),tl->m_lChildren.size());
HistoryItem* item = new HistoryItem(call); HistoryModelPrivate::HistoryItem* item = new HistoryModelPrivate::HistoryItem(call);
item->m_pParent = tl; item->m_pParent = tl;
item->m_pNode = new HistoryItemNode(this,call,item); item->m_pNode = new HistoryItemNode(this,call,item);
connect(item->m_pNode,SIGNAL(changed(QModelIndex)),this,SLOT(slotChanged(QModelIndex))); connect(item->m_pNode,SIGNAL(changed(QModelIndex)),d_ptr.data(),SLOT(slotChanged(QModelIndex)));
item->m_Index = tl->m_lChildren.size(); item->m_Index = tl->m_lChildren.size();
tl->m_lChildren << item; tl->m_lChildren << item;
//Try to prevent startTimeStamp() collisions, it technically doesn't work as time_t are signed //Try to prevent startTimeStamp() collisions, it technically doesn't work as time_t are signed
//we don't care //we don't care
m_sHistoryCalls[(call->startTimeStamp() << 10)+qrand()%1024] = call; d_ptr->m_sHistoryCalls[(call->startTimeStamp() << 10)+qrand()%1024] = call;
endInsertRows(); endInsertRows();
emit layoutChanged(); emit layoutChanged();
LastUsedNumberModel::instance()->addCall(call); LastUsedNumberModel::instance()->addCall(call);
...@@ -232,7 +312,7 @@ void HistoryModel::add(Call* call) ...@@ -232,7 +312,7 @@ void HistoryModel::add(Call* call)
// Loop until it find a compatible backend // Loop until it find a compatible backend
//HACK only support a single active history backend //HACK only support a single active history backend
if (!call->backend()) { if (!call->backend()) {
foreach (AbstractHistoryBackend* backend,m_lBackends) { foreach (AbstractHistoryBackend* backend, d_ptr->m_lBackends) {
if (backend->supportedFeatures() & AbstractHistoryBackend::ADD) { if (backend->supportedFeatures() & AbstractHistoryBackend::ADD) {
if (backend->append(call)) { if (backend->append(call)) {
call->setBackend(backend); call->setBackend(backend);
...@@ -275,21 +355,21 @@ int HistoryModel::historyLimit() const ...@@ -275,21 +355,21 @@ int HistoryModel::historyLimit() const
* * * *
****************************************************************************/ ****************************************************************************/
void HistoryModel::reloadCategories() void HistoryModelPrivate::reloadCategories()
{ {
beginResetModel(); q_ptr->beginResetModel();
m_hCategories.clear(); m_hCategories.clear();
m_hCategoryByName.clear(); m_hCategoryByName.clear();
foreach(TopLevelItem* item, m_lCategoryCounter) { foreach(HistoryTopLevelItem* item, m_lCategoryCounter) {
delete item; delete item;
} }
m_lCategoryCounter.clear(); m_lCategoryCounter.clear();
foreach(Call* call, m_sHistoryCalls) { foreach(Call* call, m_sHistoryCalls) {
TopLevelItem* category = getCategory(call); HistoryTopLevelItem* category = getCategory(call);
if (category) { if (category) {
HistoryItem* item = new HistoryItem(call); HistoryItem* item = new HistoryItem(call);
item->m_Index = category->m_lChildren.size(); item->m_Index = category->m_lChildren.size();
item->m_pNode = new HistoryItemNode(this,call,item); item->m_pNode = new HistoryItemNode(q_ptr,call,item);
connect(item->m_pNode,SIGNAL(changed(QModelIndex)),this,SLOT(slotChanged(QModelIndex))); connect(item->m_pNode,SIGNAL(changed(QModelIndex)),this,SLOT(slotChanged(QModelIndex)));
item->m_pParent = category; item->m_pParent = category;
category->m_lChildren << item; category->m_lChildren << item;
...@@ -297,15 +377,15 @@ void HistoryModel::reloadCategories() ...@@ -297,15 +377,15 @@ void HistoryModel::reloadCategories()
else else
qDebug() << "ERROR count"; qDebug() << "ERROR count";
} }
endResetModel(); q_ptr->endResetModel();
emit layoutAboutToBeChanged(); emit q_ptr->layoutAboutToBeChanged();
emit layoutChanged(); emit q_ptr->layoutChanged();
emit dataChanged(index(0,0),index(rowCount()-1,0)); emit q_ptr->dataChanged(q_ptr->index(0,0),q_ptr->index(q_ptr->rowCount()-1,0));
} }
void HistoryModel::slotChanged(const QModelIndex& idx) void HistoryModelPrivate::slotChanged(const QModelIndex& idx)
{ {
emit dataChanged(idx,idx); emit q_ptr->dataChanged(idx,idx);
} }
bool HistoryModel::setData( const QModelIndex& idx, const QVariant &value, int role) bool HistoryModel::setData( const QModelIndex& idx, const QVariant &value, int role)
...@@ -330,10 +410,10 @@ QVariant HistoryModel::data( const QModelIndex& idx, int role) const ...@@ -330,10 +410,10 @@ QVariant HistoryModel::data( const QModelIndex& idx, int role) const
case CategorizedCompositeNode::Type::TOP_LEVEL: case CategorizedCompositeNode::Type::TOP_LEVEL:
switch (role) { switch (role) {
case Qt::DisplayRole: case Qt::DisplayRole:
return static_cast<TopLevelItem*>(modelItem)->m_NameStr; return static_cast<HistoryTopLevelItem*>(modelItem)->m_NameStr;
case Call::Role::FuzzyDate: case Call::Role::FuzzyDate:
case Call::Role::Date: case Call::Role::Date:
return m_lCategoryCounter.size() - static_cast<TopLevelItem*>(modelItem)->m_Index; return d_ptr->m_lCategoryCounter.size() - static_cast<HistoryTopLevelItem*>(modelItem)->m_Index;
default: default:
break; break;
} }
...@@ -343,8 +423,8 @@ QVariant HistoryModel::data( const QModelIndex& idx, int role) const ...@@ -343,8 +423,8 @@ QVariant HistoryModel::data( const QModelIndex& idx, int role) const
return QVariant(modelItem->dropState()); return QVariant(modelItem->dropState());
else { else {
const int parRow = idx.parent().row(); const int parRow = idx.parent().row();
const TopLevelItem* parTli = m_lCategoryCounter[parRow]; const HistoryTopLevelItem* parTli = d_ptr->m_lCategoryCounter[parRow];
if (m_lCategoryCounter.size() > parRow && parRow >= 0 && parTli && parTli->m_lChildren.size() > idx.row()) if (d_ptr->m_lCategoryCounter.size() > parRow && parRow >= 0 && parTli && parTli->m_lChildren.size() > idx.row())
return parTli->m_lChildren[idx.row()]->call()->roleData((Call::Role)role); return parTli->m_lChildren[idx.row()]->call()->roleData((Call::Role)role);
} }
break; break;
...@@ -370,13 +450,13 @@ QVariant HistoryModel::headerData(int section, Qt::Orientation orientation, int ...@@ -370,13 +450,13 @@ QVariant HistoryModel::headerData(int section, Qt::Orientation orientation, int
int HistoryModel::rowCount( const QModelIndex& parentIdx ) const int HistoryModel::rowCount( const QModelIndex& parentIdx ) const
{ {
if ((!parentIdx.isValid()) || (!parentIdx.internalPointer())) { if ((!parentIdx.isValid()) || (!parentIdx.internalPointer())) {
return m_lCategoryCounter.size(); return d_ptr->m_lCategoryCounter.size();
} }
else { else {
CategorizedCompositeNode* node = static_cast<CategorizedCompositeNode*>(parentIdx.internalPointer()); CategorizedCompositeNode* node = static_cast<CategorizedCompositeNode*>(parentIdx.internalPointer());
switch(node->type()) { switch(node->type()) {
case CategorizedCompositeNode::Type::TOP_LEVEL: case CategorizedCompositeNode::Type::TOP_LEVEL:
return ((TopLevelItem*)node)->m_lChildren.size(); return ((HistoryTopLevelItem*)node)->m_lChildren.size();
case CategorizedCompositeNode::Type::CALL: case CategorizedCompositeNode::Type::CALL:
case CategorizedCompositeNode::Type::NUMBER: case CategorizedCompositeNode::Type::NUMBER:
case CategorizedCompositeNode::Type::BOOKMARK: case CategorizedCompositeNode::Type::BOOKMARK:
...@@ -408,7 +488,7 @@ QModelIndex HistoryModel::parent( const QModelIndex& idx) const ...@@ -408,7 +488,7 @@ QModelIndex HistoryModel::parent( const QModelIndex& idx) const
CategorizedCompositeNode* modelItem = static_cast<CategorizedCompositeNode*>(idx.internalPointer()); CategorizedCompositeNode* modelItem = static_cast<CategorizedCompositeNode*>(idx.internalPointer());
if (modelItem && modelItem->type() == CategorizedCompositeNode::Type::CALL) { if (modelItem && modelItem->type() == CategorizedCompositeNode::Type::CALL) {
const Call* call = (Call*)((CategorizedCompositeNode*)(idx.internalPointer()))->getSelf(); const Call* call = (Call*)((CategorizedCompositeNode*)(idx.internalPointer()))->getSelf();
TopLevelItem* tli = const_cast<HistoryModel*>(this)->getCategory(call); HistoryTopLevelItem* tli = d_ptr->getCategory(call);
if (tli) if (tli)
return HistoryModel::index(tli->modelRow,0); return HistoryModel::index(tli->modelRow,0);
} }
...@@ -418,16 +498,16 @@ QModelIndex HistoryModel::parent( const QModelIndex& idx) const ...@@ -418,16 +498,16 @@ QModelIndex HistoryModel::parent( const QModelIndex& idx) const
QModelIndex HistoryModel::index( int row, int column, const QModelIndex& parentIdx) const QModelIndex HistoryModel::index( int row, int column, const QModelIndex& parentIdx) const
{ {
if (!parentIdx.isValid()) { if (!parentIdx.isValid()) {
if (row >= 0 && m_lCategoryCounter.size() > row) { if (row >= 0 && d_ptr->m_lCategoryCounter.size() > row) {
return createIndex(row,column,(void*)m_lCategoryCounter[row]); return createIndex(row,column,(void*)d_ptr->m_lCategoryCounter[row]);
} }
} }
else { else {
CategorizedCompositeNode* node = static_cast<CategorizedCompositeNode*>(parentIdx.internalPointer()); CategorizedCompositeNode* node = static_cast<CategorizedCompositeNode*>(parentIdx.internalPointer());
switch(node->type()) { switch(node->type()) {
case CategorizedCompositeNode::Type::TOP_LEVEL: case CategorizedCompositeNode::Type::TOP_LEVEL:
if (((TopLevelItem*)node)->m_lChildren.size() > row) if (((HistoryTopLevelItem*)node)->m_lChildren.size() > row)
return createIndex(row,column,(void*)static_cast<CategorizedCompositeNode*>(((TopLevelItem*)node)->m_lChildren[row])); return createIndex(row,column,(void*)static_cast<CategorizedCompositeNode*>(((HistoryTopLevelItem*)node)->m_lChildren[row]));
break; break;
case CategorizedCompositeNode::Type::CALL: case CategorizedCompositeNode::Type::CALL:
case CategorizedCompositeNode::Type::NUMBER: case CategorizedCompositeNode::Type::NUMBER:
...@@ -452,7 +532,7 @@ bool HistoryModel::insertRows( int row, int count, const QModelIndex & parent) ...@@ -452,7 +532,7 @@ bool HistoryModel::insertRows( int row, int count, const QModelIndex & parent)
QStringList HistoryModel::mimeTypes() const QStringList HistoryModel::mimeTypes() const
{ {
return m_lMimes; return d_ptr->m_lMimes;
} }
QMimeData* HistoryModel::mimeData(const QModelIndexList &indexes) const QMimeData* HistoryModel::mimeData(const QModelIndexList &indexes) const
...@@ -503,17 +583,17 @@ bool HistoryModel::dropMimeData(const QMimeData *mime, Qt::DropAction action, in ...@@ -503,17 +583,17 @@ bool HistoryModel::dropMimeData(const QMimeData *mime, Qt::DropAction action, in
bool HistoryModel::hasBackends() const bool HistoryModel::hasBackends() const
{ {
return m_lBackends.size(); return d_ptr->m_lBackends.size();
} }
bool HistoryModel::hasEnabledBackends() const bool HistoryModel::hasEnabledBackends() const
{ {
return m_lBackends.size(); return d_ptr->m_lBackends.size();
} }
void HistoryModel::addBackend(AbstractHistoryBackend* backend, LoadOptions options) void HistoryModel::addBackend(AbstractHistoryBackend* backend, LoadOptions options)
{ {
m_lBackends << backend; d_ptr->m_lBackends << backend;
connect(backend,SIGNAL(newHistoryCallAdded(Call*)),this,SLOT(add(Call*))); connect(backend,SIGNAL(newHistoryCallAdded(Call*)),this,SLOT(add(Call*)));
if (options & LoadOptions::FORCE_ENABLED || ItemModelStateSerializationVisitor::instance()->isChecked(backend)) if (options & LoadOptions::FORCE_ENABLED || ItemModelStateSerializationVisitor::instance()->isChecked(backend))
backend->load(); backend->load();
...@@ -523,7 +603,7 @@ void HistoryModel::addBackend(AbstractHistoryBackend* backend, LoadOptions optio ...@@ -523,7 +603,7 @@ void HistoryModel::addBackend(AbstractHistoryBackend* backend, LoadOptions optio
///Call all backends that support clearing ///Call all backends that support clearing
void HistoryModel::clearAllBackends() const void HistoryModel::clearAllBackends() const
{ {
foreach (AbstractHistoryBackend* backend,m_lBackends) { foreach (AbstractHistoryBackend* backend, d_ptr->m_lBackends) {
if (backend->supportedFeatures() & AbstractHistoryBackend::ADD) { if (backend->supportedFeatures() & AbstractHistoryBackend::ADD) {
backend->clear(); backend->clear();
} }
...@@ -550,12 +630,12 @@ CommonItemBackendModel* HistoryModel::backendModel() const ...@@ -550,12 +630,12 @@ CommonItemBackendModel* HistoryModel::backendModel() const
const QVector<AbstractHistoryBackend*> HistoryModel::backends() const const QVector<AbstractHistoryBackend*> HistoryModel::backends() const
{ {
return m_lBackends; return d_ptr->m_lBackends;
} }
const QVector<AbstractHistoryBackend*> HistoryModel::enabledBackends() const const QVector<AbstractHistoryBackend*> HistoryModel::enabledBackends() const
{ {
return m_lBackends; return d_ptr->m_lBackends;
} }
///Return valid payload types ///Return valid payload types
...@@ -566,8 +646,10 @@ int HistoryModel::acceptedPayloadTypes() const ...@@ -566,8 +646,10 @@ int HistoryModel::acceptedPayloadTypes() const
void HistoryModel::setCategoryRole(Call::Role role) void HistoryModel::setCategoryRole(Call::Role role)
{ {
if (m_Role != role) { if (d_ptr->m_Role != role) {
m_Role = role; d_ptr->m_Role = role;
reloadCategories(); d_ptr->reloadCategories();
} }
} }
#include <historymodel.moc>
src/historymodel.h
+ 23
− 82
View file @ 33ce5029
...@@ -35,6 +35,7 @@ typedef QList<Call*> CallList; ...@@ -35,6 +35,7 @@ typedef QList<Call*> CallList;
class HistoryItemNode; class HistoryItemNode;
class AbstractHistoryBackend; class AbstractHistoryBackend;
class HistoryModelPrivate;
///HistoryModel: History call manager ///HistoryModel: History call manager
class LIB_EXPORT HistoryModel : public QAbstractItemModel, public CommonBackendManagerInterface<AbstractHistoryBackend> { class LIB_EXPORT HistoryModel : public QAbstractItemModel, public CommonBackendManagerInterface<AbstractHistoryBackend> {
...@@ -44,6 +45,8 @@ class LIB_EXPORT HistoryModel : public QAbstractItemModel, public CommonBackendM ...@@ -44,6 +45,8 @@ class LIB_EXPORT HistoryModel : public QAbstractItemModel, public CommonBackendM
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
public: public:
friend class HistoryItemNode; friend class HistoryItemNode;
friend class HistoryTopLevelItem;
friend class TopLevelItem;
//Properties //Properties
Q_PROPERTY(bool hasBackends READ hasBackends ) Q_PROPERTY(bool hasBackends READ hasBackends )
...@@ -55,12 +58,12 @@ public: ...@@ -55,12 +58,12 @@ public:
int acceptedPayloadTypes () const; int acceptedPayloadTypes () const;
bool isHistoryLimited () const; bool isHistoryLimited () const;
int historyLimit () const; int historyLimit () const;
virtual bool hasBackends () const;
virtual bool hasEnabledBackends () const;
const CallMap getHistoryCalls () const; const CallMap getHistoryCalls () const;
virtual const QVector<AbstractHistoryBackend*> backends() const; virtual bool hasBackends () const override;
virtual const QVector<AbstractHistoryBackend*> enabledBackends() const; virtual bool hasEnabledBackends () const override;
virtual CommonItemBackendModel* backendModel() const; virtual const QVector<AbstractHistoryBackend*> backends() const override;
virtual const QVector<AbstractHistoryBackend*> enabledBackends() const override;
virtual CommonItemBackendModel* backendModel() const override;
//Setters //Setters
void setCategoryRole(Call::Role role); void setCategoryRole(Call::Role role);
...@@ -73,79 +76,33 @@ public: ...@@ -73,79 +76,33 @@ public:
virtual bool enableBackend(AbstractHistoryBackend* backend, bool enabled); virtual bool enableBackend(AbstractHistoryBackend* backend, bool enabled);
//Model implementation //Model implementation
virtual bool setData ( const QModelIndex& index, const QVariant &value, int role ); virtual bool setData ( const QModelIndex& index, const QVariant &value, int role ) override;
virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const; virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const override;
virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const; virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const override;
virtual Qt::ItemFlags flags ( const QModelIndex& index ) const; virtual Qt::ItemFlags flags ( const QModelIndex& index ) const override;
virtual int columnCount ( const QModelIndex& parent = QModelIndex() ) const __attribute__ ((const)); virtual int columnCount ( const QModelIndex& parent = QModelIndex() ) const override __attribute__ ((const));
virtual QModelIndex parent ( const QModelIndex& index ) const; virtual QModelIndex parent ( const QModelIndex& index ) const override;
virtual QModelIndex index ( int row, int column, const QModelIndex& parent=QModelIndex()) const; virtual QModelIndex index ( int row, int column, const QModelIndex& parent=QModelIndex()) const override;
virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
virtual QStringList mimeTypes ( ) const; virtual QStringList mimeTypes ( ) const override;
virtual QMimeData* mimeData ( const QModelIndexList &indexes ) const; virtual QMimeData* mimeData ( const QModelIndexList &indexes ) const override;
virtual bool dropMimeData( const QMimeData*, Qt::DropAction, int, int, const QModelIndex& ); virtual bool dropMimeData( const QMimeData*, Qt::DropAction, int, int, const QModelIndex& ) override;
virtual bool insertRows ( int row, int count, const QModelIndex & parent = QModelIndex() ); virtual bool insertRows ( int row, int count, const QModelIndex & parent = QModelIndex() ) override;
private: private:
class TopLevelItem;
//Model
class HistoryItem : public CategorizedCompositeNode {
public:
explicit HistoryItem(Call* call);
virtual ~HistoryItem();
virtual QObject* getSelf() const;
Call* call() const;
int m_Index;
TopLevelItem* m_pParent;
HistoryItemNode* m_pNode;
private:
Call* m_pCall;
};
class TopLevelItem : public CategorizedCompositeNode,public QObject {
friend class HistoryModel;
public:
virtual QObject* getSelf() const;
virtual ~TopLevelItem();
int m_Index;
int m_AbsoluteIndex;
QVector<HistoryItem*> m_lChildren;
private:
explicit TopLevelItem(const QString& name, int index);
QString m_NameStr;
int modelRow;
};
//Constructor //Constructor
explicit HistoryModel(); explicit HistoryModel();
~HistoryModel(); ~HistoryModel();
QScopedPointer<HistoryModelPrivate> d_ptr;
//Helpers Q_DECLARE_PRIVATE(HistoryModel)
TopLevelItem* getCategory(const Call* call);
//Static attributes //Static attributes
static HistoryModel* m_spInstance; static HistoryModel* m_spInstance;
//Attributes
static CallMap m_sHistoryCalls;
QVector<AbstractHistoryBackend*> m_lBackends;
//Model categories
QList<TopLevelItem*> m_lCategoryCounter ;
QHash<int,TopLevelItem*> m_hCategories ;
QHash<QString,TopLevelItem*> m_hCategoryByName ;
int m_Role ;
QStringList m_lMimes ;
public Q_SLOTS: public Q_SLOTS:
void add(Call* call); void add(Call* call);
private Q_SLOTS:
void reloadCategories();
void slotChanged(const QModelIndex& idx);
Q_SIGNALS: Q_SIGNALS:
///Emitted when the history change (new items, cleared) ///Emitted when the history change (new items, cleared)
void historyChanged ( ); void historyChanged ( );
...@@ -154,20 +111,4 @@ Q_SIGNALS: ...@@ -154,20 +111,4 @@ Q_SIGNALS:
void newBackendAdded(AbstractHistoryBackend* backend); void newBackendAdded(AbstractHistoryBackend* backend);
}; };
class HistoryItemNode : public QObject //TODO remove this once Qt4 support is dropped
{
Q_OBJECT
public:
HistoryItemNode(HistoryModel* m, Call* c, HistoryModel::HistoryItem* backend);
Call* m_pCall;
private:
HistoryModel::HistoryItem* m_pBackend;
HistoryModel* m_pModel;
private Q_SLOTS:
void slotNumberChanged();
Q_SIGNALS:
void changed(const QModelIndex& idx);
};
#endif #endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment