arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-15 06:45:48 +00:00
Code Issues Projects Releases Wiki Activity

* small build changes

Browse Source 
* drop cast (they were added to try to avoid possible crash)
This commit is contained in:
arcan1s
2015-10-06 06:49:24 +03:00
parent c4612d84ed
commit 69c1f0ed5a
13 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/awesome-widget/plugin/awdataengineaggregator.cpp
View File

@ -57,8 +57,8 @@ void AWDataEngineAggregator::connectVisualization()
{
qCDebug(LOG_AW);
connect(this, SIGNAL(updateData(QString, QVariantHash)),
parent(), SLOT(dataUpdated(QString, QVariantHash)));
connect(this, SIGNAL(updateData(QString, QVariantMap)),
parent(), SLOT(dataUpdated(QString, QVariantMap)));
return static_cast<AWKeys *>(parent())->unlock();
}
@ -68,8 +68,8 @@ void AWDataEngineAggregator::disconnectVisualization()
{
qCDebug(LOG_AW);
disconnect(this, SIGNAL(updateData(QString, QVariantHash)),
parent(), SLOT(dataUpdated(QString, QVariantHash)));
disconnect(this, SIGNAL(updateData(QString, QVariantMap)),
parent(), SLOT(dataUpdated(QString, QVariantMap)));
return QTimer::singleShot(5 * m_interval, this, SLOT(connectVisualization()));
}
@ -101,7 +101,7 @@ void AWDataEngineAggregator::dataUpdated(const QString sourceName, const Plasma:
qCDebug(LOG_AW) << "Source" << sourceName;
qCDebug(LOG_AW) << "Data" << data;
return emit(updateData(QString(sourceName), qvariant_cast<QVariantHash>(data)));
return emit(updateData(sourceName, data));
}

2
sources/awesome-widget/plugin/awdataengineaggregator.h
View File

@ -35,7 +35,7 @@ public:
void setInterval(const int _interval);
signals:
void updateData(const QString sourceName, const QVariantHash sdata);
void updateData(const QString sourceName, const QVariantMap sdata);
public slots:
// additional methods to control this and visualization

5
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -85,6 +85,7 @@ void AWKeys::unlock()
{
qCDebug(LOG_AW);
qCWarning(LOG_AW) << "Unlock stream";
lock = false;
}
@ -404,7 +405,7 @@ void AWKeys::addDevice(const QString source)
}
void AWKeys::dataUpdated(const QString sourceName, const QVariantHash data)
void AWKeys::dataUpdated(const QString sourceName, const QVariantMap data)
{
qCDebug(LOG_AW);
qCDebug(LOG_AW) << "Source" << sourceName;
@ -699,7 +700,7 @@ QString AWKeys::parsePattern(QString pattern) const
}
void AWKeys::setDataBySource(const QString sourceName, const QVariantHash data)
void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data)
{
qCDebug(LOG_AW);
qCDebug(LOG_AW) << "Source" << sourceName;

4
sources/awesome-widget/plugin/awkeys.h
View File

@ -60,7 +60,7 @@ public:
public slots:
void addDevice(const QString source);
void dataUpdated(const QString sourceName, const QVariantHash data);
void dataUpdated(const QString sourceName, const QVariantMap data);
signals:
void dropSourceFromDataengine(const QString source);
@ -78,7 +78,7 @@ private:
void addKeyToCache(const QString type, const QString key = QString(""));
void calculateValues();
QString parsePattern(QString pattern) const;
void setDataBySource(const QString sourceName, const QVariantHash data);
void setDataBySource(const QString sourceName, const QVariantMap data);
// objects
AWDataAggregator *dataAggregator = nullptr;
AWDataEngineAggregator *dataEngineAggregator = nullptr;