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

QmlDebug/QmlProfiler: Fix MSVC warnings

Browse Source 
qmlprofilertraceclient.cpp:280: warning: C4334: '<<' : result of 32-bit
shift implicitly converted to 64 bits (was 64-bit shift intended?)

qmlprofilertool.cpp:539: warning: C4554: '<<' : check operator
precedence for possible error; use parentheses to clarify precedence

Change-Id: Ifaa048d42bccf203e6587a474c197c22b0f69fec
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
This commit is contained in:
Orgad Shaneh
2014-09-24 07:59:13 +03:00
committed by Orgad Shaneh
parent 7aed3d3d76
commit 52574da031
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmldebug/qmlprofilertraceclient.cpp
View File

@@ -277,7 +277,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
break; break;
} }
case RangeStart: { case RangeStart: {
if (!(d->features & (1 << featureFromRangeType(static_cast<RangeType>(subtype))))) if (!(d->features & (1ULL << featureFromRangeType(static_cast<RangeType>(subtype)))))
break; break;
d->rangeStartTimes[subtype].push(time); d->rangeStartTimes[subtype].push(time);
d->inProgressRanges |= (static_cast<qint64>(1) << subtype); d->inProgressRanges |= (static_cast<qint64>(1) << subtype);
@@ -293,7 +293,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
break; break;
} }
case RangeData: { case RangeData: {
if (!(d->features & (1 << featureFromRangeType(static_cast<RangeType>(subtype))))) if (!(d->features & (1ULL << featureFromRangeType(static_cast<RangeType>(subtype)))))
break; break;
QString data; QString data;
stream >> data; stream >> data;
@@ -307,7 +307,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
break; break;
} }
case RangeLocation: { case RangeLocation: {
if (!(d->features & (1 << featureFromRangeType(static_cast<RangeType>(subtype))))) if (!(d->features & (1ULL << featureFromRangeType(static_cast<RangeType>(subtype)))))
break; break;
QString fileName; QString fileName;
int line; int line;
@@ -322,7 +322,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
break; break;
} }
case RangeEnd: { case RangeEnd: {
if (!(d->features & (1 << featureFromRangeType(static_cast<RangeType>(subtype))))) if (!(d->features & (1ULL << featureFromRangeType(static_cast<RangeType>(subtype)))))
break; break;
if (d->rangeCount[subtype] == 0) if (d->rangeCount[subtype] == 0)
break; break;

2
src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
View File

@@ -69,7 +69,7 @@ RangeTimelineModel::RangeTimelineModel(QmlDebug::RangeType rangeType, QObject *p
quint64 RangeTimelineModel::features() const quint64 RangeTimelineModel::features() const
{ {
Q_D(const RangeTimelineModel); Q_D(const RangeTimelineModel);
return 1 << QmlDebug::featureFromRangeType(d->rangeType); return 1ULL << QmlDebug::featureFromRangeType(d->rangeType);
} }
void RangeTimelineModel::clear() void RangeTimelineModel::clear()

8
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -531,12 +531,12 @@ void QmlProfilerTool::clientsDisconnected()
template<QmlDebug::ProfileFeature feature> template<QmlDebug::ProfileFeature feature>
void QmlProfilerTool::updateFeaturesMenu(quint64 features) void QmlProfilerTool::updateFeaturesMenu(quint64 features)
{ {
if (features & (1 << feature)) { if (features & (1ULL << (feature))) {
QAction *action = d->m_featuresMenu->addAction(tr(QmlProfilerModelManager::featureName( QAction *action = d->m_featuresMenu->addAction(tr(QmlProfilerModelManager::featureName(
static_cast<QmlDebug::ProfileFeature>(feature)))); static_cast<QmlDebug::ProfileFeature>(feature))));
action->setCheckable(true); action->setCheckable(true);
action->setData(static_cast<uint>(feature)); action->setData(static_cast<uint>(feature));
action->setChecked(d->m_profilerState->recordingFeatures() & (1 << feature)); action->setChecked(d->m_profilerState->recordingFeatures() & (1ULL << (feature)));
} }
updateFeaturesMenu<static_cast<QmlDebug::ProfileFeature>(feature + 1)>(features); updateFeaturesMenu<static_cast<QmlDebug::ProfileFeature>(feature + 1)>(features);
} }
@@ -664,10 +664,10 @@ void QmlProfilerTool::toggleRecordingFeature(QAction *action)
uint feature = action->data().toUInt(); uint feature = action->data().toUInt();
if (action->isChecked()) if (action->isChecked())
d->m_profilerState->setRecordingFeatures( d->m_profilerState->setRecordingFeatures(
d->m_profilerState->recordingFeatures() | (1 << feature)); d->m_profilerState->recordingFeatures() | (1ULL << feature));
else else
d->m_profilerState->setRecordingFeatures( d->m_profilerState->setRecordingFeatures(
d->m_profilerState->recordingFeatures() & (~(1 << feature))); d->m_profilerState->recordingFeatures() & (~(1ULL << feature)));
// Keep the menu open to allow for more features to be toggled // Keep the menu open to allow for more features to be toggled
d->m_recordButton->showMenu(); d->m_recordButton->showMenu();