git.iko.soy/unity8
on xenial help sign in
removed tlwm from workspace
commite4d98297c54b0182450791e50cc24f0535a7e57f authorNick Dedekind <nick.dedekind@canonical.com> dateFri 24 Feb 2017, 10:23 (10 years ago) parent9a5c01f
2 files changed−10
compare with xenial
unifiedsplit
plugins/WindowManager/Workspace.cpp−6 plugins/WindowManager/Workspace.h−4
plugins/WindowManager/Workspace.cpp−6
@@ -24,7 +24,6 @@
2424Workspace::Workspace(QObject *parent)
2525 : QObject(parent)
2626 , m_workspace(WindowManagementPolicy::instance()->create_workspace())
27− , m_windowModel(new TopLevelWindowModel)
2827 , m_model(nullptr)
2928 , m_active(false)
3029{
@@ -77,8 +76,3 @@ void Workspace::unassign()
7776{
7877 assign(nullptr);
7978}
80−
81−TopLevelWindowModel *Workspace::windowModel() const
82−{
83− return m_windowModel.data();
84−}
plugins/WindowManager/Workspace.h−4
@@ -31,7 +31,6 @@ class Workspace : public QObject
3131{
3232 Q_OBJECT
3333 Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
34− Q_PROPERTY(TopLevelWindowModel* windowModel READ windowModel CONSTANT)
3534public:
3635 ~Workspace();
3736
@@ -39,8 +38,6 @@ public:
3938
4039 bool isActive() const { return m_active; }
4140
42− TopLevelWindowModel *windowModel() const;
43−
4441public Q_SLOTS:
4542 void activate();
4643 void unassign();
@@ -55,7 +52,6 @@ private:
5552 explicit Workspace(QObject *parent = 0);
5653
5754 std::shared_ptr<miral::Workspace> m_workspace;
58− QScopedPointer<TopLevelWindowModel> m_windowModel;
5955 WorkspaceModel* m_model;
6056 bool m_active;
6157