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

Avoid using API introduced in Qt 5.5

Browse Source 
Especially, QMetaEnum::fromType() and friends. Tracking which kinds of
messages were actually generated is better anyway, as we don't get
empty rows like this.

Change-Id: I23c560d9071c0ff5a33dff660e4dbb1552890df8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-11-23 15:46:41 +01:00
parent 8183d81c3e
commit 77fc9a38a2
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/qmlprofiler/debugmessagesmodel.cpp
View File

@@ -30,7 +30,7 @@ bool DebugMessagesModel::accepted(const QmlProfilerDataModel::QmlEventTypeData &
DebugMessagesModel::DebugMessagesModel(QmlProfilerModelManager *manager, QObject *parent) :
QmlProfilerTimelineModel(manager, QmlDebug::DebugMessage, QmlDebug::MaximumRangeType,
QmlDebug::ProfileDebugMessages, parent)
QmlDebug::ProfileDebugMessages, parent), m_maximumMsgType(-1)
{
}
@@ -52,13 +52,19 @@ static const char *messageTypes[] = {
QT_TRANSLATE_NOOP("DebugMessagesModel", "Info Message"),
};
QString DebugMessagesModel::messageType(uint i)
{
return i < sizeof(messageTypes) / sizeof(char *) ? tr(messageTypes[i]) :
tr("Unknown Message %1").arg(i);
}
QVariantList DebugMessagesModel::labels() const
{
QVariantList result;
for (int i = QtDebugMsg; i <= QtInfoMsg; ++i) {
for (int i = 0; i <= m_maximumMsgType; ++i) {
QVariantMap element;
element.insert(QLatin1String("description"), tr(messageTypes[i]));
element.insert(QLatin1String("description"), messageType(i));
element.insert(QLatin1String("id"), i);
result << element;
}
@@ -71,7 +77,7 @@ QVariantMap DebugMessagesModel::details(int index) const
modelManager()->qmlModel()->getEventTypes()[m_data[index].typeId];
QVariantMap result;
result.insert(QLatin1String("displayName"), tr(messageTypes[type.detailType]));
result.insert(QLatin1String("displayName"), messageType(type.detailType));
result.insert(tr("Timestamp"), QmlProfilerDataModel::formatTime(startTime(index)));
result.insert(tr("Message"), m_data[index].text);
result.insert(tr("Location"), type.displayName);
@@ -104,16 +110,19 @@ void DebugMessagesModel::loadData()
m_data.insert(insert(event.startTime(), 0, type.detailType),
MessageData(event.stringData(), event.typeIndex()));
if (type.detailType > m_maximumMsgType)
m_maximumMsgType = event.typeIndex();
updateProgress(count(), simpleModel->getEvents().count());
}
setCollapsedRowCount(2);
setExpandedRowCount(6); // 5 QtMsgTypes + 1
setExpandedRowCount(m_maximumMsgType + 2);
updateProgress(1, 1);
}
void DebugMessagesModel::clear()
{
m_data.clear();
m_maximumMsgType = -1;
QmlProfilerTimelineModel::clear();
}