e4d9829 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

removed tlwm from workspace

e4d9829Nick Dedekind10 years ago

plugins/WindowManager/Workspace.cpp−6

compare with xenial

unifiedsplit

@@ -24,7 +24,6 @@

24Workspace::Workspace(QObject *parent)

25 : QObject(parent)

26 , m_workspace(WindowManagementPolicy::instance()->create_workspace())

27− , m_windowModel(new TopLevelWindowModel)

28 , m_model(nullptr)

27 , m_model(nullptr)

29 , m_active(false)

28 , m_active(false)

30{

29{

@@ -77,8 +76,3 @@ void Workspace::unassign()

77{

76{

78 assign(nullptr);

77 assign(nullptr);

79}

78}

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

31{

32 Q_OBJECT

33 Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)

34− Q_PROPERTY(TopLevelWindowModel* windowModel READ windowModel CONSTANT)

35public:

34public:

36 ~Workspace();

35 ~Workspace();

@@ -39,8 +38,6 @@ public:

40 bool isActive() const { return m_active; }

39 bool isActive() const { return m_active; }

42− TopLevelWindowModel *windowModel() const;

43−

44public Q_SLOTS:

41public Q_SLOTS:

45 void activate();

42 void activate();

46 void unassign();

43 void unassign();

@@ -55,7 +52,6 @@ private:

55 explicit Workspace(QObject *parent = 0);

52 explicit Workspace(QObject *parent = 0);

57 std::shared_ptr<miral::Workspace> m_workspace;

54 std::shared_ptr<miral::Workspace> m_workspace;

58− QScopedPointer<TopLevelWindowModel> m_windowModel;

59 WorkspaceModel* m_model;

55 WorkspaceModel* m_model;

60 bool m_active;

56 bool m_active;