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

fix datamodel (adapt to api change)

Browse Source 
also, change some connects to the new syntax, so next time a thing like
that gets catched
This commit is contained in:
Marco Martin 2013-08-28 22:11:55 +02:00
parent 68a693af67
commit 4c79f8fcff
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/declarativeimports/core/datamodel.cpp
View File

@ -188,7 +188,7 @@ DataModel::~DataModel()
{ {
} }
void DataModel::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data &data) void DataModel::dataUpdated(const QString &sourceName, const QVariantMap &data)
{ {
if (!m_sourceFilter.isEmpty() && m_sourceFilterRE.isValid() && !m_sourceFilterRE.exactMatch(sourceName)) { if (!m_sourceFilter.isEmpty() && m_sourceFilterRE.isValid() && !m_sourceFilterRE.exactMatch(sourceName)) {
return; return;
@ -259,10 +259,12 @@ void DataModel::setDataSource(QObject *object)
++i; ++i;
} }
connect(m_dataSource, SIGNAL(newData(const QString &, const Plasma::DataEngine::Data &)), connect(m_dataSource, &DataSource::newData,
this, SLOT(dataUpdated(const QString &, const Plasma::DataEngine::Data &))); this, &DataModel::dataUpdated);
connect(m_dataSource, SIGNAL(sourceRemoved(const QString &)), this, SLOT(removeSource(const QString &))); connect(m_dataSource, &DataSource::sourceRemoved,
connect(m_dataSource, SIGNAL(sourceDisconnected(const QString &)), this, SLOT(removeSource(const QString &))); this, &DataModel::removeSource);
connect(m_dataSource, &DataSource::sourceDisconnected,
this, &DataModel::removeSource);
} }
QObject *DataModel::dataSource() const QObject *DataModel::dataSource() const

2
src/declarativeimports/core/datamodel.h
View File

@ -196,7 +196,7 @@ Q_SIGNALS:
void filterRegExpChanged(const QString &); void filterRegExpChanged(const QString &);
private Q_SLOTS: private Q_SLOTS:
void dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data &data); void dataUpdated(const QString &sourceName, const QVariantMap &data);
void removeSource(const QString &sourceName); void removeSource(const QString &sourceName);
private: private: