diff --git a/vcs/models/vcsannotationmodel.cpp b/vcs/models/vcsannotationmodel.cpp
index d587fc28c7..0bb0a3cd94 100644
--- a/vcs/models/vcsannotationmodel.cpp
+++ b/vcs/models/vcsannotationmodel.cpp
@@ -1,183 +1,183 @@
 /***************************************************************************
  *   This file is part of KDevelop                                         *
  *   Copyright 2007 Andreas Pakulat <apaku@gmx.de>                         *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
  *   published by the Free Software Foundation; either version 2 of the    *
  *   License, or (at your option) any later version.                       *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU Library General Public     *
  *   License along with this program; if not, write to the                 *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "vcsannotationmodel.h"
 
 #include "../vcsannotation.h"
 #include "../vcsrevision.h"
 #include "../vcsjob.h"
 
 #include <QDateTime>
 #include <QBrush>
 #include <QPen>
 #include <QHash>
 #include <QLocale>
 #include <QUrl>
 #include <QApplication>
 
 #include <KLocalizedString>
 
 #include <interfaces/icore.h>
 #include <interfaces/iruncontroller.h>
 
 namespace KDevelop
 {
 
 class VcsAnnotationModelPrivate
 {
 public:
     explicit VcsAnnotationModelPrivate( VcsAnnotationModel* q_ ) : q(q_) {}
     KDevelop::VcsAnnotation m_annotation;
     QHash<KDevelop::VcsRevision,QBrush> m_brushes;
     VcsAnnotationModel* q;
     VcsJob* job;
     QColor foreground;
     QColor background;
 
     void addLines( KDevelop::VcsJob* job )
     {
         if( job == this->job )
         {
             foreach( const QVariant& v, job->fetchResults().toList() )
             {
                 if( v.canConvert<KDevelop::VcsAnnotationLine>() )
                 {
                     VcsAnnotationLine l = v.value<KDevelop::VcsAnnotationLine>();
                     if( !m_brushes.contains( l.revision() ) )
                     {
                         const int background_y = background.red()*0.299 + 0.587*background.green()
                                                                         + 0.114*background.blue();
                         int u = ( float(qrand()) / RAND_MAX ) * 255;
                         int v = ( float(qrand()) / RAND_MAX ) * 255;
                         float r = qMin(255.0, qMax(0.0, background_y + 1.402*(v-128)));
                         float g = qMin(255.0, qMax(0.0, background_y - 0.344*(u-128) - 0.714*(v-128)));
                         float b = qMin(255.0, qMax(0.0, background_y + 1.772*(u-128)));
                         m_brushes.insert( l.revision(), QBrush( QColor( r, g, b ) ) );
                     }
                     m_annotation.insertLine( l.lineNumber(), l );
                     emit q->lineChanged( l.lineNumber() );
                 }
             }
         }
     }
 };
 
 VcsAnnotationModel::VcsAnnotationModel(VcsJob *job, const QUrl& url, QObject* parent,
                                        const QColor &foreground, const QColor &background)
     : d( new VcsAnnotationModelPrivate( this ) )
 {
     setParent( parent );
     d->m_annotation.setLocation( url );
     d->job = job;
     d->foreground = foreground;
     d->background = background;
     qsrand( QDateTime().toTime_t() );
     connect( d->job, &VcsJob::resultsReady,this, [&] (VcsJob* job) { d->addLines(job); } );
     ICore::self()->runController()->registerJob( d->job );
 }
 
 VcsAnnotationModel::~VcsAnnotationModel()
 {
     delete d;
 }
 
 static QString abbreviateLastName(const QString& author) {
     auto parts = author.split(' ');
     bool onlyOneFragment = parts.size() == 1 || ( parts.size() == 2 && parts.at(1).isEmpty() );
     return onlyOneFragment ? parts.first() : parts.first() + QStringLiteral(" %1.").arg(parts.last()[0]);
 }
 
 static QString annotationToolTip(const VcsAnnotationLine& aline)
 {
     const bool textIsLeftToRight = (QApplication::layoutDirection() == Qt::LeftToRight);
 
     const QString boldStyle = QStringLiteral(";font-weight:bold");
     const QString one = QStringLiteral("1");
     const QString two = QStringLiteral("2");
     const QString line = QStringLiteral(
         "<tr>"
           "<td align=\"right\" style=\"white-space:nowrap%1\">%%2</td>"
           "<td align=\"left\" style=\"white-space:nowrap%3\">%%4</td>"
         "</tr>").arg(
             (textIsLeftToRight ? boldStyle : QString()),
             (textIsLeftToRight ? one : two),
             (textIsLeftToRight ? QString() : boldStyle),
             (textIsLeftToRight ? two : one)
         );
 
     const QString authorLabel = i18n("Author:").toHtmlEscaped();
     const QString dateLabel = i18n("Date:").toHtmlEscaped();
     const QString messageLabel = i18n("Commit message:").toHtmlEscaped();
 
     const QString author = aline.author().toHtmlEscaped();
     const QString date = QLocale().toString(aline.date()).toHtmlEscaped();
     const QString message = aline.commitMessage().toHtmlEscaped().replace(QLatin1Char('\n'), QLatin1String("<br/>"));
 
     return
         QLatin1String("<table>") +
         line.arg(authorLabel, author) +
         line.arg(dateLabel, date) +
         line.arg(messageLabel, message) +
         QLatin1String("</table>");
 }
 
 QVariant VcsAnnotationModel::data( int line, Qt::ItemDataRole role ) const
 {
     if( line < 0 || !d->m_annotation.containsLine( line ) )
     {
         return QVariant();
     }
 
     KDevelop::VcsAnnotationLine aline = d->m_annotation.line( line );
     if( role == Qt::ForegroundRole )
     {
         return QVariant(QPen(d->foreground));
     }
     if( role == Qt::BackgroundRole )
     {
         return QVariant( d->m_brushes[aline.revision()] );
     } else if( role == Qt::DisplayRole )
     {
         return QVariant( QStringLiteral("%1 ").arg(aline.date().date().year()) + abbreviateLastName(aline.author()) );
-    } else if( role == Qt::UserRole ) // TODO KDE5: replace by KTextEditor::AnnotationModel::GroupIdentifierRole
+    } else if( role == KTextEditor::AnnotationModel::GroupIdentifierRole )
     {
         return aline.revision().revisionValue();
     } else if( role == Qt::ToolTipRole )
     {
         return QVariant(annotationToolTip(aline));
     }
     return QVariant();
 }
 
 VcsRevision VcsAnnotationModel::revisionForLine( int line ) const
 {
     ///FIXME: update the annotation bar on edit/reload somehow
     ///BUG: https://bugs.kde.org/show_bug.cgi?id=269757
     if (!d->m_annotation.containsLine(line)) {
         return VcsRevision();
     }
 
     Q_ASSERT(line > 0 && d->m_annotation.containsLine( line ));
     return d->m_annotation.line( line ).revision();
 }
 
 }
 
 #include "moc_vcsannotationmodel.cpp"