feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Rename QmlProfilerNotesModel::add()

Browse Source 
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>
This commit is contained in:
Ulf Hermann
2016-05-31 14:51:25 +02:00
parent 09b1fe3f20
commit 1fc9bcc025
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
View File

@@ -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);

2
src/plugins/qmlprofiler/qmlprofilernotesmodel.h
View File

@@ -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