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

18
plugins/qmlprofiler/inputeventsmodel.cpp
View File

@@ -63,6 +63,11 @@ QVariantList InputEventsModel::labels() const
return result;
}
QMetaEnum InputEventsModel::metaEnum(const char *name)
{
return staticQtMetaObject.enumerator(staticQtMetaObject.indexOfEnumerator(name));
}
QVariantMap InputEventsModel::details(int index) const
{
QVariantMap result;
@@ -76,12 +81,11 @@ QVariantMap InputEventsModel::details(int index) const
if (type.isEmpty())
type = tr("Key Release");
if (event.a != 0) {
result.insert(tr("Key"), QLatin1String(
QMetaEnum::fromType<Qt::Key>().valueToKey(event.a)));
result.insert(tr("Key"), QLatin1String(metaEnum("Key").valueToKey(event.a)));
}
if (event.b != 0) {
result.insert(tr("Modifiers"), QLatin1String(
QMetaEnum::fromType<Qt::KeyboardModifiers>().valueToKeys(event.b)));
result.insert(tr("Modifiers"),
QLatin1String(metaEnum("KeyboardModifiers").valueToKeys(event.b)));
}
break;
case QmlDebug::InputMouseDoubleClick:
@@ -92,10 +96,8 @@ QVariantMap InputEventsModel::details(int index) const
case QmlDebug::InputMouseRelease:
if (type.isEmpty())
type = tr("Mouse Release");
result.insert(tr("Button"), QLatin1String(
QMetaEnum::fromType<Qt::MouseButtons>().valueToKey(event.a)));
result.insert(tr("Result"), QLatin1String(
QMetaEnum::fromType<Qt::MouseButtons>().valueToKeys(event.b)));
result.insert(tr("Button"), QLatin1String(metaEnum("MouseButtons").valueToKey(event.a)));
result.insert(tr("Result"), QLatin1String(metaEnum("MouseButtons").valueToKeys(event.b)));
break;
case QmlDebug::InputMouseMove:
type = tr("Mouse Move");