aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perfprofiler
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-03-23 11:50:24 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2019-03-25 17:36:51 +0000
commit9c596080b769908e387b5aeb926b95f97340d3d4 (patch)
tree0676e1c2937f76b235e8d333b07c56f92e7cfc83 /src/plugins/perfprofiler
parentc0b3124146879a371c88833163e693c35c8df479 (diff)
PerfProfiler: Rename PerfDataReader::load()
Fixes clang warning: "src/plugins/perfprofiler/perfdatareader.h:48:10: warning: 'PerfProfiler::Internal::PerfDataReader::load' hides overloaded virtual function [-Woverloaded-virtual]" Change-Id: Ifaba175bfe19389187de1b5983c387060e649ed6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/perfprofiler')
-rw-r--r--src/plugins/perfprofiler/perfdatareader.cpp4
-rw-r--r--src/plugins/perfprofiler/perfdatareader.h3
-rw-r--r--src/plugins/perfprofiler/perfprofilertracemanager.cpp2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/perfprofiler/perfdatareader.cpp b/src/plugins/perfprofiler/perfdatareader.cpp
index 0c34ed583b1..52afd696b86 100644
--- a/src/plugins/perfprofiler/perfdatareader.cpp
+++ b/src/plugins/perfprofiler/perfdatareader.cpp
@@ -142,8 +142,8 @@ PerfDataReader::~PerfDataReader()
qDeleteAll(m_buffer);
}
-void PerfDataReader::load(const QString &filePath, const QString &executableDirPath,
- ProjectExplorer::Kit *kit)
+void PerfDataReader::loadFromFile(const QString &filePath, const QString &executableDirPath,
+ ProjectExplorer::Kit *kit)
{
createParser(collectArguments(executableDirPath, kit) << QLatin1String("--input") << filePath);
m_remoteProcessStart = 0; // Don't try to guess the timestamps
diff --git a/src/plugins/perfprofiler/perfdatareader.h b/src/plugins/perfprofiler/perfdatareader.h
index 8f30fa28d78..41cc96bdf4e 100644
--- a/src/plugins/perfprofiler/perfdatareader.h
+++ b/src/plugins/perfprofiler/perfdatareader.h
@@ -45,7 +45,8 @@ public:
explicit PerfDataReader(QObject *parent = nullptr);
~PerfDataReader() override;
- void load(const QString &filePath, const QString &executableDirPath, ProjectExplorer::Kit *kit);
+ void loadFromFile(const QString &filePath, const QString &executableDirPath,
+ ProjectExplorer::Kit *kit);
void createParser(const QStringList &arguments);
void startParser();
diff --git a/src/plugins/perfprofiler/perfprofilertracemanager.cpp b/src/plugins/perfprofiler/perfprofilertracemanager.cpp
index 4e98b969548..79bd1a05ad0 100644
--- a/src/plugins/perfprofiler/perfprofilertracemanager.cpp
+++ b/src/plugins/perfprofiler/perfprofilertracemanager.cpp
@@ -633,7 +633,7 @@ void PerfProfilerTraceManager::loadFromPerfData(const QString &filePath,
reader->future().reportStarted();
initialize();
- reader->load(filePath, executableDirPath, kit);
+ reader->loadFromFile(filePath, executableDirPath, kit);
}
} // namespace Internal