From ee87fcb4896883ee9587d39cffef0c0a71c3d226 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 19 Jul 2016 12:28:24 +0200
Subject: [PATCH] Clang: Inline RegisterProjectPartsForEditorMessage

Change-Id: I910c122ae9ab12b9d27d3fd1363e6d3cbe602b46
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../cmbregisterprojectsforeditormessage.cpp   | 30 --------------
 .../cmbregisterprojectsforeditormessage.h     | 40 ++++++++++++++-----
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp
index 30f5bdcaa8e..6c1b6a4f8bd 100644
--- a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp
+++ b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp
@@ -25,7 +25,6 @@
 
 #include "cmbregisterprojectsforeditormessage.h"
 
-#include <QDataStream>
 #include <QDebug>
 
 #include <algorithm>
@@ -33,35 +32,6 @@
 
 namespace ClangBackEnd {
 
-RegisterProjectPartsForEditorMessage::RegisterProjectPartsForEditorMessage(const QVector<ProjectPartContainer> &projectContainers)
-    :projectContainers_(projectContainers)
-{
-}
-
-const QVector<ProjectPartContainer> &RegisterProjectPartsForEditorMessage::projectContainers() const
-{
-    return projectContainers_;
-}
-
-QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message)
-{
-    out << message.projectContainers_;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message)
-{
-    in >> message.projectContainers_;
-
-    return in;
-}
-
-bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second)
-{
-    return first.projectContainers_ == second.projectContainers_;
-}
-
 QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message)
 {
     debug.nospace() << "RegisterProjectPartsForEditorMessage(";
diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h
index 8701b016812..86397e43fce 100644
--- a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h
+++ b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h
@@ -27,30 +27,48 @@
 
 #include "projectpartcontainer.h"
 
+#include <QDataStream>
 #include <QVector>
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT RegisterProjectPartsForEditorMessage
+class RegisterProjectPartsForEditorMessage
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message);
-    friend CMBIPC_EXPORT bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second);
-    friend void PrintTo(const RegisterProjectPartsForEditorMessage &message, ::std::ostream* os);
 public:
     RegisterProjectPartsForEditorMessage() = default;
-    RegisterProjectPartsForEditorMessage(const QVector<ProjectPartContainer> &projectContainers);
+    RegisterProjectPartsForEditorMessage(const QVector<ProjectPartContainer> &projectContainers)
+        :projectContainers_(projectContainers)
+    {
+    }
 
-    const QVector<ProjectPartContainer> &projectContainers() const;
+    const QVector<ProjectPartContainer> &projectContainers() const
+    {
+        return projectContainers_;
+    }
+
+    friend QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message)
+    {
+        out << message.projectContainers_;
+
+        return out;
+    }
+
+    friend QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message)
+    {
+        in >> message.projectContainers_;
+
+        return in;
+    }
+
+    friend bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second)
+    {
+        return first.projectContainers_ == second.projectContainers_;
+    }
 
 private:
     QVector<ProjectPartContainer> projectContainers_;
 };
 
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message);
-CMBIPC_EXPORT bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second);
-
 CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message);
 void PrintTo(const RegisterProjectPartsForEditorMessage &message, ::std::ostream* os);