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

QmlProfiler: remove dead code

Browse Source 
Change-Id: I9f55fa23056b33fe55d0621058978aa45b0fa622
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-03-24 15:23:48 +01:00
parent 259c3cb4d4
commit 9ddf44cb9a
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -71,16 +71,10 @@ class QmlProfilerTraceView::QmlProfilerTraceViewPrivate
public: public:
QmlProfilerTraceViewPrivate(QmlProfilerTraceView *qq) : q(qq) {} QmlProfilerTraceViewPrivate(QmlProfilerTraceView *qq) : q(qq) {}
QmlProfilerTraceView *q; QmlProfilerTraceView *q;
QmlProfilerViewManager *m_viewContainer; QmlProfilerViewManager *m_viewContainer;
QSize m_sizeHint;
QQuickWidget *m_mainView; QQuickWidget *m_mainView;
QmlProfilerModelManager *m_modelManager; QmlProfilerModelManager *m_modelManager;
Timeline::TimelineModelAggregator *m_modelProxy; Timeline::TimelineModelAggregator *m_modelProxy;
Timeline::TimelineZoomControl *m_zoomControl; Timeline::TimelineZoomControl *m_zoomControl;
}; };

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

@@ -34,7 +34,6 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/fancymainwindow.h>
#include <debugger/analyzer/analyzermanager.h> #include <debugger/analyzer/analyzermanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -81,8 +80,6 @@ void QmlProfilerViewManager::createViews()
QTC_ASSERT(d->profilerModelManager, return); QTC_ASSERT(d->profilerModelManager, return);
QTC_ASSERT(d->profilerState, return); QTC_ASSERT(d->profilerState, return);
//Utils::FancyMainWindow *mw = Debugger::mainWindow();
d->traceView = new QmlProfilerTraceView(0, this, d->profilerModelManager); d->traceView = new QmlProfilerTraceView(0, this, d->profilerModelManager);
d->traceView->setWindowTitle(tr("Timeline")); d->traceView->setWindowTitle(tr("Timeline"));
connect(d->traceView, &QmlProfilerTraceView::gotoSourceLocation, connect(d->traceView, &QmlProfilerTraceView::gotoSourceLocation,
@@ -103,11 +100,6 @@ void QmlProfilerViewManager::createViews()
if (d->eventsViewFactory) if (d->eventsViewFactory)
d->eventsViews.append(d->eventsViewFactory->create(0, d->profilerModelManager)); d->eventsViews.append(d->eventsViewFactory->create(0, d->profilerModelManager));
// Clear settings if the new views aren't there yet. Otherwise we get glitches
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String("AnalyzerViewSettings_") +
QLatin1String(QmlProfiler::Constants::QmlProfilerPerspectiveId));
foreach (QmlProfilerEventsView *view, d->eventsViews) { foreach (QmlProfilerEventsView *view, d->eventsViews) {
connect(view, &QmlProfilerEventsView::typeSelected, connect(view, &QmlProfilerEventsView::typeSelected,
this, &QmlProfilerViewManager::typeSelected); this, &QmlProfilerViewManager::typeSelected);
@@ -122,14 +114,9 @@ void QmlProfilerViewManager::createViews()
QByteArray dockId = view->objectName().toLatin1(); QByteArray dockId = view->objectName().toLatin1();
perspective.addOperation({dockId, view, Constants::QmlProfilerTimelineDockId, Perspective::AddToTab}); perspective.addOperation({dockId, view, Constants::QmlProfilerTimelineDockId, Perspective::AddToTab});
new QmlProfilerStateWidget(d->profilerState, d->profilerModelManager, view); new QmlProfilerStateWidget(d->profilerState, d->profilerModelManager, view);
// if (!settings->contains(view->parent()->objectName())) // parent() is QDockWidget.
// settings->remove(QString());
} }
perspective.addOperation({Constants::QmlProfilerTimelineDockId, 0, {}, Perspective::Raise}); perspective.addOperation({Constants::QmlProfilerTimelineDockId, 0, {}, Perspective::Raise});
Debugger::registerPerspective(Constants::QmlProfilerPerspectiveId, perspective); Debugger::registerPerspective(Constants::QmlProfilerPerspectiveId, perspective);
settings->endGroup();
} }
bool QmlProfilerViewManager::hasValidSelection() const bool QmlProfilerViewManager::hasValidSelection() const