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

QmlProfiler: Avoid use of Analyzer::createDockWidget return value

Browse Source 
In a quest to make the function return 'void'.

Change-Id: I36635c89948ded84b89861f169303a00bf2ea6bf
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
This commit is contained in:
hjk
2016-02-29 14:16:27 +01:00
parent 78074999f6
commit a26d5ece43
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
View File

@@ -49,7 +49,6 @@ class QmlProfilerViewManager::QmlProfilerViewManagerPrivate {
public: public:
QmlProfilerViewManagerPrivate(QmlProfilerViewManager *qq) { Q_UNUSED(qq); } QmlProfilerViewManagerPrivate(QmlProfilerViewManager *qq) { Q_UNUSED(qq); }
QDockWidget *timelineDock;
QmlProfilerTraceView *traceView; QmlProfilerTraceView *traceView;
QList<QmlProfilerEventsView *> eventsViews; QList<QmlProfilerEventsView *> eventsViews;
QmlProfilerStateManager *profilerState; QmlProfilerStateManager *profilerState;
@@ -91,7 +90,7 @@ void QmlProfilerViewManager::createViews()
this, &QmlProfilerViewManager::typeSelected); this, &QmlProfilerViewManager::typeSelected);
connect(this, &QmlProfilerViewManager::typeSelected, connect(this, &QmlProfilerViewManager::typeSelected,
d->traceView, &QmlProfilerTraceView::selectByTypeId); 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); new QmlProfilerStateWidget(d->profilerState, d->profilerModelManager, d->traceView);
@@ -129,7 +128,8 @@ void QmlProfilerViewManager::createViews()
AnalyzerManager::addPerspective(perspective); AnalyzerManager::addPerspective(perspective);
settings->endGroup(); settings->endGroup();
d->timelineDock->raise(); QTC_ASSERT(qobject_cast<QDockWidget *>(d->traceView->parentWidget()), return);
d->traceView->parentWidget()->raise();
} }
bool QmlProfilerViewManager::hasValidSelection() const bool QmlProfilerViewManager::hasValidSelection() const
@@ -164,7 +164,8 @@ void QmlProfilerViewManager::restrictEventsToRange(qint64 rangeStart, qint64 ran
void QmlProfilerViewManager::raiseTimeline() void QmlProfilerViewManager::raiseTimeline()
{ {
d->timelineDock->raise(); QTC_ASSERT(qobject_cast<QDockWidget *>(d->traceView->parentWidget()), return);
d->traceView->parentWidget()->raise();
d->traceView->setFocus(); d->traceView->setFocus();
} }