From f373c6794eebbf0015e81246a1913e449a21d415 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 10 Sep 2015 11:49:17 +0200
Subject: [PATCH] QmlProfiler: Simplify file loading
There is no need to keep a redundant copy of the file name.
Change-Id: I407b1e4b92232a5869eade4d52eb7b4468fffa9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
.../qmlprofiler/qmlprofilermodelmanager.cpp | 18 ++----------------
.../qmlprofiler/qmlprofilermodelmanager.h | 2 --
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index 5fef4ca3ec7..d07428cf532 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -185,9 +185,6 @@ public:
int totalWeight;
double progress;
double previousProgress;
-
- // file to load
- QString fileName;
};
@@ -400,20 +397,9 @@ void QmlProfilerModelManager::save(const QString &filename)
void QmlProfilerModelManager::load(const QString &filename)
{
- d->fileName = filename;
- load();
-}
-
-void QmlProfilerModelManager::setFilename(const QString &filename)
-{
- d->fileName = filename;
-}
-
-void QmlProfilerModelManager::load()
-{
- QFile *file = new QFile(d->fileName, this);
+ QFile *file = new QFile(filename, this);
if (!file->open(QIODevice::ReadOnly | QIODevice::Text)) {
- emit error(tr("Could not open %1 for reading.").arg(d->fileName));
+ emit error(tr("Could not open %1 for reading.").arg(filename));
delete file;
emit loadFinished();
return;
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
index 3fe90adbdcb..01266263576 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
@@ -160,8 +160,6 @@ public slots:
void save(const QString &filename);
void load(const QString &filename);
- void setFilename(const QString &filename);
- void load();
private:
void setState(QmlProfilerDataState::State state);
--
GitLab