status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes

This commit is contained in:
Patrick von Reth 2014-02-12 12:04:43 +01:00
parent a0b5f45273
commit 286ac4dd98
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/hint.cpp
View File

@ -33,8 +33,8 @@ void Hint::setValue(const QString &key, const QVariant &value)
void Hint::setValue(const QString &key, QObject *value)
{
m_data.insert(key.toLower(), qVariantFromValue(value));
value->setProperty("hint_key",key);
connect(value, SIGNAL(destroyed()), this, SLOT(slotValueDestroyed()));
value->setProperty("hint_key",key.toLower());
connect(value, SIGNAL(destroyed()), this, SLOT(slotValueDestroyed()),Qt::DirectConnection );
}
QVariant Hint::value(const QString &k, const QVariant &defaultValue) const
@ -57,15 +57,17 @@ bool Hint::contains(const QString &key) const
void Hint::setPrivateValue(const void *owner, const QString &key, const QVariant &value)
{
m_privateData.insert(QPair<quintptr,QString>((quintptr)owner,key.toLower()), value);
QPair<quintptr,QString> pk((quintptr)owner,key.toLower());
m_privateData.insert(pk, value);
}
void Hint::setPrivateValue(const void *owner, const QString &key, QObject *value)
{
m_privateData.insert(QPair<quintptr,QString>((quintptr)owner,key.toLower()), qVariantFromValue(value));
value->setProperty("hint_key",key);
QPair<quintptr,QString> pk((quintptr)owner,key.toLower());
m_privateData.insert(pk, qVariantFromValue(value));
value->setProperty("hint_key",key.toLower());
value->setProperty("hint_owner",(quintptr)owner);
connect(value, SIGNAL(destroyed()), this, SLOT(slotValueDestroyed()));
connect(value, SIGNAL(destroyed()), this, SLOT(slotValueDestroyed()), Qt::DirectConnection);
}
@ -85,7 +87,8 @@ QVariant Hint::privateValue(const void *owner, const QString &k, const QVariant
bool Hint::containsPrivateValue(const void *owner, const QString &key) const
{
return m_privateData.contains(QPair<quintptr,QString>((quintptr)owner,key.toLower()));
QPair<quintptr,QString> pk((quintptr)owner,key.toLower());
return m_privateData.contains(pk);
}
void Hint::slotValueDestroyed()
@ -94,11 +97,12 @@ void Hint::slotValueDestroyed()
QString key = o->property("hint_key").toString();
if(!o->property("hint_owner").isNull())
{
m_privateData.take(QPair<quintptr,QString>(o->property("hint_owner").value<quintptr>(), key));
QPair<quintptr,QString> pk(o->property("hint_owner").value<quintptr>(), key);
m_privateData.remove(pk);
}
else
{
m_data.take(key);
m_data.remove(key);
}
}

4
src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
View File

@ -128,9 +128,9 @@ void SnarlNetworkFrontend::handleMessages()
void SnarlNetworkFrontend::callback(Notification &sn, const QString msg)
{
QTcpSocket *client = qobject_cast<QTcpSocket*>(sn.hints().privateValue(this, "clientSocket").value<QObject*>());
if(client && !msg.isEmpty())
if(sn.hints().containsPrivateValue(this, "clientSocket"))
{
QTcpSocket *client = qobject_cast<QTcpSocket*>(sn.hints().privateValue(this, "clientSocket").value<QObject*>());
write(client, QString("%1%2\r\n").arg(msg, QString::number(sn.id())));
}
}