summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-02-17 16:13:04 +0100
committerUlf Hermann <ulf.hermann@digia.com>2014-02-19 16:39:14 +0100
commit19652d7b841fad1768549e889506d02d465deacc (patch)
tree844eb36bd39af055472bda11517ba21435bfad3a
parentd809037302b9298ec1642f2026067b64bc606c2e (diff)
downloadqt-creator-19652d7b841fad1768549e889506d02d465deacc.tar.gz
QmlProfiler: Remove dead code.
Change-Id: Ib44094740e93f1389c3caa07371866714a375f04 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--src/plugins/qmlprofiler/qmlprofilereventview.cpp9
-rw-r--r--src/plugins/qmlprofiler/qmlprofilereventview.h2
-rw-r--r--src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp1
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp1
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h2
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp10
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h6
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertracefile.cpp3
-rw-r--r--src/plugins/qmlprofiler/timelinemodelaggregator.cpp6
9 files changed, 0 insertions, 40 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
index 97a0568f80..90d4cf1538 100644
--- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
@@ -341,8 +341,6 @@ QmlProfilerEventsMainView::QmlProfilerEventsMainView(QWidget *parent,
d->modelProxy = modelProxy;
connect(d->modelProxy,SIGNAL(dataAvailable()), this, SLOT(buildModel()));
-// connect(d->modelProxy,SIGNAL(stateChanged()),
-// this,SLOT(profilerDataModelStateChanged()));
d->m_firstNumericColumn = 0;
d->m_preventSelectBounce = false;
d->m_showExtendedStatistics = false;
@@ -366,7 +364,6 @@ QmlProfilerEventsMainView::QmlProfilerEventsMainView(QWidget *parent,
QmlProfilerEventsMainView::~QmlProfilerEventsMainView()
{
clear();
- //delete d->modelProxy;
delete d->m_model;
delete d;
}
@@ -808,7 +805,6 @@ void QmlProfilerEventRelativesView::rebuildTree(QmlProfilerEventRelativesModelPr
QStandardItem *topLevelItem = treeModel()->invisibleRootItem();
- //foreach (const QmlProfilerEventParentsModelProxy::QmlEventParentData &event, eventMap.values()) {
foreach (const QString &key, eventMap.keys()) {
const QmlProfilerEventRelativesModelProxy::QmlEventRelativesData &event = eventMap[key];
QList<QStandardItem *> newRow;
@@ -822,11 +818,6 @@ void QmlProfilerEventRelativesView::rebuildTree(QmlProfilerEventRelativesModelPr
newRow << new EventsViewItem(QString::number(event.calls));
newRow << new EventsViewItem(event.details);
-// newRow << new EventsViewItem(event->reference->displayName);
-// newRow << new EventsViewItem(QmlProfilerEventsMainView::nameForType(event->reference->eventType));
-// newRow << new EventsViewItem(QmlProfilerBaseModel::formatTime(event->duration));
-// newRow << new EventsViewItem(QString::number(event->calls));
-// newRow << new EventsViewItem(event->reference->details);
newRow.at(0)->setData(QVariant(key), EventHashStrRole);
newRow.at(2)->setData(QVariant(event.duration));
newRow.at(3)->setData(QVariant(event.calls));
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.h b/src/plugins/qmlprofiler/qmlprofilereventview.h
index 0a3d2aea30..066e224ab3 100644
--- a/src/plugins/qmlprofiler/qmlprofilereventview.h
+++ b/src/plugins/qmlprofiler/qmlprofilereventview.h
@@ -118,7 +118,6 @@ public:
static QString nameForType(int typeNumber);
void getStatisticsInRange(qint64 rangeStart, qint64 rangeEnd);
-// int selectedEventId() const;
QString selectedEventHash() const;
void setShowExtendedStatistics(bool);
@@ -170,7 +169,6 @@ private:
void rebuildTree(QmlProfilerEventParentsModelProxy::QmlEventRelativesMap eventMap);
void updateHeader();
QStandardItemModel *treeModel();
-// QmlProfilerModelManager *m_profilerModelManager;
class QmlProfilerEventParentsViewPrivate;
QmlProfilerEventParentsViewPrivate *d;
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index 8f27f6a56a..3f9ec65268 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -161,7 +161,6 @@ QmlProfilerModelManager::QmlProfilerModelManager(Utils::FileInProjectFinder *fin
d->totalWeight = 0;
d->model = new QmlProfilerDataModel(finder, this);
d->v8Model = new QV8ProfilerDataModel(finder, this);
-// d->model = new QmlProfilerSimpleModel(this);
d->dataState = new QmlProfilerDataState(this, this);
d->traceTime = new QmlProfilerTraceTime(this);
}
diff --git a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp
index b57e842deb..abe61c734b 100644
--- a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp
@@ -225,7 +225,6 @@ const QVariantList PaintEventsModelProxy::getEventDetails(int index) const
{
Q_D(const PaintEventsModelProxy);
QVariantList result;
-// int eventId = getEventId(index);
static const char trContext[] = "RangeDetails";
{
diff --git a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h
index 4947c57d56..2e7fd45c13 100644
--- a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h
+++ b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h
@@ -50,8 +50,6 @@ namespace Internal {
class PaintEventsModelProxy : public SingleCategoryTimelineModel
{
-// Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
-
Q_OBJECT
public:
diff --git a/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp b/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp
index f7287c4b05..11929e9cc4 100644
--- a/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp
@@ -242,16 +242,6 @@ void QmlProfilerStateWidget::updateDisplay()
return;
}
- // Everything empty (base state), commented out now but needed in the future.
-// if (d->emptyList && d->loadingDone) {
-// setVisible(true);
-// d->progressBar->setVisible(false);
-// d->text->setText(tr("Profiler ready"));
-// resize(200,70);
-// parentResized();
-// return;
-// }
-
// There is a trace on view, hide this dialog
d->progressBar->setVisible(false);
setVisible(false);
diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h
index e7ac70012e..b79172502f 100644
--- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h
+++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h
@@ -35,14 +35,10 @@
#include "abstracttimelinemodel.h"
#include <qmldebug/qmlprofilereventtypes.h>
#include <qmldebug/qmlprofilereventlocation.h>
-//#include <QHash>
-//#include <QVector>
#include <QVariantList>
-//#include <QVariantMap>
#include "qmlprofilerdatamodel.h"
#include <QColor>
-
namespace QmlProfiler {
class QmlProfilerModelManager;
@@ -50,8 +46,6 @@ namespace Internal {
class BasicTimelineModel : public AbstractTimelineModel
{
-// Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
-
Q_OBJECT
public:
struct QmlRangeEventData
diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
index 91610fba42..9e44d9840a 100644
--- a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
@@ -189,9 +189,6 @@ void QmlProfilerFileReader::loadEventData(QXmlStreamReader &stream)
QTC_ASSERT(stream.name() == _("eventData"), return);
QXmlStreamAttributes attributes = stream.attributes();
- if (attributes.hasAttribute(_("totalTime"))) {
- // not used any more
- }
int eventIndex = -1;
QmlEvent event = {
diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
index 53a16db813..1fa83585de 100644
--- a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
+++ b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
@@ -174,8 +174,6 @@ bool TimelineModelAggregator::expanded(int modelIndex, int category) const
void TimelineModelAggregator::setExpanded(int modelIndex, int category, bool expanded)
{
-// int modelIndex = modelIndexForCategory(category);
-// category = correctedCategoryIndexForModel(modelIndex, categoryIndex);
d->modelList[modelIndex]->setExpanded(category, expanded);
}
@@ -196,8 +194,6 @@ int TimelineModelAggregator::rowCount(int modelIndex) const
const QString TimelineModelAggregator::categoryLabel(int modelIndex, int categoryIndex) const
{
-// int modelIndex = modelIndexForCategory(categoryIndex);
-// categoryIndex = correctedCategoryIndexForModel(modelIndex, categoryIndex);
return d->modelList[modelIndex]->categoryLabel(categoryIndex);
}
@@ -299,8 +295,6 @@ float TimelineModelAggregator::getHeight(int modelIndex, int index) const
const QVariantList TimelineModelAggregator::getLabelsForCategory(int modelIndex, int category) const
{
-// int modelIndex = modelIndexForCategory(category);
-// category = correctedCategoryIndexForModel(modelIndex, category);
return d->modelList[modelIndex]->getLabelsForCategory(category);
}