refs #395, refs #413, refs #403 Post merge tasks

* missing exports for new classes
* public non virtual convertToQString, propertyByIndex
* removed left-over of watchdog
* virtual destructor for avionicsbase.h
This commit is contained in:
Klaus Basan
2015-05-07 03:21:45 +02:00
committed by Mathew Sutcliffe
parent e7f65ba0b6
commit f18cfed087
16 changed files with 47 additions and 138 deletions

View File

@@ -82,11 +82,6 @@ namespace BlackMisc
return s;
}
int CPropertyIndexVariantMap::getMetaTypeId() const
{
return qMetaTypeId<CPropertyIndexVariantMap>();
}
void CPropertyIndexVariantMap::marshallToDbus(QDBusArgument &argument) const
{
argument << this->m_values.keys();
@@ -136,12 +131,6 @@ namespace BlackMisc
return CPropertyIndexList::fromImpl(this->m_values.keys());
}
void CPropertyIndexVariantMap::registerMetadata()
{
qRegisterMetaType<CPropertyIndexVariantMap>();
qDBusRegisterMetaType<CPropertyIndexVariantMap>();
}
uint CPropertyIndexVariantMap::getValueHash() const
{
// there is no hash for map, so I use this workaround here