git.iko.soy/unity8
on xenial help sign in
Change in unity-api means no need to copy enum definition
0c63f82Gerry Boland
tests/mocks/Unity/Application/ApplicationManager.h−10
compare with xenial
unifiedsplit
@@ -31,7 +31,6 @@ using namespace unity::shell::application;
31class ApplicationManager : public ApplicationManagerInterface {
31class ApplicationManager : public ApplicationManagerInterface {
32 Q_OBJECT
32 Q_OBJECT
33 Q_ENUMS(Role)
33 Q_ENUMS(Role)
34− Q_ENUMS(Roles) //inherited, but want to expose to QML
35 Q_ENUMS(StageHint)
34 Q_ENUMS(StageHint)
36 Q_ENUMS(FormFactorHint)
35 Q_ENUMS(FormFactorHint)
37 Q_ENUMS(FavoriteApplication)
36 Q_ENUMS(FavoriteApplication)
@@ -70,15 +69,6 @@ class ApplicationManager : public ApplicationManagerInterface {
70 ForceMainStage = 0x1,
69 ForceMainStage = 0x1,
71 };
70 };
72 Q_DECLARE_FLAGS(ExecFlags, Flag)
71 Q_DECLARE_FLAGS(ExecFlags, Flag)
73− enum Roles { // Q_ENUM of inherited Roles doesn't work?!?!?!
74− RoleAppId = Qt::UserRole,
75− RoleName,
76− RoleComment,
77− RoleIcon,
78− RoleStage,
79− RoleState,
80− RoleFocused,
81− };
82
72
83 int keyboardHeight() const;
73 int keyboardHeight() const;
84 bool keyboardVisible() const;
74 bool keyboardVisible() const;