build
commit434846eb4644a11efc5e66d62b3588e604d4aefa
authorAlbert Astals Cid <albert.astals@canonical.com>
dateThu 29 Oct 2015, 14:34 (11 years ago)
parente720053
tests/mocks/Unity/fake_navigation.cpp+1−1
@@ -104,7 +104,7 @@ QVariant Navigation::data(const QModelIndex &index, int role) const
104104 case RoleLabel:
105105 return QString("%1Child%2").arg(m_navigationId).arg(index.row());
106106 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());
108108 case RoleHasChildren:
109109 return m_navigationId == "root" && index.row() != 3;
110110 case RoleIsActive:
tests/mocks/Unity/fake_optionselectoroptions.cpp+4−2
@@ -39,8 +39,10 @@ QVariant FakeOptionSelectorOptions::data(const QModelIndex &index, int role) con
3939 return QVariant();
4040
4141 switch (role) {
42− case RoleOptionId:
43− return static_cast<FakeOptionSelectorFilter*>(parent())->filterId() + QString::number(row);
42+ case RoleOptionId: {
43+ const QString id = static_cast<FakeOptionSelectorFilter*>(parent())->filterId() + QString::number(row);
44+ return id;
45+ }
4446 case RoleOptionLabel:
4547 return m_optionLabels[row];
4648 case RoleOptionChecked: