git.iko.soy/unity8
on xenial help sign in
More lens - scope renaming in tests.
commit4c9df2caeb2416e33bfbb82277f7d6447e0eef59 authorPawel Stolowski <pawel.stolowski@canonical.com> dateWed 12 Jun 2013, 17:03 (13 years ago) parent7f3f18f
12 files changed+11−11
compare with xenial
unifiedsplit
tests/qmltests/Dash/qml/fake_generic_lensView.qml → tests/qmltests/Dash/qml/fake_generic_scopeView.qml tests/qmltests/Dash/qml/fake_lensView1.qml → tests/qmltests/Dash/qml/fake_scopeView1.qml tests/qmltests/Dash/qml/fake_lensView2.qml → tests/qmltests/Dash/qml/fake_scopeView2.qml tests/qmltests/Dash/qml/fake_lensView3.qml → tests/qmltests/Dash/qml/fake_scopeView3.qml tests/qmltests/Dash/qml/fake_lensView4.qml → tests/qmltests/Dash/qml/fake_scopeView4.qml tests/qmltests/Dash/tst_DashContent.qml+5−5 tests/qmltests/plugins/Unity/CMakeLists.txt+2−2 tests/qmltests/plugins/Unity/fake_lens.cpp → tests/qmltests/plugins/Unity/fake_scope.cpp+1−1 tests/qmltests/plugins/Unity/fake_lens.h → tests/qmltests/plugins/Unity/fake_scope.h tests/qmltests/plugins/Unity/fake_lenses.cpp → tests/qmltests/plugins/Unity/fake_scopes.cpp+1−1 tests/qmltests/plugins/Unity/fake_lenses.h → tests/qmltests/plugins/Unity/fake_scopes.h+1−1 tests/qmltests/plugins/Unity/fake_unity_plugin.cpp+1−1
tests/qmltests/Dash/qml/fake_generic_lensView.qml → tests/qmltests/Dash/qml/fake_generic_scopeView.qmlrenamed

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 {
4747 model: scopesModel
4848 scopes : scopesModel
4949
50− scopeDelegateMapping: { "MockScope3" : "../tests/qmltests/Dash/qml/fake_lensView3.qml",
51− "MockScope2" : "../tests/qmltests/Dash/qml/fake_lensView2.qml",
52− "MockScope1" : "../tests/qmltests/Dash/qml/fake_lensView1.qml",
53− "MockScope4" : "../tests/qmltests/Dash/qml/fake_lensView4.qml"
50+ scopeDelegateMapping: { "MockScope3" : "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
51+ "MockScope2" : "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
52+ "MockScope1" : "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
53+ "MockScope4" : "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
5454 }
5555
56− genericScope: "../tests/qmltests/Dash/qml/fake_generic_lensView.qml"
56+ genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
5757 }
5858
5959 function clear_scope_status() {
tests/qmltests/plugins/Unity/CMakeLists.txt+2−2
@@ -22,8 +22,8 @@ set(UnityQML_SOURCES
2222 ${CMAKE_SOURCE_DIR}/plugins/Unity/categories.cpp
2323 ${CMAKE_SOURCE_DIR}/plugins/Unity/categoryfilter.cpp
2424 ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
25− fake_lens.cpp
26− fake_lenses.cpp
25+ fake_scope.cpp
26+ fake_scopes.cpp
2727 fake_unity_plugin.cpp
2828 fake_launchermodel.cpp
2929)
tests/qmltests/plugins/Unity/fake_lens.cpp → tests/qmltests/plugins/Unity/fake_scope.cpprenamed+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717// Self
18−#include "fake_lens.h"
18+#include "fake_scope.h"
1919
2020#include <dee.h>
2121#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 @@
1717 */
1818
1919// Self
20−#include "fake_lenses.h"
20+#include "fake_scopes.h"
2121
2222// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)
2323
tests/qmltests/plugins/Unity/fake_lenses.h → tests/qmltests/plugins/Unity/fake_scopes.hrenamed+1−1
@@ -20,7 +20,7 @@
2020#define FAKE_SCOPES_H
2121
2222// Local
23−#include "fake_lens.h"
23+#include "fake_scope.h"
2424
2525// Qt
2626#include <QAbstractListModel>
tests/qmltests/plugins/Unity/fake_unity_plugin.cpp+1−1
@@ -20,7 +20,7 @@
2020#include "fake_unity_plugin.h"
2121
2222// local
23−#include "fake_lenses.h"
23+#include "fake_scopes.h"
2424#include "categories.h"
2525#include "categoryfilter.h"
2626#include "fake_launchermodel.h"