git.iko.soy/unity8
on xenial help sign in
QSortFilterProxyModelQML -> UnitySortFilterProxyModelQML
e1c9b1aAlbert Astals
plugins/LightDM/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -15,7 +15,7 @@ include_directories(
15)
15)
16
16
17set(QMLPLUGIN_SRC
17set(QMLPLUGIN_SRC
18− ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
18+ ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
19 DBusGreeter.cpp
19 DBusGreeter.cpp
20 DBusGreeterList.cpp
20 DBusGreeterList.cpp
21 Greeter.cpp
21 Greeter.cpp
plugins/LightDM/UsersModel.cpp+1−1
@@ -58,7 +58,7 @@ QVariant MangleModel::data(const QModelIndex &index, int role) const
58// **** Now we continue with actual UsersModel class ****
58// **** Now we continue with actual UsersModel class ****
59
59
60UsersModel::UsersModel(QObject* parent)
60UsersModel::UsersModel(QObject* parent)
61− : QSortFilterProxyModelQML(parent)
61+ : UnitySortFilterProxyModelQML(parent)
62{
62{
63 setModel(new MangleModel(this));
63 setModel(new MangleModel(this));
64 setSortCaseSensitivity(Qt::CaseInsensitive);
64 setSortCaseSensitivity(Qt::CaseInsensitive);
plugins/LightDM/UsersModel.h+2−2
@@ -23,10 +23,10 @@
23#ifndef UNITY_USERSMODEL_H
23#ifndef UNITY_USERSMODEL_H
24#define UNITY_USERSMODEL_H
24#define UNITY_USERSMODEL_H
25
25
26−#include <qsortfilterproxymodelqml.h>
26+#include <unitysortfilterproxymodelqml.h>
27#include <QtCore/QObject>
27#include <QtCore/QObject>
28
28
29−class UsersModel : public QSortFilterProxyModelQML
29+class UsersModel : public UnitySortFilterProxyModelQML
30{
30{
31 Q_OBJECT
31 Q_OBJECT
32
32
plugins/Utils/CMakeLists.txt+1−1
@@ -12,7 +12,7 @@ include_directories(
12
12
13set(QMLPLUGIN_SRC
13set(QMLPLUGIN_SRC
14 qlimitproxymodelqml.cpp
14 qlimitproxymodelqml.cpp
15− qsortfilterproxymodelqml.cpp
15+ unitysortfilterproxymodelqml.cpp
16 relativetimeformatter.cpp
16 relativetimeformatter.cpp
17 timeformatter.cpp
17 timeformatter.cpp
18 unitymenumodelpaths.cpp
18 unitymenumodelpaths.cpp
plugins/Utils/plugin.cpp+2−2
@@ -27,7 +27,7 @@
27
27
28// local
28// local
29#include "qlimitproxymodelqml.h"
29#include "qlimitproxymodelqml.h"
30−#include "qsortfilterproxymodelqml.h"
30+#include "unitysortfilterproxymodelqml.h"
31#include "relativetimeformatter.h"
31#include "relativetimeformatter.h"
32#include "timeformatter.h"
32#include "timeformatter.h"
33#include "unitymenumodelpaths.h"
33#include "unitymenumodelpaths.h"
@@ -39,7 +39,7 @@ void UtilsPlugin::registerTypes(const char *uri)
39 Q_ASSERT(uri == QLatin1String("Utils"));
39 Q_ASSERT(uri == QLatin1String("Utils"));
40 qmlRegisterType<QAbstractItemModel>();
40 qmlRegisterType<QAbstractItemModel>();
41 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
41 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
42− qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
42+ qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
43 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
43 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
44 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
44 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
45 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
45 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
plugins/Utils/qsortfilterproxymodelqml.cpp → plugins/Utils/unitysortfilterproxymodelqml.cpprenamed+15−15
@@ -15,12 +15,12 @@
15 */
15 */
16
16
17// self
17// self
18−#include "qsortfilterproxymodelqml.h"
18+#include "unitysortfilterproxymodelqml.h"
19
19
20// Qt
20// Qt
21#include <QDebug>
21#include <QDebug>
22
22
23−QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
23+UnitySortFilterProxyModelQML::UnitySortFilterProxyModelQML(QObject *parent)
24 : QSortFilterProxyModel(parent)
24 : QSortFilterProxyModel(parent)
25 , m_invertMatch(false)
25 , m_invertMatch(false)
26{
26{
@@ -32,7 +32,7 @@ QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
32/*
32/*
33 * Enter row index of filtered/sorted model, returns row index of source model
33 * Enter row index of filtered/sorted model, returns row index of source model
34 */
34 */
35−int QSortFilterProxyModelQML::mapRowToSource(int row)
35+int UnitySortFilterProxyModelQML::mapRowToSource(int row)
36{
36{
37 if (sourceModel() == nullptr)
37 if (sourceModel() == nullptr)
38 return -1;
38 return -1;
@@ -40,13 +40,13 @@ int QSortFilterProxyModelQML::mapRowToSource(int row)
40 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
40 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
41}
41}
42
42
43−QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const
43+QHash<int, QByteArray> UnitySortFilterProxyModelQML::roleNames() const
44{
44{
45 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
45 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
46}
46}
47
47
48void
48void
49−QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
49+UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
50{
50{
51 if (itemModel == nullptr) {
51 if (itemModel == nullptr) {
52 return;
52 return;
@@ -69,7 +69,7 @@ QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
69}
69}
70
70
71QVariantMap
71QVariantMap
72−QSortFilterProxyModelQML::get(int row)
72+UnitySortFilterProxyModelQML::get(int row)
73{
73{
74 QVariantMap res;
74 QVariantMap res;
75 const QHash<int, QByteArray> roles = roleNames();
75 const QHash<int, QByteArray> roles = roleNames();
@@ -81,7 +81,7 @@ QSortFilterProxyModelQML::get(int row)
81}
81}
82
82
83QVariant
83QVariant
84−QSortFilterProxyModelQML::data(int row, int role)
84+UnitySortFilterProxyModelQML::data(int row, int role)
85{
85{
86 if (sourceModel() == nullptr) {
86 if (sourceModel() == nullptr) {
87 return QVariant();
87 return QVariant();
@@ -91,7 +91,7 @@ QSortFilterProxyModelQML::data(int row, int role)
91}
91}
92
92
93int
93int
94−QSortFilterProxyModelQML::totalCount() const
94+UnitySortFilterProxyModelQML::totalCount() const
95{
95{
96 if (sourceModel() != nullptr) {
96 if (sourceModel() != nullptr) {
97 return sourceModel()->rowCount();
97 return sourceModel()->rowCount();
@@ -101,19 +101,19 @@ QSortFilterProxyModelQML::totalCount() const
101}
101}
102
102
103int
103int
104−QSortFilterProxyModelQML::count()
104+UnitySortFilterProxyModelQML::count()
105{
105{
106 return rowCount();
106 return rowCount();
107}
107}
108
108
109bool
109bool
110−QSortFilterProxyModelQML::invertMatch() const
110+UnitySortFilterProxyModelQML::invertMatch() const
111{
111{
112 return m_invertMatch;
112 return m_invertMatch;
113}
113}
114
114
115void
115void
116−QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)
116+UnitySortFilterProxyModelQML::setInvertMatch(bool invertMatch)
117{
117{
118 if (invertMatch != m_invertMatch) {
118 if (invertMatch != m_invertMatch) {
119 m_invertMatch = invertMatch;
119 m_invertMatch = invertMatch;
@@ -123,7 +123,7 @@ QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)
123}
123}
124
124
125bool
125bool
126−QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
126+UnitySortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
127 const QModelIndex &sourceParent) const
127 const QModelIndex &sourceParent) const
128{
128{
129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting
129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting
@@ -136,7 +136,7 @@ QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
136}
136}
137
137
138int
138int
139−QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
139+UnitySortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
140{
140{
141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);
141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);
142 if (!matches.isEmpty()) {
142 if (!matches.isEmpty()) {
@@ -147,7 +147,7 @@ QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
147}
147}
148
148
149int
149int
150−QSortFilterProxyModelQML::mapFromSource(int row)
150+UnitySortFilterProxyModelQML::mapFromSource(int row)
151{
151{
152 if (sourceModel() != nullptr) {
152 if (sourceModel() != nullptr) {
153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();
153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();
@@ -157,7 +157,7 @@ QSortFilterProxyModelQML::mapFromSource(int row)
157}
157}
158
158
159int
159int
160−QSortFilterProxyModelQML::mapToSource(int row)
160+UnitySortFilterProxyModelQML::mapToSource(int row)
161{
161{
162 if (sourceModel() != nullptr) {
162 if (sourceModel() != nullptr) {
163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
plugins/Utils/qsortfilterproxymodelqml.h → plugins/Utils/unitysortfilterproxymodelqml.hrenamed+5−5
@@ -14,12 +14,12 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−#ifndef QSORTFILTERPROXYMODELQML_H
17+#ifndef UNITYSORTFILTERPROXYMODELQML_H
18−#define QSORTFILTERPROXYMODELQML_H
18+#define UNITYSORTFILTERPROXYMODELQML_H
19
19
20#include <QSortFilterProxyModel>
20#include <QSortFilterProxyModel>
21
21
22−class QSortFilterProxyModelQML : public QSortFilterProxyModel
22+class UnitySortFilterProxyModelQML : public QSortFilterProxyModel
23{
23{
24 Q_OBJECT
24 Q_OBJECT
25
25
@@ -29,7 +29,7 @@ class QSortFilterProxyModelQML : public QSortFilterProxyModel
29 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)
29 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)
30
30
31public:
31public:
32− explicit QSortFilterProxyModelQML(QObject *parent = 0);
32+ explicit UnitySortFilterProxyModelQML(QObject *parent = 0);
33
33
34 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles
34 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles
35 Q_INVOKABLE QVariant data(int row, int role);
35 Q_INVOKABLE QVariant data(int row, int role);
@@ -60,4 +60,4 @@ private:
60 bool m_invertMatch;
60 bool m_invertMatch;
61};
61};
62
62
63−#endif // QSORTFILTERPROXYMODELQML_H
63+#endif // UNITYSORTFILTERPROXYMODELQML_H
qml/Dash/GenericScopeView.qml+2−2
@@ -28,7 +28,7 @@ FocusScope {
28 readonly property bool navigationShown: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].openList : false
28 readonly property bool navigationShown: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].openList : false
29 property bool forceNonInteractive: false
29 property bool forceNonInteractive: false
30 property var scope: null
30 property var scope: null
31− property SortFilterProxyModel categories: categoryFilter
31+ property UnitySortFilterProxyModel categories: categoryFilter
32 property bool isCurrent: false
32 property bool isCurrent: false
33 property alias moving: categoryView.moving
33 property alias moving: categoryView.moving
34 property bool hasBackAction: false
34 property bool hasBackAction: false
@@ -106,7 +106,7 @@ FocusScope {
106 value: isCurrent && !subPageLoader.open
106 value: isCurrent && !subPageLoader.open
107 }
107 }
108
108
109− SortFilterProxyModel {
109+ UnitySortFilterProxyModel {
110 id: categoryFilter
110 id: categoryFilter
111 model: scope ? scope.categories : null
111 model: scope ? scope.categories : null
112 dynamicSortFilter: true
112 dynamicSortFilter: true
qml/Notifications/Notifications.qml+1−1
@@ -29,7 +29,7 @@ ListView {
29 property real margin
29 property real margin
30 property bool useModal: snapDecisionProxyModel.count > 0
30 property bool useModal: snapDecisionProxyModel.count > 0
31
31
32− SortFilterProxyModel {
32+ UnitySortFilterProxyModel {
33 id: snapDecisionProxyModel
33 id: snapDecisionProxyModel
34 objectName: "snapDecisionProxyModel"
34 objectName: "snapDecisionProxyModel"
35
35
qml/Panel/Indicators/VisibleIndicators.qml+2−2
@@ -22,13 +22,13 @@ import Unity.Indicators 0.1 as Indicators
22import Utils 0.1
22import Utils 0.1
23
23
24Item {
24Item {
25− property SortFilterProxyModel model: filterModel
25+ property UnitySortFilterProxyModel model: filterModel
26
26
27 function initialise(profile) {
27 function initialise(profile) {
28 indicatorsModel.load(profile);
28 indicatorsModel.load(profile);
29 }
29 }
30
30
31− SortFilterProxyModel {
31+ UnitySortFilterProxyModel {
32 id: filterModel
32 id: filterModel
33 filterRole: Indicators.IndicatorsModelRole.IsVisible
33 filterRole: Indicators.IndicatorsModelRole.IsVisible
34 filterRegExp: RegExp("^true$")
34 filterRegExp: RegExp("^true$")
tests/mocks/LightDM/CMakeLists.txt+1−1
@@ -24,7 +24,7 @@ set(QMLPLUGIN_SRC
24 ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
24 ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
25 ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp
25 ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp
26 ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
26 ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
27− ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
27+ ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
28 )
28 )
29
29
30add_library(MockLightDM-qml MODULE
30add_library(MockLightDM-qml MODULE
tests/plugins/Utils/CMakeLists.txt+1−1
@@ -23,7 +23,7 @@ endmacro(run_tests)
23
23
24run_tests(
24run_tests(
25 qlimitproxymodeltest
25 qlimitproxymodeltest
26− qsortfilterproxymodeltest
26+ unitysortfilterproxymodeltest
27 timeformattertest
27 timeformattertest
28 )
28 )
29
29
tests/plugins/Utils/qsortfilterproxymodeltest.cpp → tests/plugins/Utils/unitysortfilterproxymodeltest.cpprenamed+14−14
@@ -18,7 +18,7 @@
18 */
18 */
19
19
20// local
20// local
21−#include "qsortfilterproxymodelqml.h"
21+#include "unitysortfilterproxymodelqml.h"
22#include "modeltest.h"
22#include "modeltest.h"
23
23
24// Qt
24// Qt
@@ -91,7 +91,7 @@ private:
91 QHash<int, QByteArray> m_roles;
91 QHash<int, QByteArray> m_roles;
92};
92};
93
93
94−class QSortFilterProxyModelTest : public QObject
94+class UnitySortFilterProxyModelTest : public QObject
95{
95{
96 Q_OBJECT
96 Q_OBJECT
97
97
@@ -103,7 +103,7 @@ private Q_SLOTS:
103
103
104 void testRoleNamesSetAfter()
104 void testRoleNamesSetAfter()
105 {
105 {
106− QSortFilterProxyModelQML proxy;
106+ UnitySortFilterProxyModelQML proxy;
107 MockListModel model;
107 MockListModel model;
108 QHash<int, QByteArray> roles;
108 QHash<int, QByteArray> roles;
109
109
@@ -117,7 +117,7 @@ private Q_SLOTS:
117
117
118 void testRoleNamesSetBefore()
118 void testRoleNamesSetBefore()
119 {
119 {
120− QSortFilterProxyModelQML proxy;
120+ UnitySortFilterProxyModelQML proxy;
121 MockListModel model;
121 MockListModel model;
122 QHash<int, QByteArray> roles;
122 QHash<int, QByteArray> roles;
123
123
@@ -131,7 +131,7 @@ private Q_SLOTS:
131
131
132 void testCountSetAfter()
132 void testCountSetAfter()
133 {
133 {
134− QSortFilterProxyModelQML proxy;
134+ UnitySortFilterProxyModelQML proxy;
135 MockListModel model;
135 MockListModel model;
136 model.insertRows(0, 5);
136 model.insertRows(0, 5);
137
137
@@ -144,7 +144,7 @@ private Q_SLOTS:
144
144
145 void testCountInsert()
145 void testCountInsert()
146 {
146 {
147− QSortFilterProxyModelQML proxy;
147+ UnitySortFilterProxyModelQML proxy;
148 MockListModel model;
148 MockListModel model;
149
149
150 proxy.setModel(&model);
150 proxy.setModel(&model);
@@ -158,7 +158,7 @@ private Q_SLOTS:
158
158
159 void testCountRemove()
159 void testCountRemove()
160 {
160 {
161− QSortFilterProxyModelQML proxy;
161+ UnitySortFilterProxyModelQML proxy;
162 MockListModel model;
162 MockListModel model;
163 model.insertRows(0, 5);
163 model.insertRows(0, 5);
164
164
@@ -173,7 +173,7 @@ private Q_SLOTS:
173 }
173 }
174
174
175 void testInvertMatch() {
175 void testInvertMatch() {
176− QSortFilterProxyModelQML proxy;
176+ UnitySortFilterProxyModelQML proxy;
177 MockListModel model;
177 MockListModel model;
178
178
179 proxy.setModel(&model);
179 proxy.setModel(&model);
@@ -215,7 +215,7 @@ private Q_SLOTS:
215 }
215 }
216
216
217 void testNestedProxyRoleNames() {
217 void testNestedProxyRoleNames() {
218− QSortFilterProxyModelQML proxy1, proxy2;
218+ UnitySortFilterProxyModelQML proxy1, proxy2;
219 MockListModel model;
219 MockListModel model;
220 QHash<int, QByteArray> roles;
220 QHash<int, QByteArray> roles;
221 roles[0] = "role0";
221 roles[0] = "role0";
@@ -229,7 +229,7 @@ private Q_SLOTS:
229 }
229 }
230
230
231 void testModelTest() {
231 void testModelTest() {
232− QSortFilterProxyModelQML proxy;
232+ UnitySortFilterProxyModelQML proxy;
233 MockListModel model;
233 MockListModel model;
234
234
235 proxy.setModel(&model);
235 proxy.setModel(&model);
@@ -246,7 +246,7 @@ private Q_SLOTS:
246 }
246 }
247
247
248 void testModelChanged() {
248 void testModelChanged() {
249− QSortFilterProxyModelQML proxy;
249+ UnitySortFilterProxyModelQML proxy;
250 MockListModel model, model2;
250 MockListModel model, model2;
251
251
252 QSignalSpy spyOnModelChanged(&proxy, SIGNAL(modelChanged()));
252 QSignalSpy spyOnModelChanged(&proxy, SIGNAL(modelChanged()));
@@ -265,7 +265,7 @@ private Q_SLOTS:
265 }
265 }
266
266
267 void testData() {
267 void testData() {
268− QSortFilterProxyModelQML proxy;
268+ UnitySortFilterProxyModelQML proxy;
269 MockListModel model, model2;
269 MockListModel model, model2;
270
270
271 QStringList rows;
271 QStringList rows;
@@ -285,6 +285,6 @@ private Q_SLOTS:
285 }
285 }
286};
286};
287
287
288−QTEST_GUILESS_MAIN(QSortFilterProxyModelTest)
288+QTEST_GUILESS_MAIN(UnitySortFilterProxyModelTest)
289
289
290−#include "qsortfilterproxymodeltest.moc"
290+#include "unitysortfilterproxymodeltest.moc"
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+1−1
@@ -79,7 +79,7 @@ Item {
79 ListElement { name: "U" }
79 ListElement { name: "U" }
80 }
80 }
81
81
82− SortFilterProxyModel {
82+ UnitySortFilterProxyModel {
83 id: wrappedFakeModel
83 id: wrappedFakeModel
84 model: fakeModel
84 model: fakeModel
85 }
85 }
tests/qmltests/tst_Shell.qml+1−1
@@ -222,7 +222,7 @@ Item {
222
222
223 notifications.model = mockNotificationsModel;
223 notifications.model = mockNotificationsModel;
224
224
225− // FIXME: Hack: SortFilterProxyModelQML doesn't work with QML ListModels which we use
225+ // FIXME: Hack: UnitySortFilterProxyModelQML doesn't work with QML ListModels which we use
226 // for mocking here (RoleType can't be found in the QML model). As we only need to show
226 // for mocking here (RoleType can't be found in the QML model). As we only need to show
227 // one SnapDecision lets just disable the filtering and make appear any notification as a
227 // one SnapDecision lets just disable the filtering and make appear any notification as a
228 // SnapDecision.
228 // SnapDecision.