git.iko.soy/unity8
on xenial help sign in
renamed mirobjectmodel->objectlistmodel for same in qtmir
commitb4e331f0fbb30017e981b251aa2b817b8bfbfadc authorNick Dedekind <nick.dedekind@canonical.com> dateFri 29 Aug 2014, 12:22 (12 years ago) parentb604951
5 files changed+16−17
compare with xenial
unifiedsplit
tests/mocks/Unity/Application/CMakeLists.txt+3−3 tests/mocks/Unity/Application/MirSurfaceItemModel.h+4−4 tests/mocks/Unity/Application/MirObjectModel.h → tests/mocks/Unity/Application/ObjectListModel.h+5−7 tests/mocks/Unity/Application/Session.h+1 tests/mocks/Unity/Application/SessionModel.h+3−3
tests/mocks/Unity/Application/CMakeLists.txt+3−3
@@ -6,12 +6,12 @@ set(FakeUnityApplicationQml_SOURCES
66 ApplicationManager.cpp
77 ApplicationScreenshotProvider.cpp
88 ApplicationTestInterface.cpp
9− Session.cpp
109 MirSurfaceItem.cpp
10+ MirSurfaceItemModel.h
11+ ObjectListModel.h
12+ Session.cpp
1113 SessionManager.cpp
1214 SurfaceManager.cpp
13− MirObjectModel.h
14− MirSurfaceItemModel.h
1515 SessionModel.h
1616 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
1717 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
tests/mocks/Unity/Application/MirSurfaceItemModel.h+4−4
@@ -17,15 +17,15 @@
1717#ifndef MIRSURFACEITEMMODEL_H
1818#define MIRSURFACEITEMMODEL_H
1919
20−// Llocal
21−#include "MirObjectModel.h"
20+// Local
21+#include "ObjectListModel.h"
2222
2323class MirSurfaceItem;
24−class MirSurfaceItemModel: public MirObjectModel<MirSurfaceItem>
24+class MirSurfaceItemModel: public ObjectListModel<MirSurfaceItem>
2525{
2626 Q_OBJECT
2727public:
28− MirSurfaceItemModel(QObject *parent = 0): MirObjectModel(parent) {}
28+ MirSurfaceItemModel(QObject *parent = 0): ObjectListModel(parent) {}
2929
3030 Q_INVOKABLE int count() const { return rowCount(); }
3131};
tests/mocks/Unity/Application/MirObjectModel.h → tests/mocks/Unity/Application/ObjectListModel.hrenamed+5−7
@@ -14,19 +14,17 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−#ifndef MIROBJECTMODEL_H
18−#define MIROBJECTMODEL_H
17+#ifndef OBJECTLISTMODEL_H
18+#define OBJECTLISTMODEL_H
1919
2020// Qt
2121#include <QAbstractListModel>
2222
23−class MirSurfaceItem;
24−
2523template<class TYPE>
26−class MirObjectModel : public QAbstractListModel
24+class ObjectListModel : public QAbstractListModel
2725{
2826public:
29− MirObjectModel(QObject *parent = 0)
27+ ObjectListModel(QObject *parent = 0)
3028 : QAbstractListModel(parent)
3129 {}
3230
@@ -105,4 +103,4 @@ protected:
105103 QList<TYPE*> m_items;
106104};
107105
108−#endif // MIROBJECTMODEL_H
106+#endif // OBJECTLISTMODEL_H
tests/mocks/Unity/Application/Session.h+1
@@ -22,6 +22,7 @@
2222#include <QQuickItem>
2323
2424class ApplicationInfo;
25+class MirSurfaceItem;
2526
2627class Session : public QObject
2728{
tests/mocks/Unity/Application/SessionModel.h+3−3
@@ -18,14 +18,14 @@
1818#define SESSIONMODEL_H
1919
2020// Local
21−#include "MirObjectModel.h"
21+#include "ObjectListModel.h"
2222
2323class Session;
24−class SessionModel: public MirObjectModel<Session>
24+class SessionModel: public ObjectListModel<Session>
2525{
2626 Q_OBJECT
2727public:
28− SessionModel(QObject *parent = 0): MirObjectModel(parent) {}
28+ SessionModel(QObject *parent = 0): ObjectListModel(parent) {}
2929
3030 Q_INVOKABLE int count() const { return rowCount(); }
3131};