0dc9484 · unity8 · git.iko.soy

git.iko.soy/unity8

mege

commit0dc94849d12cd5af10c0f6b9ac39796d985af428 authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 29 Oct 2015, 14:35 (11 years ago) parent196029b 086341a

2 files changed+5−3

compare with xenial

unifiedsplit

tests/mocks/Unity/fake_navigation.cpp+1−1 tests/mocks/Unity/fake_optionselectoroptions.cpp+4−2

tests/mocks/Unity/fake_navigation.cpp+1−1

@@ -106,7 +106,7 @@ QVariant Navigation::data(const QModelIndex &index, int role) const

106106 case RoleLabel:

107107 return QString("%1Child%2").arg(m_navigationId).arg(index.row());

108108 case RoleAllLabel:

109− return "all"+QString("%1Child%2").arg(m_navigationId).arg(index.row());

109+ return QString("all%1Child%2").arg(m_navigationId).arg(index.row());

110110 case RoleHasChildren:

111111 return (m_navigationId == "root" && index.row() != 3) || (m_navigationId == "middle4");

112112 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: