summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprofiler
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2016-02-29 14:16:27 +0100
committerhjk <hjk@theqtcompany.com>2016-02-29 15:03:58 +0000
commita26d5ece43f06563b6fea57ca9550ddd4d7a769e (patch)
treea3d38984c9606566546252f622a25512b207d71d /src/plugins/qmlprofiler
parent78074999f6cd559a6468331dc3d4cd702139e20e (diff)
downloadqt-creator-a26d5ece43f06563b6fea57ca9550ddd4d7a769e.tar.gz
QmlProfiler: Avoid use of Analyzer::createDockWidget return value
In a quest to make the function return 'void'. Change-Id: I36635c89948ded84b89861f169303a00bf2ea6bf Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmlprofiler')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
index 398d38579f..2e5ddb4228 100644
--- a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
@@ -49,7 +49,6 @@ class QmlProfilerViewManager::QmlProfilerViewManagerPrivate {
public:
QmlProfilerViewManagerPrivate(QmlProfilerViewManager *qq) { Q_UNUSED(qq); }
- QDockWidget *timelineDock;
QmlProfilerTraceView *traceView;
QList<QmlProfilerEventsView *> eventsViews;
QmlProfilerStateManager *profilerState;
@@ -91,7 +90,7 @@ void QmlProfilerViewManager::createViews()
this, &QmlProfilerViewManager::typeSelected);
connect(this, &QmlProfilerViewManager::typeSelected,
d->traceView, &QmlProfilerTraceView::selectByTypeId);
- d->timelineDock = AnalyzerManager::createDockWidget(d->traceView, Constants::QmlProfilerTimelineDock);
+ AnalyzerManager::createDockWidget(d->traceView, Constants::QmlProfilerTimelineDock);
new QmlProfilerStateWidget(d->profilerState, d->profilerModelManager, d->traceView);
@@ -129,7 +128,8 @@ void QmlProfilerViewManager::createViews()
AnalyzerManager::addPerspective(perspective);
settings->endGroup();
- d->timelineDock->raise();
+ QTC_ASSERT(qobject_cast<QDockWidget *>(d->traceView->parentWidget()), return);
+ d->traceView->parentWidget()->raise();
}
bool QmlProfilerViewManager::hasValidSelection() const
@@ -164,7 +164,8 @@ void QmlProfilerViewManager::restrictEventsToRange(qint64 rangeStart, qint64 ran
void QmlProfilerViewManager::raiseTimeline()
{
- d->timelineDock->raise();
+ QTC_ASSERT(qobject_cast<QDockWidget *>(d->traceView->parentWidget()), return);
+ d->traceView->parentWidget()->raise();
d->traceView->setFocus();
}