summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2014-12-09 11:01:23 +0100
committerUlf Hermann <ulf.hermann@theqtcompany.com>2014-12-15 14:51:33 +0100
commit516c0d6020c864ecd1a20cc07e30e4452823e03b (patch)
tree7b015bfd7c4d46c741b0b17ad4b2178e21fd0928 /src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
parentc86efd21792dc9b1039fbe4d60ce901dec9723b2 (diff)
downloadqt-creator-516c0d6020c864ecd1a20cc07e30e4452823e03b.tar.gz
QmlProfiler: Move timeline classes into own namespace
The new namespace "Timeline" is for classes that are supposed to go to the generic timeline library later. Change-Id: I1f6dce59de2c37398b1ed89473e1a94ec020104b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
index 0a9edaeec2..016dabcbfc 100644
--- a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
@@ -40,7 +40,7 @@ public:
BindingLoopMaterial();
};
-struct BindingLoopsRenderPassState : public TimelineRenderPass::State {
+struct BindingLoopsRenderPassState : public Timeline::TimelineRenderPass::State {
BindingLoopsRenderPassState() : indexFrom(std::numeric_limits<int>::max()), indexTo(-1) {}
BindingLoopMaterial material;
int indexFrom;
@@ -81,7 +81,8 @@ QmlProfilerBindingLoopsRenderPass::QmlProfilerBindingLoopsRenderPass()
}
void updateNodes(const QmlProfilerRangeModel *model, int from, int to,
- const TimelineRenderState *parentState, BindingLoopsRenderPassState *state)
+ const Timeline::TimelineRenderState *parentState,
+ BindingLoopsRenderPassState *state)
{
QVector<BindlingLoopsGeometry> expandedPerRow(model->expandedRowCount());
BindlingLoopsGeometry collapsed;
@@ -114,7 +115,7 @@ void updateNodes(const QmlProfilerRangeModel *model, int from, int to,
state->collapsedOverlay->appendChildNode(collapsed.node);
}
- int rowHeight = TimelineModel::defaultRowHeight();
+ int rowHeight = Timeline::TimelineModel::defaultRowHeight();
for (int i = from; i < to; ++i) {
int bindingLoopDest = model->bindingLoopDest(i);
if (bindingLoopDest == -1)
@@ -141,8 +142,9 @@ void updateNodes(const QmlProfilerRangeModel *model, int from, int to,
}
}
-TimelineRenderPass::State *QmlProfilerBindingLoopsRenderPass::update(
- const TimelineRenderer *renderer, const TimelineRenderState *parentState, State *oldState,
+Timeline::TimelineRenderPass::State *QmlProfilerBindingLoopsRenderPass::update(
+ const Timeline::TimelineRenderer *renderer,
+ const Timeline::TimelineRenderState *parentState, State *oldState,
int indexFrom, int indexTo, bool stateChanged, qreal spacing) const
{
Q_UNUSED(stateChanged);
@@ -238,7 +240,7 @@ void BindlingLoopsGeometry::allocate(QSGMaterial *material)
void BindlingLoopsGeometry::addExpandedEvent(float itemCenter)
{
- float verticalCenter = TimelineModel::defaultRowHeight() / 2.0;
+ float verticalCenter = Timeline::TimelineModel::defaultRowHeight() / 2.0;
Point2DWithOffset *v = vertexData() + usedVertices;
v[0].set(itemCenter, verticalCenter, -1.0f, currentY);
v[1].set(itemCenter, verticalCenter, +1.0f, currentY);