[Merge] lp:~phablet-team/history-service/include-sender-in-info-events into lp:history-service

[Tiago Salem Herrmann]

Review: Needs Fixing



Diff comments:

> 
> === modified file 'Ubuntu/History/historyeventmodel.h'
> --- Ubuntu/History/historyeventmodel.h	2016-09-16 12:04:11 +0000
> +++ Ubuntu/History/historyeventmodel.h	2016-09-16 12:04:12 +0000
> @@ -49,7 +49,8 @@
>          CallMissedRole,
>          CallDurationRole,
>          RemoteParticipantRole,
> -        LastEventRole
> +        LastEventRole,

can you move LastEventRole to be the last item in the enum.
That's used by inherited models to avoid overwriting roles from base classes.

> +        SubjectAsAliasRole
>      };
>  
>      explicit HistoryEventModel(QObject *parent = 0);


-- 
https://code.launchpad.net/~phablet-team/history-service/include-sender-in-info-events/+merge/305941
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/history-service/group-invitation-info-event.