Remove unnecessary redirection of lists on operator<<

Change-Id: Icc10b00710fd906ec829b6a54b7929e03d959967
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 11 insertions, 31 deletions

diff --git a/app/perffeatures.cpp b/app/perffeatures.cpp
index 5dd00c3..04175f2 100644
--- a/app/perffeatures.cpp
+++ b/app/perffeatures.cpp
@@ -179,11 +179,6 @@ QDataStream &operator<<(QDataStream &stream, const PerfBuildId::BuildId &buildId
     return stream << buildId.pid << buildId.id << buildId.fileName;
 }
 
-QDataStream &operator<<(QDataStream &stream, const PerfBuildId &buildId)
-{
-    return stream << buildId.buildIds;
-}
-
 QDataStream &operator>>(QDataStream &stream, PerfEventHeader &header)
 {
     return stream >> header.type >> header.misc >> header.size;
@@ -303,11 +298,6 @@ QDataStream &operator<<(QDataStream &stream, const PerfNumaTopology::NumaNode &n
     return stream << node.nodeId << node.memTotal << node.memFree << node.topology;
 }
 
-QDataStream &operator<<(QDataStream &stream, const PerfNumaTopology &numaTopology)
-{
-    return stream << numaTopology.nodes;
-}
-
 QDataStream &operator>>(QDataStream &stream, PerfBranchStack &branchStack)
 {
     // Doesn't really exist.
@@ -342,11 +332,6 @@ QDataStream &operator<<(QDataStream &stream, const PerfPmuMappings::Pmu &pmu)
     return stream << pmu.type << pmu.name;
 }
 
-QDataStream &operator<<(QDataStream &stream, const PerfPmuMappings &pmuMappings)
-{
-    return stream << pmuMappings.pmus;
-}
-
 QDataStream &operator>>(QDataStream &stream, PerfGroupDesc &groupDesc)
 {
     quint32 numGroups;
@@ -367,8 +352,3 @@ QDataStream &operator<<(QDataStream &stream, const PerfGroupDesc::GroupDesc &gro
 {
     return stream << groupDesc.name << groupDesc.leaderIndex << groupDesc.numMembers;
 }
-
-QDataStream &operator<<(QDataStream &stream, const PerfGroupDesc &groupDesc)
-{
-    return stream << groupDesc.groupDescs;
-}
diff --git a/app/perffeatures.h b/app/perffeatures.h
index 378c6a0..dd6ec2d 100644
--- a/app/perffeatures.h
+++ b/app/perffeatures.h
@@ -56,7 +56,7 @@ struct PerfBuildId {
 };
 
 QDataStream &operator>>(QDataStream &stream, PerfBuildId &buildId);
-QDataStream &operator<<(QDataStream &stream, const PerfBuildId &buildId);
+QDataStream &operator<<(QDataStream &stream, const PerfBuildId::BuildId &buildId);
 
 struct PerfStringFeature {
     QByteArray value;
@@ -119,7 +119,7 @@ struct PerfNumaTopology {
 };
 
 QDataStream &operator>>(QDataStream &stream, PerfNumaTopology &numaTopology);
-QDataStream &operator<<(QDataStream &stream, const PerfNumaTopology &numaTopology);
+QDataStream &operator<<(QDataStream &stream, const PerfNumaTopology::NumaNode &numaNode);
 
 struct PerfBranchStack {
 };
@@ -137,7 +137,7 @@ struct PerfPmuMappings {
 };
 
 QDataStream &operator>>(QDataStream &stream, PerfPmuMappings &pmuMappings);
-QDataStream &operator<<(QDataStream &stream, const PerfPmuMappings &pmuMappings);
+QDataStream &operator<<(QDataStream &stream, const PerfPmuMappings::Pmu &pmu);
 
 struct PerfGroupDesc {
 
@@ -151,7 +151,7 @@ struct PerfGroupDesc {
 };
 
 QDataStream &operator>>(QDataStream &stream, PerfGroupDesc &groupDesc);
-QDataStream &operator<<(QDataStream &stream, const PerfGroupDesc &groupDesc);
+QDataStream &operator<<(QDataStream &stream, const PerfGroupDesc::GroupDesc &groupDesc);
 
 class PerfFeatures
 {
@@ -164,7 +164,7 @@ public:
     void setArchitecture(const QByteArray &arch) { m_arch.value = arch; }
 
     PerfTracingData tracingData() const { return m_tracingData; }
-    PerfBuildId buildId() const { return m_buildId; }
+    QList<PerfBuildId::BuildId> buildIds() const { return m_buildId.buildIds; }
     QByteArray hostName() const { return m_hostName.value; }
     QByteArray osRelease() const { return m_osRelease.value; }
     QByteArray version() const { return m_version.value; }
@@ -175,10 +175,10 @@ public:
     QList<QByteArray> cmdline() const { return m_cmdline.cmdline; }
     PerfEventDesc eventDesc() const { return m_eventDesc; }
     PerfCpuTopology cpuTopology() const { return m_cpuTopology; }
-    PerfNumaTopology numaTopology() const { return m_numaToplogy; }
+    QList<PerfNumaTopology::NumaNode> numaTopology() const { return m_numaToplogy.nodes; }
     PerfBranchStack branchStack() const { return m_branchStack; }
-    PerfPmuMappings pmuMappings() const { return m_pmuMappings; }
-    PerfGroupDesc groupDesc() const { return m_groupDesc; }
+    QList<PerfPmuMappings::Pmu> pmuMappings() const { return m_pmuMappings.pmus; }
+    QList<PerfGroupDesc::GroupDesc> groupDescs() const { return m_groupDesc.groupDescs; }
 
 private:
     void createFeature(QIODevice *device, QDataStream::ByteOrder byteOrder,
diff --git a/app/perfunwind.cpp b/app/perfunwind.cpp
index 17b3a16..2e2e894 100644
--- a/app/perfunwind.cpp
+++ b/app/perfunwind.cpp
@@ -320,15 +320,15 @@ void PerfUnwind::features(const PerfFeatures &features)
                                                << features.cpuId()
                                                << features.totalMem()
                                                << features.cmdline()
-                                               << features.buildId()
+                                               << features.buildIds()
                                                << features.cpuTopology()
                                                << features.numaTopology()
                                                << features.branchStack()
                                                << features.pmuMappings()
-                                               << features.groupDesc();
+                                               << features.groupDescs();
     sendBuffer(buffer);
 
-    const auto &buildIds = features.buildId().buildIds;
+    const auto buildIds = features.buildIds();
     m_buildIds.reserve(buildIds.size());
     for (const auto &buildId : buildIds) {
         m_buildIds[buildId.fileName] = buildId.id;