alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SortModel->SortFilterModel

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1190655
This commit is contained in:
Marco Martin 2010-10-28 13:10:10 +00:00
parent 1b1ea1a1b3
commit 0394675156
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
declarativeimports/core/corebindingsplugin.cpp
View File

@ -45,7 +45,7 @@ void CoreBindingsPlugin::registerTypes(const char *uri)
qmlRegisterType<Plasma::DataSource>(uri, 0, 1, "DataSource"); qmlRegisterType<Plasma::DataSource>(uri, 0, 1, "DataSource");
qmlRegisterType<Plasma::DataModel>(uri, 0, 1, "DataModel"); qmlRegisterType<Plasma::DataModel>(uri, 0, 1, "DataModel");
qmlRegisterType<Plasma::SortModel>(uri, 0, 1, "SortModel"); qmlRegisterType<Plasma::SortFilterModel>(uri, 0, 1, "SortFilterModel");
qmlRegisterInterface<Plasma::Service>("Service"); qmlRegisterInterface<Plasma::Service>("Service");
qRegisterMetaType<Plasma::Service*>("Service"); qRegisterMetaType<Plasma::Service*>("Service");

31
declarativeimports/core/datamodel.cpp
View File

@ -25,18 +25,18 @@
namespace Plasma namespace Plasma
{ {
SortModel::SortModel(QObject* parent) SortFilterModel::SortFilterModel(QObject* parent)
: QSortFilterProxyModel(parent) : QSortFilterProxyModel(parent)
{ {
setObjectName("SortModel"); setObjectName("SortFilterModel");
setDynamicSortFilter(true); setDynamicSortFilter(true);
} }
SortModel::~SortModel() SortFilterModel::~SortFilterModel()
{ {
} }
void SortModel::syncRoleNames() void SortFilterModel::syncRoleNames()
{ {
m_roleIds.clear(); m_roleIds.clear();
@ -49,7 +49,7 @@ void SortModel::syncRoleNames()
setSortRole(m_sortRole); setSortRole(m_sortRole);
} }
int SortModel::roleNameToId(const QString &name) int SortFilterModel::roleNameToId(const QString &name)
{ {
if (!m_roleIds.contains(name)) { if (!m_roleIds.contains(name)) {
return -1; return -1;
@ -57,7 +57,7 @@ int SortModel::roleNameToId(const QString &name)
return m_roleIds.value(name); return m_roleIds.value(name);
} }
void SortModel::setModel(QObject *source) void SortFilterModel::setModel(QObject *source)
{ {
QAbstractItemModel *model = qobject_cast<QAbstractItemModel *>(source); QAbstractItemModel *model = qobject_cast<QAbstractItemModel *>(source);
if (!model) { if (!model) {
@ -72,40 +72,40 @@ void SortModel::setModel(QObject *source)
void SortModel::setFilterRegExp(const QString &exp) void SortFilterModel::setFilterRegExp(const QString &exp)
{ {
QSortFilterProxyModel::setFilterRegExp(QRegExp(exp)); QSortFilterProxyModel::setFilterRegExp(QRegExp(exp));
} }
QString SortModel::filterRegExp() const QString SortFilterModel::filterRegExp() const
{ {
return QSortFilterProxyModel::filterRegExp().pattern(); return QSortFilterProxyModel::filterRegExp().pattern();
} }
void SortModel::setFilterRole(const QString &role) void SortFilterModel::setFilterRole(const QString &role)
{ {
QSortFilterProxyModel::setFilterRole(roleNameToId(role)); QSortFilterProxyModel::setFilterRole(roleNameToId(role));
m_filterRole = role; m_filterRole = role;
} }
QString SortModel::filterRole() const QString SortFilterModel::filterRole() const
{ {
return m_filterRole; return m_filterRole;
} }
void SortModel::setSortRole(const QString &role) void SortFilterModel::setSortRole(const QString &role)
{ {
QSortFilterProxyModel::setSortRole(roleNameToId(role)); QSortFilterProxyModel::setSortRole(roleNameToId(role));
m_sortRole = role; m_sortRole = role;
sort(0, sortOrder()); sort(0, sortOrder());
} }
QString SortModel::sortRole() const QString SortFilterModel::sortRole() const
{ {
return m_sortRole; return m_sortRole;
} }
void SortModel::setSortOrder(const Qt::SortOrder order) void SortFilterModel::setSortOrder(const Qt::SortOrder order)
{ {
sort(0, order); sort(0, order);
} }
@ -113,11 +113,11 @@ void SortModel::setSortOrder(const Qt::SortOrder order)
DataModel::DataModel(SortModel* parent) DataModel::DataModel(QObject* parent)
: QAbstractItemModel(parent), : QAbstractItemModel(parent),
// m_sortModel(parent),
m_dataSource(0) m_dataSource(0)
{ {
setObjectName("DataModel");
} }
DataModel::~DataModel() DataModel::~DataModel()
@ -285,4 +285,5 @@ int DataModel::roleNameToId(const QString &name)
} }
} }
#include "datamodel.moc" #include "datamodel.moc"

8
declarativeimports/core/datamodel.h
View File

@ -34,7 +34,7 @@ class DataSource;
class DataModel; class DataModel;
class SortModel : public QSortFilterProxyModel class SortFilterModel : public QSortFilterProxyModel
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QObject *sourceModel READ sourceModel WRITE setModel) Q_PROPERTY(QObject *sourceModel READ sourceModel WRITE setModel)
@ -47,8 +47,8 @@ class SortModel : public QSortFilterProxyModel
friend class DataModel; friend class DataModel;
public: public:
SortModel(QObject* parent=0); SortFilterModel(QObject* parent=0);
~SortModel(); ~SortFilterModel();
//FIXME: find a way to make QML understnd QAbstractItemModel //FIXME: find a way to make QML understnd QAbstractItemModel
void setModel(QObject *source); void setModel(QObject *source);
@ -83,7 +83,7 @@ class DataModel : public QAbstractItemModel
Q_PROPERTY(QString key READ key WRITE setKey) Q_PROPERTY(QString key READ key WRITE setKey)
public: public:
DataModel(SortModel* parent=0); DataModel(QObject* parent=0);
~DataModel(); ~DataModel();
void setDataSource(QObject *source); void setDataSource(QObject *source);