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

Change-Id: I9f65bd95efe3a02848db6e9cadddc22c88b19902
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../cmbcodecompletedmessage.cpp               | 54 --------------
 .../clangbackendipc/cmbcodecompletedmessage.h | 70 ++++++++++++++-----
 2 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp b/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp
index 3097585b388..e322b129237 100644
--- a/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp
+++ b/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp
@@ -25,66 +25,12 @@
 
 #include "cmbcodecompletedmessage.h"
 
-#include <QDataStream>
 #include <QDebug>
 
 #include <ostream>
 
 namespace ClangBackEnd {
 
-CodeCompletedMessage::CodeCompletedMessage(const CodeCompletions &codeCompletions,
-                                           CompletionCorrection neededCorrection,
-                                           quint64 ticketNumber)
-    : codeCompletions_(codeCompletions),
-      ticketNumber_(ticketNumber),
-      neededCorrection_(neededCorrection)
-{
-}
-
-const CodeCompletions &CodeCompletedMessage::codeCompletions() const
-{
-    return codeCompletions_;
-}
-
-CompletionCorrection CodeCompletedMessage::neededCorrection() const
-{
-    return neededCorrection_;
-}
-
-quint64 CodeCompletedMessage::ticketNumber() const
-{
-    return ticketNumber_;
-}
-
-QDataStream &operator<<(QDataStream &out, const CodeCompletedMessage &message)
-{
-    out << message.codeCompletions_;
-    out << static_cast<quint32>(message.neededCorrection_);
-    out << message.ticketNumber_;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, CodeCompletedMessage &message)
-{
-    quint32 neededCorrection;
-
-    in >> message.codeCompletions_;
-    in >> neededCorrection;
-    in >> message.ticketNumber_;
-
-    message.neededCorrection_ = static_cast<CompletionCorrection>(neededCorrection);
-
-    return in;
-}
-
-bool operator==(const CodeCompletedMessage &first, const CodeCompletedMessage &second)
-{
-    return first.ticketNumber_ == second.ticketNumber_
-        && first.neededCorrection_ == second.neededCorrection_
-        && first.codeCompletions_ == second.codeCompletions_;
-}
-
 #define RETURN_TEXT_FOR_CASE(enumValue) case CompletionCorrection::enumValue: return #enumValue
 static const char *completionCorrectionToText(CompletionCorrection correction)
 {
diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.h b/src/libs/clangbackendipc/cmbcodecompletedmessage.h
index d3cc6baf265..cc686f21d3f 100644
--- a/src/libs/clangbackendipc/cmbcodecompletedmessage.h
+++ b/src/libs/clangbackendipc/cmbcodecompletedmessage.h
@@ -27,27 +27,70 @@
 
 #include "codecompletion.h"
 
+#include <QDataStream>
 #include <QVector>
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT CodeCompletedMessage
+class CodeCompletedMessage
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CodeCompletedMessage &message);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, CodeCompletedMessage &message);
-    friend CMBIPC_EXPORT bool operator==(const CodeCompletedMessage &first, const CodeCompletedMessage &second);
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message);
-    friend void PrintTo(const CodeCompletedMessage &message, ::std::ostream* os);
 public:
     CodeCompletedMessage() = default;
     CodeCompletedMessage(const CodeCompletions &codeCompletions,
                          CompletionCorrection neededCorrection,
-                         quint64 ticketNumber);
+                         quint64 ticketNumber)
+        : codeCompletions_(codeCompletions),
+          ticketNumber_(ticketNumber),
+          neededCorrection_(neededCorrection)
+    {
+    }
 
-    const CodeCompletions &codeCompletions() const;
-    CompletionCorrection neededCorrection() const;
+    const CodeCompletions &codeCompletions() const
+    {
+        return codeCompletions_;
+    }
 
-    quint64 ticketNumber() const;
+    CompletionCorrection neededCorrection() const
+    {
+        return neededCorrection_;
+    }
+
+    quint64 ticketNumber() const
+    {
+        return ticketNumber_;
+    }
+
+    friend QDataStream &operator<<(QDataStream &out, const CodeCompletedMessage &message)
+    {
+        out << message.codeCompletions_;
+        out << static_cast<quint32>(message.neededCorrection_);
+        out << message.ticketNumber_;
+
+        return out;
+    }
+
+    friend QDataStream &operator>>(QDataStream &in, CodeCompletedMessage &message)
+    {
+        quint32 neededCorrection;
+
+        in >> message.codeCompletions_;
+        in >> neededCorrection;
+        in >> message.ticketNumber_;
+
+        message.neededCorrection_ = static_cast<CompletionCorrection>(neededCorrection);
+
+        return in;
+    }
+
+    friend bool operator==(const CodeCompletedMessage &first, const CodeCompletedMessage &second)
+    {
+        return first.ticketNumber_ == second.ticketNumber_
+            && first.neededCorrection_ == second.neededCorrection_
+            && first.codeCompletions_ == second.codeCompletions_;
+    }
+
+    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message);
+    friend void PrintTo(const CodeCompletedMessage &message, ::std::ostream* os);
 
 private:
     CodeCompletions codeCompletions_;
@@ -55,12 +98,5 @@ private:
     CompletionCorrection neededCorrection_ = CompletionCorrection::NoCorrection;
 };
 
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CodeCompletedMessage &message);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, CodeCompletedMessage &message);
-CMBIPC_EXPORT bool operator==(const CodeCompletedMessage &first, const CodeCompletedMessage &second);
-
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message);
-void PrintTo(const CodeCompletedMessage &message, ::std::ostream* os);
-
 DECLARE_MESSAGE(CodeCompletedMessage)
 } // namespace ClangBackEnd