on xenial help sign in
Fixed code styling
dbcb48cNick Dedekind
Dash/DashContent.qml+2−2
@@ -28,7 +28,7 @@ Item {
28 property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
28 property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
29 property alias currentIndex: dashContentList.currentIndex
29 property alias currentIndex: dashContentList.currentIndex
30
30
31− property LensDelegateMapper lens_mapper : LensDelegateMapper {}
31+ property LensDelegateMapper lensMapper : LensDelegateMapper {}
32
32
33 signal movementStarted()
33 signal movementStarted()
34 signal movementEnded()
34 signal movementEnded()
@@ -115,7 +115,7 @@ Item {
115 width: ListView.view.width
115 width: ListView.view.width
116 height: ListView.view.height
116 height: ListView.view.height
117 asynchronous: true
117 asynchronous: true
118− source: lens_mapper.map(lens.id)
118+ source: lensMapper.map(lens.id)
119 onLoaded: {
119 onLoaded: {
120 item.lens = Qt.binding(function() { return lens })
120 item.lens = Qt.binding(function() { return lens })
121 item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
121 item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
tests/qmltests/Dash/qml/FakeLensView.qml+21−21
@@ -28,21 +28,21 @@ FocusScope {
28 signal movementStarted
28 signal movementStarted
29 signal positionedAtBeginning
29 signal positionedAtBeginning
30
30
31− property alias back_color : back.color
31+ property alias backColor : back.color
32
32
33 onEndReached: {
33 onEndReached: {
34− if (shell != undefined && shell.lens_status != undefined) {
34+ if (shell != undefined && shell.lensStatus != undefined) {
35− shell.lens_status[lens.id].endReached++;
35+ shell.lensStatus[lens.id].endReached++;
36 }
36 }
37 }
37 }
38 onMovementStarted: {
38 onMovementStarted: {
39− if (shell != undefined && shell.lens_status != undefined) {
39+ if (shell != undefined && shell.lensStatus != undefined) {
40− shell.lens_status[lens.id].movementStarted++;
40+ shell.lensStatus[lens.id].movementStarted++;
41 }
41 }
42 }
42 }
43 onPositionedAtBeginning: {
43 onPositionedAtBeginning: {
44− if (shell != undefined && shell.lens_status != undefined) {
44+ if (shell != undefined && shell.lensStatus != undefined) {
45− shell.lens_status[lens.id].positionedAtBeginning++;
45+ shell.lensStatus[lens.id].positionedAtBeginning++;
46 }
46 }
47 }
47 }
48
48
@@ -54,30 +54,30 @@ FocusScope {
54
54
55 function randomBg()
55 function randomBg()
56 {
56 {
57− var hex1=new Array("4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F")
57+ var hex1=new Array("4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F")
58− var bg="#"+hex1[Math.floor(Math.random()*hex1.length)]+
58+ var bg="#"+hex1[Math.floor(Math.random()*hex1.length)]+
59− hex1[Math.floor(Math.random()*hex1.length)]+
59+ hex1[Math.floor(Math.random()*hex1.length)]+
60− hex1[Math.floor(Math.random()*hex1.length)]+
60+ hex1[Math.floor(Math.random()*hex1.length)]+
61− hex1[Math.floor(Math.random()*hex1.length)]+
61+ hex1[Math.floor(Math.random()*hex1.length)]+
62− hex1[Math.floor(Math.random()*hex1.length)]+
62+ hex1[Math.floor(Math.random()*hex1.length)]+
63− hex1[Math.floor(Math.random()*hex1.length)]
63+ hex1[Math.floor(Math.random()*hex1.length)]
64− return bg
64+ return bg
65 }
65 }
66
66
67
67
68 ListView {
68 ListView {
69− id: list_view
69+ id: listView
70 anchors.fill: parent
70 anchors.fill: parent
71 model: lens ? lens.categories : null
71 model: lens ? lens.categories : null
72 orientation: ListView.Vertical
72 orientation: ListView.Vertical
73
73
74 delegate: Column {
74 delegate: Column {
75 id: column
75 id: column
76− width: list_view.width
76+ width: listView.width
77 height: childrenRect.height
77 height: childrenRect.height
78
78
79 Rectangle {
79 Rectangle {
80− width: list_view.width
80+ width: listView.width
81 height: units.gu(3)
81 height: units.gu(3)
82 color: randomBg()
82 color: randomBg()
83
83
@@ -90,17 +90,17 @@ FocusScope {
90 }
90 }
91 }
91 }
92 GridView {
92 GridView {
93− id: results_grid
93+ id: resultsGrid
94 model: results
94 model: results
95 cellWidth: units.gu(10); cellHeight: units.gu(10)
95 cellWidth: units.gu(10); cellHeight: units.gu(10)
96 height: childrenRect.height
96 height: childrenRect.height
97− width: list_view.width
97+ width: listView.width
98 interactive: false
98 interactive: false
99
99
100 delegate: Component {
100 delegate: Component {
101 id: resultDelegate
101 id: resultDelegate
102 Item {
102 Item {
103− width: results_grid.cellWidth; height: results_grid.cellHeight
103+ width: resultsGrid.cellWidth; height: resultsGrid.cellHeight
104 Column {
104 Column {
105 anchors.verticalCenter: parent.verticalCenter
105 anchors.verticalCenter: parent.verticalCenter
106 anchors.horizontalCenter: parent.horizontalCenter
106 anchors.horizontalCenter: parent.horizontalCenter
tests/qmltests/Dash/qml/fake_generic_lensView.qml+1−1
@@ -20,5 +20,5 @@ FakeLensView {
20 id: fake_generic_lensView
20 id: fake_generic_lensView
21 objectName: "fake_generic_lensView"
21 objectName: "fake_generic_lensView"
22
22
23− back_color: "#D0D0D0"
23+ backColor: "#D0D0D0"
24}
24}
tests/qmltests/Dash/qml/fake_lensView1.qml+1−1
@@ -20,5 +20,5 @@ FakeLensView {
20 id: fake_lensView1
20 id: fake_lensView1
21 objectName: "fake_lensView1"
21 objectName: "fake_lensView1"
22
22
23− back_color: "#909090"
23+ backColor: "#909090"
24}
24}
tests/qmltests/Dash/qml/fake_lensView2.qml+1−1
@@ -20,5 +20,5 @@ FakeLensView {
20 id: fake_lensView2
20 id: fake_lensView2
21 objectName: "fake_lensView2"
21 objectName: "fake_lensView2"
22
22
23− back_color: "#A0A0A0"
23+ backColor: "#A0A0A0"
24}
24}
tests/qmltests/Dash/qml/fake_lensView3.qml+1−1
@@ -20,5 +20,5 @@ FakeLensView {
20 id: fake_lensView3
20 id: fake_lensView3
21 objectName: "fake_lensView3"
21 objectName: "fake_lensView3"
22
22
23− back_color: "#B0B0B0"
23+ backColor: "#B0B0B0"
24}
24}
tests/qmltests/Dash/qml/fake_lensView4.qml+1−1
@@ -20,5 +20,5 @@ FakeLensView {
20 id: fake_lensView4
20 id: fake_lensView4
21 objectName: "fake_lensView4"
21 objectName: "fake_lensView4"
22
22
23− back_color: "#C0C0C0"
23+ backColor: "#C0C0C0"
24}
24}
tests/qmltests/Dash/tst_Dash.qml+15−15
@@ -34,7 +34,7 @@ Item {
34 }
34 }
35
35
36 LensDelegateMapper {
36 LensDelegateMapper {
37− id: lens_delegate_mapper
37+ id: lensDelegateMapper
38 lensDelegateMapping: {
38 lensDelegateMapping: {
39 "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
39 "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
40 "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
40 "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
@@ -52,7 +52,7 @@ Item {
52
52
53 Component.onCompleted: {
53 Component.onCompleted: {
54 var dashContent = findChild(dash, "dashContent");
54 var dashContent = findChild(dash, "dashContent");
55− dashContent.lens_mapper = lens_delegate_mapper;
55+ dashContent.lensMapper = lensDelegateMapper;
56 lenses = dashContent.lenses;
56 lenses = dashContent.lenses;
57 }
57 }
58
58
@@ -67,11 +67,11 @@ Item {
67
67
68 function get_lens_data() {
68 function get_lens_data() {
69 return [
69 return [
70− { tag: "MockLens1", visual_index: 0, should_be_visible: true },
70+ { tag: "MockLens1", visualIndex: 0, shouldBeVisible: true },
71− { tag: "MockLens2", visual_index: -1, should_be_visible: false },
71+ { tag: "MockLens2", visualIndex: -1, shouldBeVisible: false },
72− { tag: "MockLens3", visual_index: 1, should_be_visible: true },
72+ { tag: "MockLens3", visualIndex: 1, shouldBeVisible: true },
73− { tag: "MockLens4", visual_index: 2, should_be_visible: true },
73+ { tag: "MockLens4", visualIndex: 2, shouldBeVisible: true },
74− { tag: "MockLens5", visual_index: 3, should_be_visible: true },
74+ { tag: "MockLens5", visualIndex: 3, shouldBeVisible: true },
75 ]
75 ]
76 }
76 }
77
77
@@ -88,9 +88,9 @@ Item {
88 var dashContent = findChild(dash, "dashContent");
88 var dashContent = findChild(dash, "dashContent");
89 var current_index = dashContent.currentIndex;
89 var current_index = dashContent.currentIndex;
90
90
91− dash.setCurrentLens(data.tag, true, false);
91+ dash.setCurrentLens(data.tag, true /* animate */, false /* reset */);
92− compare(dashContent.currentIndex, data.should_be_visible ? data.visual_index : current_index);
92+ compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
93− compare(dashbar.currentIndex, data.should_be_visible ? data.visual_index : current_index);
93+ compare(dashbar.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
94 }
94 }
95
95
96 function test_show_lens_on_load_data() {
96 function test_show_lens_on_load_data() {
@@ -98,7 +98,7 @@ Item {
98 }
98 }
99
99
100 function test_show_lens_on_load(data) {
100 function test_show_lens_on_load(data) {
101− if (data.should_be_visible == false) {
101+ if (data.shouldBeVisible == false) {
102 console.log("Not testing " + data.tag + ": not visible");
102 console.log("Not testing " + data.tag + ": not visible");
103 return;
103 return;
104 }
104 }
@@ -106,7 +106,7 @@ Item {
106
106
107 var dashContentList = findChild(dash, "dashContentList");
107 var dashContentList = findChild(dash, "dashContentList");
108 verify(dashContentList != undefined);
108 verify(dashContentList != undefined);
109− tryCompare(dashContentList, "currentIndex", data.visual_index);
109+ tryCompare(dashContentList, "currentIndex", data.visualIndex);
110 }
110 }
111
111
112 function test_dash_bar_set_index_connection_data() {
112 function test_dash_bar_set_index_connection_data() {
@@ -114,7 +114,7 @@ Item {
114 }
114 }
115
115
116 function test_dash_bar_set_index_connection(data) {
116 function test_dash_bar_set_index_connection(data) {
117− if (data.should_be_visible == false) {
117+ if (data.shouldBeVisible == false) {
118 console.log("Not testing " + data.tag + ": not visible");
118 console.log("Not testing " + data.tag + ": not visible");
119 return;
119 return;
120 }
120 }
@@ -126,8 +126,8 @@ Item {
126 var dashContent = findChild(dash, "dashContent");
126 var dashContent = findChild(dash, "dashContent");
127 var current_index = dashContent.currentIndex;
127 var current_index = dashContent.currentIndex;
128
128
129− dashbar.itemSelected(data.visual_index);
129+ dashbar.itemSelected(data.visualIndex);
130− compare(dashContent.currentIndex, data.should_be_visible ? data.visual_index : current_index);
130+ compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
131 }
131 }
132 }
132 }
133}
133}
tests/qmltests/Dash/tst_DashContent.qml+53−53
@@ -28,7 +28,7 @@ Item {
28
28
29 property ListModel searchHistory: ListModel {}
29 property ListModel searchHistory: ListModel {}
30
30
31− property var lens_status: {
31+ property var lensStatus: {
32 'MockLens1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
32 'MockLens1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
33 'MockLens2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
33 'MockLens2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
34 'MockLens3': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
34 'MockLens3': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
@@ -41,17 +41,17 @@ Item {
41 }
41 }
42
42
43 DashContent {
43 DashContent {
44− id: dash_content
44+ id: dashContent
45 anchors.fill: parent
45 anchors.fill: parent
46
46
47 model: lensesModel
47 model: lensesModel
48 lenses : lensesModel
48 lenses : lensesModel
49
49
50− lens_mapper : lens_delegate_mapper
50+ lensMapper : lensDelegateMapper
51 }
51 }
52
52
53 LensDelegateMapper {
53 LensDelegateMapper {
54− id: lens_delegate_mapper
54+ id: lensDelegateMapper
55 lensDelegateMapping: {
55 lensDelegateMapping: {
56 "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
56 "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
57 "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
57 "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
@@ -62,37 +62,37 @@ Item {
62 }
62 }
63
63
64 function clear_lens_status() {
64 function clear_lens_status() {
65− lens_status["MockLens1"].movementStarted = 0;
65+ lensStatus["MockLens1"].movementStarted = 0;
66− lens_status["MockLens1"].positionedAtBeginning = 0;
66+ lensStatus["MockLens1"].positionedAtBeginning = 0;
67
67
68− lens_status["MockLens2"].movementStarted = 0;
68+ lensStatus["MockLens2"].movementStarted = 0;
69− lens_status["MockLens2"].positionedAtBeginning = 0;
69+ lensStatus["MockLens2"].positionedAtBeginning = 0;
70
70
71− lens_status["MockLens3"].movementStarted = 0;
71+ lensStatus["MockLens3"].movementStarted = 0;
72− lens_status["MockLens3"].positionedAtBeginning = 0;
72+ lensStatus["MockLens3"].positionedAtBeginning = 0;
73
73
74− lens_status["MockLens4"].movementStarted = 0;
74+ lensStatus["MockLens4"].movementStarted = 0;
75− lens_status["MockLens4"].positionedAtBeginning = 0;
75+ lensStatus["MockLens4"].positionedAtBeginning = 0;
76
76
77− lens_status["MockLens5"].movementStarted = 0;
77+ lensStatus["MockLens5"].movementStarted = 0;
78− lens_status["MockLens5"].positionedAtBeginning = 0;
78+ lensStatus["MockLens5"].positionedAtBeginning = 0;
79 }
79 }
80
80
81 SignalSpy {
81 SignalSpy {
82− id: lensLoaded_spy
82+ id: lensLoadedSpy
83− target: dash_content
83+ target: dashContent
84 signalName: "lensLoaded"
84 signalName: "lensLoaded"
85 }
85 }
86
86
87 SignalSpy {
87 SignalSpy {
88− id: movementStarted_spy
88+ id: movementStartedSpy
89− target: dash_content
89+ target: dashContent
90 signalName: "movementStarted"
90 signalName: "movementStarted"
91 }
91 }
92
92
93 SignalSpy {
93 SignalSpy {
94− id: contentEndReached_spy
94+ id: contentEndReachedSpy
95− target: dash_content
95+ target: dashContent
96 signalName: "contentEndReached"
96 signalName: "contentEndReached"
97 }
97 }
98
98
@@ -101,13 +101,13 @@ Item {
101 when: windowShown
101 when: windowShown
102
102
103 function init() {
103 function init() {
104− lensLoaded_spy.clear();
104+ lensLoadedSpy.clear();
105− movementStarted_spy.clear();
105+ movementStartedSpy.clear();
106− contentEndReached_spy.clear()
106+ contentEndReachedSpy.clear()
107 clear_lens_status();
107 clear_lens_status();
108
108
109 // clear, wait for dahs to empty and load lenses.
109 // clear, wait for dahs to empty and load lenses.
110− var dashContentList = findChild(dash_content, "dashContentList");
110+ var dashContentList = findChild(dashContent, "dashContentList");
111 verify(dashContentList != undefined)
111 verify(dashContentList != undefined)
112 lensesModel.clear();
112 lensesModel.clear();
113 tryCompare(dashContentList, "count", 0);
113 tryCompare(dashContentList, "count", 0);
@@ -115,47 +115,47 @@ Item {
115 }
115 }
116
116
117 function test_movement_started_signal() {
117 function test_movement_started_signal() {
118− dash_content.setCurrentLensAtIndex(3, true, false);
118+ dashContent.setCurrentLensAtIndex(3, true, false);
119
119
120− var dashContentList = findChild(dash_content, "dashContentList");
120+ var dashContentList = findChild(dashContent, "dashContentList");
121 verify(dashContentList != undefined)
121 verify(dashContentList != undefined)
122− tryCompare(lensLoaded_spy, "count", 5);
122+ tryCompare(lensLoadedSpy, "count", 5);
123
123
124 dashContentList.movementStarted();
124 dashContentList.movementStarted();
125− compare(movementStarted_spy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");
125+ compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");
126− compare(lens_status["MockLens1"].movementStarted, 1, "MockLens1 should have emitted movementStarted signal when content list did.");
126+ compare(lensStatus["MockLens1"].movementStarted, 1, "MockLens1 should have emitted movementStarted signal when content list did.");
127− compare(lens_status["MockLens2"].movementStarted, 1, "MockLens2 should have emitted movementStarted signal when content list did.");
127+ compare(lensStatus["MockLens2"].movementStarted, 1, "MockLens2 should have emitted movementStarted signal when content list did.");
128− compare(lens_status["MockLens3"].movementStarted, 1, "MockLens3 should have emitted movementStarted signal when content list did.");
128+ compare(lensStatus["MockLens3"].movementStarted, 1, "MockLens3 should have emitted movementStarted signal when content list did.");
129− compare(lens_status["MockLens4"].movementStarted, 1, "MockLens4 should have emitted movementStarted signal when content list did.");
129+ compare(lensStatus["MockLens4"].movementStarted, 1, "MockLens4 should have emitted movementStarted signal when content list did.");
130− compare(lens_status["MockLens5"].movementStarted, 1, "MockLens5 should have emitted movementStarted signal when content list did.");
130+ compare(lensStatus["MockLens5"].movementStarted, 1, "MockLens5 should have emitted movementStarted signal when content list did.");
131 }
131 }
132
132
133 function test_positioned_at_beginning_signal() {
133 function test_positioned_at_beginning_signal() {
134− dash_content.setCurrentLensAtIndex(3, true, false);
134+ dashContent.setCurrentLensAtIndex(3, true, false);
135
135
136− tryCompare(lensLoaded_spy, "count", 5);
136+ tryCompare(lensLoadedSpy, "count", 5);
137
137
138− dash_content.positionedAtBeginning();
138+ dashContent.positionedAtBeginning();
139− compare(lens_status["MockLens1"].positionedAtBeginning, 1, "MockLens1 should have emitted positionedAtBeginning signal when DashContent did.");
139+ compare(lensStatus["MockLens1"].positionedAtBeginning, 1, "MockLens1 should have emitted positionedAtBeginning signal when DashContent did.");
140− compare(lens_status["MockLens2"].positionedAtBeginning, 1, "MockLens2 should have emitted positionedAtBeginning signal when DashContent did.");
140+ compare(lensStatus["MockLens2"].positionedAtBeginning, 1, "MockLens2 should have emitted positionedAtBeginning signal when DashContent did.");
141− compare(lens_status["MockLens3"].positionedAtBeginning, 1, "MockLens3 should have emitted positionedAtBeginning signal when DashContent did.");
141+ compare(lensStatus["MockLens3"].positionedAtBeginning, 1, "MockLens3 should have emitted positionedAtBeginning signal when DashContent did.");
142− compare(lens_status["MockLens4"].positionedAtBeginning, 1, "MockLens4 should have emitted positionedAtBeginning signal when DashContent did.");
142+ compare(lensStatus["MockLens4"].positionedAtBeginning, 1, "MockLens4 should have emitted positionedAtBeginning signal when DashContent did.");
143− compare(lens_status["MockLens5"].positionedAtBeginning, 1, "MockLens5 should have emitted positionedAtBeginning signal when DashContent did.");
143+ compare(lensStatus["MockLens5"].positionedAtBeginning, 1, "MockLens5 should have emitted positionedAtBeginning signal when DashContent did.");
144 }
144 }
145
145
146 function test_lens_loaded() {
146 function test_lens_loaded() {
147− tryCompare(lensLoaded_spy, "count", 5);
147+ tryCompare(lensLoadedSpy, "count", 5);
148 }
148 }
149
149
150 function test_content_end_reached() {
150 function test_content_end_reached() {
151− var dashContentList = findChild(dash_content, "dashContentList");
151+ var dashContentList = findChild(dashContent, "dashContentList");
152 verify(dashContentList != undefined);
152 verify(dashContentList != undefined);
153− tryCompare(lensLoaded_spy, "count", 5);
153+ tryCompare(lensLoadedSpy, "count", 5);
154
154
155− dash_content.setCurrentLensAtIndex(0, true, false);
155+ dashContent.setCurrentLensAtIndex(0, true, false);
156 dashContentList.currentItem.item.endReached();
156 dashContentList.currentItem.item.endReached();
157
157
158− compare(contentEndReached_spy.count, 1);
158+ compare(contentEndReachedSpy.count, 1);
159 }
159 }
160
160
161 // This tests that setting the current lens index will end up at the correct index even if
161 // This tests that setting the current lens index will end up at the correct index even if
@@ -164,19 +164,19 @@ Item {
164 verify(lensesModel.loaded == false);
164 verify(lensesModel.loaded == false);
165
165
166 // next index is 1 if current is -1, otherwise it's current + 1
166 // next index is 1 if current is -1, otherwise it's current + 1
167− var next_index = ((dash_content.currentIndex == -1 ? 0 : dash_content.currentIndex) + 1) % 5
167+ var next_index = ((dashContent.currentIndex == -1 ? 0 : dashContent.currentIndex) + 1) % 5
168
168
169− dash_content.setCurrentLensAtIndex(next_index, true, false);
169+ dashContent.setCurrentLensAtIndex(next_index, true, false);
170− tryCompare(dash_content, "currentIndex", next_index);
170+ tryCompare(dashContent, "currentIndex", next_index);
171 verify(lensesModel.loaded == true);
171 verify(lensesModel.loaded == true);
172
172
173 // test greater than lens count.
173 // test greater than lens count.
174− dash_content.setCurrentLensAtIndex(lensesModel.count, true, false);
174+ dashContent.setCurrentLensAtIndex(lensesModel.count, true, false);
175− compare(dash_content.currentIndex, 4);
175+ compare(dashContent.currentIndex, 4);
176 }
176 }
177
177
178 function get_current_item_object_name() {
178 function get_current_item_object_name() {
179− var dashContentList = findChild(dash_content, "dashContentList");
179+ var dashContentList = findChild(dashContent, "dashContentList");
180 verify(dashContentList != undefined);
180 verify(dashContentList != undefined);
181
181
182 if (dashContentList.currentItem != undefined) {
182 if (dashContentList.currentItem != undefined) {
@@ -198,7 +198,7 @@ Item {
198 }
198 }
199
199
200 function test_lens_mapping(data) {
200 function test_lens_mapping(data) {
201− dash_content.setCurrentLensAtIndex(data.index, true, false);
201+ dashContent.setCurrentLensAtIndex(data.index, true, false);
202 tryCompareFunction(get_current_item_object_name, data.objectName)
202 tryCompareFunction(get_current_item_object_name, data.objectName)
203 }
203 }
204
204