textrecording: use Ring item data roles

To bring it into compliance with the other models and make it
easier to use.

Tuleap: #268
Change-Id: I75db5c05cd11f29acb514b3a79334d878850fe13

src/media/textrecording.cpp

@@ -35,6 +35,7 @@
 #include <private/textrecording_p.h>
 #include "globalinstances.h"
 #include "interfaces/pixmapmanipulatori.h"
+#include <itemdataroles.h>
 
 //Std
 #include <ctime>
@@ -650,15 +651,13 @@ QVariant InstantMessagingModel::data( const QModelIndex& idx, int role) const
          case (int)Media::TextRecording::Role::Direction            :
             return QVariant::fromValue(n->m_pMessage->direction);
          case (int)Media::TextRecording::Role::AuthorDisplayname    :
+         case (int)Ring::Role::Name                                 :
             if (n->m_pMessage->direction == Media::Media::Direction::IN)
-               return n->m_pContactMethod->primaryName();
-            else if (m_pRecording->call() && m_pRecording->call()->account()
-              && m_pRecording->call()->account()->contactMethod()->contact()) {
-               return m_pRecording->call()->account()->contactMethod()->primaryName();
-            }
+               return n->m_pContactMethod->roleData(static_cast<int>(Ring::Role::Name));
             else
                return tr("Me");
          case (int)Media::TextRecording::Role::AuthorUri            :
+         case (int)Ring::Role::Number                               :
             return n->m_pContactMethod->uri();
          case (int)Media::TextRecording::Role::AuthorPresenceStatus :
             // Always consider "self" as present

src/media/textrecording.h

@@ -19,6 +19,7 @@
 
 #include <media/recording.h>
 #include <media/media.h>
+#include <itemdataroles.h>
 
 //Qt
 class QJsonObject;
@@ -49,16 +50,16 @@ class LIB_EXPORT TextRecording : public Recording
 public:
 
    enum class Role {
-      Direction            = Qt::UserRole +1,
-      AuthorDisplayname                     ,
-      AuthorUri                             ,
-      AuthorPresenceStatus                  ,
-      Timestamp                             ,
-      IsRead                                ,
-      FormattedDate                         ,
-      IsStatus                              ,
-      HTML                                  ,
-      HasText                               ,
+      Direction            = static_cast<int>(Ring::Role::UserRole) + 1,
+      AuthorDisplayname    ,
+      AuthorUri            ,
+      AuthorPresenceStatus ,
+      Timestamp            ,
+      IsRead               ,
+      FormattedDate        ,
+      IsStatus             ,
+      HTML                 ,
+      HasText              ,
    };
 
    //Constructor