git.iko.soy/unity8
on xenial help sign in
renamed mirobjectmodel->objectlistmodel for same in qtmir
b4e331fNick Dedekind
tests/mocks/Unity/Application/CMakeLists.txt+3−3
compare with xenial
unifiedsplit
@@ -6,12 +6,12 @@ set(FakeUnityApplicationQml_SOURCES
6 ApplicationManager.cpp
6 ApplicationManager.cpp
7 ApplicationScreenshotProvider.cpp
7 ApplicationScreenshotProvider.cpp
8 ApplicationTestInterface.cpp
8 ApplicationTestInterface.cpp
9− Session.cpp
10 MirSurfaceItem.cpp
9 MirSurfaceItem.cpp
10+ MirSurfaceItemModel.h
11+ ObjectListModel.h
12+ Session.cpp
11 SessionManager.cpp
13 SessionManager.cpp
12 SurfaceManager.cpp
14 SurfaceManager.cpp
13− MirObjectModel.h
14− MirSurfaceItemModel.h
15 SessionModel.h
15 SessionModel.h
16 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
16 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
17 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
17 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
tests/mocks/Unity/Application/MirSurfaceItemModel.h+4−4
@@ -17,15 +17,15 @@
17#ifndef MIRSURFACEITEMMODEL_H
17#ifndef MIRSURFACEITEMMODEL_H
18#define MIRSURFACEITEMMODEL_H
18#define MIRSURFACEITEMMODEL_H
19
19
20−// Llocal
20+// Local
21−#include "MirObjectModel.h"
21+#include "ObjectListModel.h"
22
22
23class MirSurfaceItem;
23class MirSurfaceItem;
24−class MirSurfaceItemModel: public MirObjectModel<MirSurfaceItem>
24+class MirSurfaceItemModel: public ObjectListModel<MirSurfaceItem>
25{
25{
26 Q_OBJECT
26 Q_OBJECT
27public:
27public:
28− MirSurfaceItemModel(QObject *parent = 0): MirObjectModel(parent) {}
28+ MirSurfaceItemModel(QObject *parent = 0): ObjectListModel(parent) {}
29
29
30 Q_INVOKABLE int count() const { return rowCount(); }
30 Q_INVOKABLE int count() const { return rowCount(); }
31};
31};
tests/mocks/Unity/Application/MirObjectModel.h → tests/mocks/Unity/Application/ObjectListModel.hrenamed+5−7
@@ -14,19 +14,17 @@
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 MIROBJECTMODEL_H
17+#ifndef OBJECTLISTMODEL_H
18−#define MIROBJECTMODEL_H
18+#define OBJECTLISTMODEL_H
19
19
20// Qt
20// Qt
21#include <QAbstractListModel>
21#include <QAbstractListModel>
22
22
23−class MirSurfaceItem;
24−
25template<class TYPE>
23template<class TYPE>
26−class MirObjectModel : public QAbstractListModel
24+class ObjectListModel : public QAbstractListModel
27{
25{
28public:
26public:
29− MirObjectModel(QObject *parent = 0)
27+ ObjectListModel(QObject *parent = 0)
30 : QAbstractListModel(parent)
28 : QAbstractListModel(parent)
31 {}
29 {}
32
30
@@ -105,4 +103,4 @@ protected:
105 QList<TYPE*> m_items;
103 QList<TYPE*> m_items;
106};
104};
107
105
108−#endif // MIROBJECTMODEL_H
106+#endif // OBJECTLISTMODEL_H
tests/mocks/Unity/Application/Session.h+1
@@ -22,6 +22,7 @@
22#include <QQuickItem>
22#include <QQuickItem>
23
23
24class ApplicationInfo;
24class ApplicationInfo;
25+class MirSurfaceItem;
25
26
26class Session : public QObject
27class Session : public QObject
27{
28{
tests/mocks/Unity/Application/SessionModel.h+3−3
@@ -18,14 +18,14 @@
18#define SESSIONMODEL_H
18#define SESSIONMODEL_H
19
19
20// Local
20// Local
21−#include "MirObjectModel.h"
21+#include "ObjectListModel.h"
22
22
23class Session;
23class Session;
24−class SessionModel: public MirObjectModel<Session>
24+class SessionModel: public ObjectListModel<Session>
25{
25{
26 Q_OBJECT
26 Q_OBJECT
27public:
27public:
28− SessionModel(QObject *parent = 0): MirObjectModel(parent) {}
28+ SessionModel(QObject *parent = 0): ObjectListModel(parent) {}
29
29
30 Q_INVOKABLE int count() const { return rowCount(); }
30 Q_INVOKABLE int count() const { return rowCount(); }
31};
31};