From 1fc9bcc025c6fcb14fab35330d85f145f89f0d8d Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 31 May 2016 14:51:25 +0200
Subject: [PATCH] QmlProfiler: Rename QmlProfilerNotesModel::add()

The parent class has a public add() method which has to be qualified if
the child class has a protected one.

Change-Id: I6d61d6123618fc0b5065893656b36559aa5298be
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
---
 src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp | 5 +++--
 src/plugins/qmlprofiler/qmlprofilernotesmodel.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp b/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
index 8717c5dc323..b26caeb1b5e 100644
--- a/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
@@ -32,7 +32,8 @@ QmlProfilerNotesModel::QmlProfilerNotesModel(QObject *parent) : TimelineNotesMod
 {
 }
 
-int QmlProfilerNotesModel::add(int typeId, qint64 start, qint64 duration, const QString &text)
+int QmlProfilerNotesModel::addQmlNote(int typeId, qint64 start, qint64 duration,
+                                      const QString &text)
 {
     int timelineModel = -1;
     int timelineIndex = -1;
@@ -66,7 +67,7 @@ void QmlProfilerNotesModel::loadData()
     TimelineNotesModel::clear();
     for (int i = 0; i != m_notes.size(); ++i) {
         const QmlNote &note = m_notes[i];
-        add(note.typeIndex, note.startTime, note.duration, note.text);
+        addQmlNote(note.typeIndex, note.startTime, note.duration, note.text);
     }
     resetModified();
     blockSignals(false);
diff --git a/src/plugins/qmlprofiler/qmlprofilernotesmodel.h b/src/plugins/qmlprofiler/qmlprofilernotesmodel.h
index 26f56c102fa..dc3493ce17d 100644
--- a/src/plugins/qmlprofiler/qmlprofilernotesmodel.h
+++ b/src/plugins/qmlprofiler/qmlprofilernotesmodel.h
@@ -47,6 +47,6 @@ public:
 protected:
     QVector<QmlNote> m_notes;
 
-    int add(int typeId, qint64 startTime, qint64 duration, const QString &text);
+    int addQmlNote(int typeId, qint64 startTime, qint64 duration, const QString &text);
 };
 } // namespace QmlProfiler