git.iko.soy/unity8
on xenial help sign in
More lens - scope renaming in tests.
4c9df2cPawel Stolowski
tests/qmltests/Dash/qml/fake_generic_lensView.qml → tests/qmltests/Dash/qml/fake_generic_scopeView.qmlrenamed
compare with xenial
unifiedsplit

The content is the same.

tests/qmltests/Dash/qml/fake_lensView1.qml → tests/qmltests/Dash/qml/fake_scopeView1.qmlrenamed

The content is the same.

tests/qmltests/Dash/qml/fake_lensView2.qml → tests/qmltests/Dash/qml/fake_scopeView2.qmlrenamed

The content is the same.

tests/qmltests/Dash/qml/fake_lensView3.qml → tests/qmltests/Dash/qml/fake_scopeView3.qmlrenamed

The content is the same.

tests/qmltests/Dash/qml/fake_lensView4.qml → tests/qmltests/Dash/qml/fake_scopeView4.qmlrenamed

The content is the same.

tests/qmltests/Dash/tst_DashContent.qml+5−5
@@ -47,13 +47,13 @@ Item {
47 model: scopesModel
47 model: scopesModel
48 scopes : scopesModel
48 scopes : scopesModel
49
49
50− scopeDelegateMapping: { "MockScope3" : "../tests/qmltests/Dash/qml/fake_lensView3.qml",
50+ scopeDelegateMapping: { "MockScope3" : "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
51− "MockScope2" : "../tests/qmltests/Dash/qml/fake_lensView2.qml",
51+ "MockScope2" : "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
52− "MockScope1" : "../tests/qmltests/Dash/qml/fake_lensView1.qml",
52+ "MockScope1" : "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
53− "MockScope4" : "../tests/qmltests/Dash/qml/fake_lensView4.qml"
53+ "MockScope4" : "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
54 }
54 }
55
55
56− genericScope: "../tests/qmltests/Dash/qml/fake_generic_lensView.qml"
56+ genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
57 }
57 }
58
58
59 function clear_scope_status() {
59 function clear_scope_status() {
tests/qmltests/plugins/Unity/CMakeLists.txt+2−2
@@ -22,8 +22,8 @@ set(UnityQML_SOURCES
22 ${CMAKE_SOURCE_DIR}/plugins/Unity/categories.cpp
22 ${CMAKE_SOURCE_DIR}/plugins/Unity/categories.cpp
23 ${CMAKE_SOURCE_DIR}/plugins/Unity/categoryfilter.cpp
23 ${CMAKE_SOURCE_DIR}/plugins/Unity/categoryfilter.cpp
24 ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
24 ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
25− fake_lens.cpp
25+ fake_scope.cpp
26− fake_lenses.cpp
26+ fake_scopes.cpp
27 fake_unity_plugin.cpp
27 fake_unity_plugin.cpp
28 fake_launchermodel.cpp
28 fake_launchermodel.cpp
29)
29)
tests/qmltests/plugins/Unity/fake_lens.cpp → tests/qmltests/plugins/Unity/fake_scope.cpprenamed+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17// Self
17// Self
18−#include "fake_lens.h"
18+#include "fake_scope.h"
19
19
20#include <dee.h>
20#include <dee.h>
21#include "paths.h"
21#include "paths.h"
tests/qmltests/plugins/Unity/fake_lens.h → tests/qmltests/plugins/Unity/fake_scope.hrenamed

The content is the same.

tests/qmltests/plugins/Unity/fake_lenses.cpp → tests/qmltests/plugins/Unity/fake_scopes.cpprenamed+1−1
@@ -17,7 +17,7 @@
17 */
17 */
18
18
19// Self
19// Self
20−#include "fake_lenses.h"
20+#include "fake_scopes.h"
21
21
22// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)
22// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)
23
23
tests/qmltests/plugins/Unity/fake_lenses.h → tests/qmltests/plugins/Unity/fake_scopes.hrenamed+1−1
@@ -20,7 +20,7 @@
20#define FAKE_SCOPES_H
20#define FAKE_SCOPES_H
21
21
22// Local
22// Local
23−#include "fake_lens.h"
23+#include "fake_scope.h"
24
24
25// Qt
25// Qt
26#include <QAbstractListModel>
26#include <QAbstractListModel>
tests/qmltests/plugins/Unity/fake_unity_plugin.cpp+1−1
@@ -20,7 +20,7 @@
20#include "fake_unity_plugin.h"
20#include "fake_unity_plugin.h"
21
21
22// local
22// local
23−#include "fake_lenses.h"
23+#include "fake_scopes.h"
24#include "categories.h"
24#include "categories.h"
25#include "categoryfilter.h"
25#include "categoryfilter.h"
26#include "fake_launchermodel.h"
26#include "fake_launchermodel.h"