Fixes in model set form as described by RP

https://swift-project.slack.com/archives/G96QTUBEG/p1544353355002400

* fixed missing radio button groups
* return values for some functions to detect "changes"
* minor style fixes
This commit is contained in:
Klaus Basan
2018-12-10 01:35:04 +01:00
parent 9b06a159f2
commit 9f408e8319
9 changed files with 176 additions and 115 deletions

View File

@@ -26,7 +26,7 @@ namespace BlackMisc
QString IOrderable::getOrderAsString() const
{
if (this->hasValidOrder()) { return QString::number(this->getOrder()); }
return "-";
return QStringLiteral("-");
}
bool IOrderable::hasValidOrder() const
@@ -37,7 +37,7 @@ namespace BlackMisc
bool IOrderable::canHandleIndex(const CPropertyIndex &index)
{
if (index.isEmpty()) { return false; }
int i = index.frontCasted<int>();
const int i = index.frontCasted<int>();
return (i >= static_cast<int>(IndexOrder)) && (i <= static_cast<int>(IndexOrderString));
}
@@ -45,15 +45,12 @@ namespace BlackMisc
{
if (!index.isEmpty())
{
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexOrder:
return CVariant::fromValue(this->m_order);
case IndexOrderString:
return CVariant::fromValue(this->getOrderAsString());
default:
break;
case IndexOrder: return CVariant::fromValue(this->m_order);
case IndexOrderString: return CVariant::fromValue(this->getOrderAsString());
default: break;
}
}
const QString m = QString("Cannot handle index %1").arg(index.toQString());
@@ -65,12 +62,10 @@ namespace BlackMisc
{
if (!index.isEmpty())
{
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexOrder:
this->setOrder(variant.toInt());
return;
case IndexOrder: this->setOrder(variant.toInt()); return;
case IndexOrderString:
default:
break;