git.iko.soy/unity8
on xenial help sign in
build
434846eAlbert Astals Cid
tests/mocks/Unity/fake_navigation.cpp+1−1
compare with xenial
unifiedsplit
@@ -104,7 +104,7 @@ QVariant Navigation::data(const QModelIndex &index, int role) const
104 case RoleLabel:
104 case RoleLabel:
105 return QString("%1Child%2").arg(m_navigationId).arg(index.row());
105 return QString("%1Child%2").arg(m_navigationId).arg(index.row());
106 case RoleAllLabel:
106 case RoleAllLabel:
107− return "all"+QString("%1Child%2").arg(m_navigationId).arg(index.row());
107+ return QString("all%1Child%2").arg(m_navigationId).arg(index.row());
108 case RoleHasChildren:
108 case RoleHasChildren:
109 return m_navigationId == "root" && index.row() != 3;
109 return m_navigationId == "root" && index.row() != 3;
110 case RoleIsActive:
110 case RoleIsActive:
tests/mocks/Unity/fake_optionselectoroptions.cpp+4−2
@@ -39,8 +39,10 @@ QVariant FakeOptionSelectorOptions::data(const QModelIndex &index, int role) con
39 return QVariant();
39 return QVariant();
40
40
41 switch (role) {
41 switch (role) {
42− case RoleOptionId:
42+ case RoleOptionId: {
43− return static_cast<FakeOptionSelectorFilter*>(parent())->filterId() + QString::number(row);
43+ const QString id = static_cast<FakeOptionSelectorFilter*>(parent())->filterId() + QString::number(row);
44+ return id;
45+ }
44 case RoleOptionLabel:
46 case RoleOptionLabel:
45 return m_optionLabels[row];
47 return m_optionLabels[row];
46 case RoleOptionChecked:
48 case RoleOptionChecked: