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

Change-Id: Ia581ae109fe1fa2c05db37f1cfbe678f2d8e8778
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../clangbackendipc/codecompletionchunk.cpp   | 54 ---------------
 .../clangbackendipc/codecompletionchunk.h     | 66 ++++++++++++++-----
 2 files changed, 51 insertions(+), 69 deletions(-)

diff --git a/src/libs/clangbackendipc/codecompletionchunk.cpp b/src/libs/clangbackendipc/codecompletionchunk.cpp
index 1211b2cf1bb..5e3e53bf718 100644
--- a/src/libs/clangbackendipc/codecompletionchunk.cpp
+++ b/src/libs/clangbackendipc/codecompletionchunk.cpp
@@ -25,66 +25,12 @@
 
 #include "codecompletionchunk.h"
 
-#include <QDataStream>
 #include <QDebug>
 
 #include <ostream>
 
 namespace ClangBackEnd {
 
-CodeCompletionChunk::CodeCompletionChunk(CodeCompletionChunk::Kind kind,
-                                         const Utf8String &text,
-                                         bool isOptional)
-    : text_(text),
-      kind_(kind),
-      isOptional_(isOptional)
-{
-}
-
-CodeCompletionChunk::Kind CodeCompletionChunk::kind() const
-{
-    return kind_;
-}
-
-const Utf8String &CodeCompletionChunk::text() const
-{
-    return text_;
-}
-
-bool CodeCompletionChunk::isOptional() const
-{
-    return isOptional_;
-}
-
-QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk)
-{
-    out << static_cast<quint8>(chunk.kind_);
-    out << chunk.text_;
-    out << chunk.isOptional_;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, CodeCompletionChunk &chunk)
-{
-    quint8 kind;
-
-    in >> kind;
-    in >> chunk.text_;
-    in >> chunk.isOptional_;
-
-    chunk.kind_ = static_cast<CodeCompletionChunk::Kind>(kind);
-
-    return in;
-}
-
-bool operator==(const CodeCompletionChunk &first, const CodeCompletionChunk &second)
-{
-    return first.kind() == second.kind()
-            && first.text() == second.text()
-            && first.isOptional() == second.isOptional();
-}
-
 static const char *completionChunkKindToString(CodeCompletionChunk::Kind kind)
 {
     switch (kind) {
diff --git a/src/libs/clangbackendipc/codecompletionchunk.h b/src/libs/clangbackendipc/codecompletionchunk.h
index d004181cf9d..90decad7e34 100644
--- a/src/libs/clangbackendipc/codecompletionchunk.h
+++ b/src/libs/clangbackendipc/codecompletionchunk.h
@@ -29,6 +29,7 @@
 
 #include <utf8string.h>
 
+#include <QDataStream>
 #include <QVector>
 
 namespace ClangBackEnd {
@@ -36,12 +37,8 @@ namespace ClangBackEnd {
 class CodeCompletionChunk;
 using CodeCompletionChunks = QVector<CodeCompletionChunk>;
 
-class CMBIPC_EXPORT CodeCompletionChunk
+class CodeCompletionChunk
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, CodeCompletionChunk &chunk);
-    friend CMBIPC_EXPORT bool operator==(const CodeCompletionChunk &first, const CodeCompletionChunk &second);
-
 public:
     enum Kind : quint8 {
         Optional,
@@ -71,11 +68,56 @@ public:
     CodeCompletionChunk() = default;
     CodeCompletionChunk(Kind kind,
                         const Utf8String &text,
-                        bool isOptional = false);
+                        bool isOptional = false)
+        : text_(text),
+          kind_(kind),
+          isOptional_(isOptional)
+    {
+    }
 
-    Kind kind() const;
-    const Utf8String &text() const;
-    bool isOptional() const;
+    Kind kind() const
+    {
+        return kind_;
+    }
+
+    const Utf8String &text() const
+    {
+        return text_;
+    }
+
+    bool isOptional() const
+    {
+        return isOptional_;
+    }
+
+    friend QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk)
+    {
+        out << static_cast<quint8>(chunk.kind_);
+        out << chunk.text_;
+        out << chunk.isOptional_;
+
+        return out;
+    }
+
+    friend QDataStream &operator>>(QDataStream &in, CodeCompletionChunk &chunk)
+    {
+        quint8 kind;
+
+        in >> kind;
+        in >> chunk.text_;
+        in >> chunk.isOptional_;
+
+        chunk.kind_ = static_cast<CodeCompletionChunk::Kind>(kind);
+
+        return in;
+    }
+
+    friend bool operator==(const CodeCompletionChunk &first, const CodeCompletionChunk &second)
+    {
+        return first.kind() == second.kind()
+                && first.text() == second.text()
+                && first.isOptional() == second.isOptional();
+    }
 
 private:
     Utf8String text_;
@@ -83,15 +125,9 @@ private:
     bool isOptional_ = false;
 };
 
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, CodeCompletionChunk &chunk);
-CMBIPC_EXPORT bool operator==(const CodeCompletionChunk &first, const CodeCompletionChunk &second);
-
 CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk);
 
 void PrintTo(const CodeCompletionChunk &chunk, ::std::ostream* os);
 void PrintTo(const CodeCompletionChunk::Kind &kind, ::std::ostream* os);
 
 } // namespace ClangBackEnd
-
-Q_DECLARE_METATYPE(ClangBackEnd::CodeCompletionChunk)