mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-02 06:35:52 +08:00
refs #434 CPropertyIndexVariantMap: removed operator templates and replaced CVariant comparison operators with a named method, matches().
This commit is contained in:
@@ -31,10 +31,10 @@ namespace BlackMisc
|
||||
return !(b == a);
|
||||
}
|
||||
|
||||
bool operator==(const CPropertyIndexVariantMap &indexMap, const CVariant &variant)
|
||||
bool CPropertyIndexVariantMap::matchesVariant(const CVariant &variant) const
|
||||
{
|
||||
if (indexMap.isEmpty()) return indexMap.isWildcard();
|
||||
const auto &map = indexMap.map();
|
||||
if (this->isEmpty()) return this->isWildcard();
|
||||
const auto &map = this->map();
|
||||
for (auto it = map.begin(); it != map.end(); ++it)
|
||||
{
|
||||
// QVariant cannot be compared directly
|
||||
@@ -45,21 +45,6 @@ namespace BlackMisc
|
||||
return true;
|
||||
}
|
||||
|
||||
bool operator!=(const CPropertyIndexVariantMap &indexMap, const CVariant &variant)
|
||||
{
|
||||
return !(indexMap == variant);
|
||||
}
|
||||
|
||||
bool operator==(const CVariant &variant, const CPropertyIndexVariantMap &valueMap)
|
||||
{
|
||||
return valueMap == variant;
|
||||
}
|
||||
|
||||
bool operator!=(const CVariant &variant, const CPropertyIndexVariantMap &valueMap)
|
||||
{
|
||||
return !(valueMap == variant);
|
||||
}
|
||||
|
||||
QString CPropertyIndexVariantMap::convertToQString(bool i18n) const
|
||||
{
|
||||
if (this->isEmpty()) return QString("{wildcard: %1}").arg(this->m_wildcard ? "true" : "false");
|
||||
|
||||
Reference in New Issue
Block a user