From 08574a415e329d1196ca1688e33e8cadbcd69386 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 19 Jul 2016 13:28:03 +0200
Subject: [PATCH] Clang: Inline UpdateVisibleTranslationUnitsMessage

Change-Id: I6cce81746a32fb97df64d21d1fd9e13f5b8ceacf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../updatevisibletranslationunitsmessage.cpp  | 41 ----------------
 .../updatevisibletranslationunitsmessage.h    | 49 ++++++++++++++-----
 2 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp
index f142089ee0f..643be9470e3 100644
--- a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp
+++ b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp
@@ -25,7 +25,6 @@
 
 #include "updatevisibletranslationunitsmessage.h"
 
-#include <QDataStream>
 #include <QDebug>
 
 #include <algorithm>
@@ -34,46 +33,6 @@
 
 namespace ClangBackEnd {
 
-UpdateVisibleTranslationUnitsMessage::UpdateVisibleTranslationUnitsMessage(
-        const Utf8String &currentEditorFilePath,
-        const Utf8StringVector &visibleEditorFilePaths)
-    : currentEditorFilePath_(currentEditorFilePath),
-      visibleEditorFilePaths_(visibleEditorFilePaths)
-{
-}
-
-const Utf8String &UpdateVisibleTranslationUnitsMessage::currentEditorFilePath() const
-{
-    return currentEditorFilePath_;
-}
-
-const Utf8StringVector &UpdateVisibleTranslationUnitsMessage::visibleEditorFilePaths() const
-{
-    return visibleEditorFilePaths_;
-}
-
-QDataStream &operator<<(QDataStream &out, const UpdateVisibleTranslationUnitsMessage &message)
-{
-    out << message.currentEditorFilePath_;
-    out << message.visibleEditorFilePaths_;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, UpdateVisibleTranslationUnitsMessage &message)
-{
-    in >> message.currentEditorFilePath_;
-    in >> message.visibleEditorFilePaths_;
-
-    return in;
-}
-
-bool operator==(const UpdateVisibleTranslationUnitsMessage &first, const UpdateVisibleTranslationUnitsMessage &second)
-{
-    return first.currentEditorFilePath_ == second.currentEditorFilePath_
-        && first.visibleEditorFilePaths_ == second.visibleEditorFilePaths_;
-}
-
 QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message)
 {
     debug.nospace() << "UpdateVisibleTranslationUnitsMessage(";
diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h
index 241455f310b..92f6de8f251 100644
--- a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h
+++ b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h
@@ -29,30 +29,57 @@
 
 #include <utf8stringvector.h>
 
+#include <QDataStream>
+
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT UpdateVisibleTranslationUnitsMessage
+class UpdateVisibleTranslationUnitsMessage
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UpdateVisibleTranslationUnitsMessage &message);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UpdateVisibleTranslationUnitsMessage &message);
-    friend CMBIPC_EXPORT bool operator==(const UpdateVisibleTranslationUnitsMessage &first, const UpdateVisibleTranslationUnitsMessage &second);
 public:
     UpdateVisibleTranslationUnitsMessage() = default;
     UpdateVisibleTranslationUnitsMessage(const Utf8String &currentEditorFilePath,
-                                         const Utf8StringVector &visibleEditorFilePaths);
+                                         const Utf8StringVector &visibleEditorFilePaths)
+        : currentEditorFilePath_(currentEditorFilePath),
+          visibleEditorFilePaths_(visibleEditorFilePaths)
+    {
+    }
 
-    const Utf8String &currentEditorFilePath() const;
-    const Utf8StringVector &visibleEditorFilePaths() const;
+    const Utf8String &currentEditorFilePath() const
+    {
+        return currentEditorFilePath_;
+    }
+    const Utf8StringVector &visibleEditorFilePaths() const
+    {
+        return visibleEditorFilePaths_;
+    }
+
+    friend QDataStream &operator<<(QDataStream &out, const UpdateVisibleTranslationUnitsMessage &message)
+    {
+        out << message.currentEditorFilePath_;
+        out << message.visibleEditorFilePaths_;
+
+        return out;
+    }
+
+    friend QDataStream &operator>>(QDataStream &in, UpdateVisibleTranslationUnitsMessage &message)
+    {
+        in >> message.currentEditorFilePath_;
+        in >> message.visibleEditorFilePaths_;
+
+        return in;
+    }
+
+    friend bool operator==(const UpdateVisibleTranslationUnitsMessage &first, const UpdateVisibleTranslationUnitsMessage &second)
+    {
+        return first.currentEditorFilePath_ == second.currentEditorFilePath_
+            && first.visibleEditorFilePaths_ == second.visibleEditorFilePaths_;
+    }
 
 private:
     Utf8String currentEditorFilePath_;
     Utf8StringVector visibleEditorFilePaths_;
 };
 
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UpdateVisibleTranslationUnitsMessage &message);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UpdateVisibleTranslationUnitsMessage &message);
-CMBIPC_EXPORT bool operator==(const UpdateVisibleTranslationUnitsMessage &first, const UpdateVisibleTranslationUnitsMessage &second);
-
 CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message);
 void PrintTo(const UpdateVisibleTranslationUnitsMessage &message, ::std::ostream* os);