From 96e370e1ca0c0a1a4f88037a41f0bbb1f6a9a8c7 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 19 Jul 2016 14:37:23 +0200
Subject: [PATCH] Clang: Inline CompleteCodeMessage

Change-Id: I7009ab3986cb2c8ff7b5c7a77ff22a35bc5d2b10
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../cmbcompletecodemessage.cpp                | 66 --------------
 .../clangbackendipc/cmbcompletecodemessage.h  | 89 ++++++++++++++-----
 2 files changed, 68 insertions(+), 87 deletions(-)

diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.cpp b/src/libs/clangbackendipc/cmbcompletecodemessage.cpp
index da8aa21223a..2fd9bb6729d 100644
--- a/src/libs/clangbackendipc/cmbcompletecodemessage.cpp
+++ b/src/libs/clangbackendipc/cmbcompletecodemessage.cpp
@@ -25,7 +25,6 @@
 
 #include "cmbcompletecodemessage.h"
 
-#include <QDataStream>
 #include <QDebug>
 
 #include <ostream>
@@ -34,71 +33,6 @@ namespace ClangBackEnd {
 
 quint64 CompleteCodeMessage::ticketCounter = 0;
 
-CompleteCodeMessage::CompleteCodeMessage(const Utf8String &filePath, quint32 line, quint32 column, const Utf8String &projectPartId)
-    : filePath_(filePath),
-      projectPartId_(projectPartId),
-      ticketNumber_(++ticketCounter),
-      line_(line),
-      column_(column)
-{
-}
-
-const Utf8String &CompleteCodeMessage::filePath() const
-{
-    return filePath_;
-}
-
-const Utf8String &CompleteCodeMessage::projectPartId() const
-{
-    return projectPartId_;
-}
-
-quint32 CompleteCodeMessage::line() const
-{
-    return line_;
-}
-
-quint32 CompleteCodeMessage::column() const
-{
-    return column_;
-}
-
-quint64 CompleteCodeMessage::ticketNumber() const
-{
-    return ticketNumber_;
-}
-
-QDataStream &operator<<(QDataStream &out, const CompleteCodeMessage &message)
-{
-    out << message.filePath_;
-    out << message.projectPartId_;
-    out << message.ticketNumber_;
-    out << message.line_;
-    out << message.column_;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, CompleteCodeMessage &message)
-{
-    in >> message.filePath_;
-    in >> message.projectPartId_;
-    in >> message.ticketNumber_;
-    in >> message.line_;
-    in >> message.column_;
-
-    return in;
-}
-
-bool operator==(const CompleteCodeMessage &first, const CompleteCodeMessage &second)
-{
-    return first.ticketNumber_ == second.ticketNumber_
-            && first.filePath_ == second.filePath_
-            && first.projectPartId_ == second.projectPartId_
-            && first.line_ == second.line_
-            && first.column_ == second.column_;
-}
-
 QDebug operator<<(QDebug debug, const CompleteCodeMessage &message)
 {
     debug.nospace() << "CompleteCodeMessage(";
diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.h b/src/libs/clangbackendipc/cmbcompletecodemessage.h
index 28356259ad4..88036da252d 100644
--- a/src/libs/clangbackendipc/cmbcompletecodemessage.h
+++ b/src/libs/clangbackendipc/cmbcompletecodemessage.h
@@ -29,47 +29,94 @@
 
 #include <utf8string.h>
 
+#include <QDataStream>
+
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT CompleteCodeMessage
+class CompleteCodeMessage
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CompleteCodeMessage &message);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, CompleteCodeMessage &message);
-    friend CMBIPC_EXPORT bool operator==(const CompleteCodeMessage &first, const CompleteCodeMessage &second);
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message);
-    friend void PrintTo(const CompleteCodeMessage &message, ::std::ostream* os);
 
 public:
     CompleteCodeMessage() = default;
     CompleteCodeMessage(const Utf8String &filePath,
                         quint32 line,
                         quint32 column,
-                        const Utf8String &projectPartId);
+                        const Utf8String &projectPartId)
+        : filePath_(filePath),
+          projectPartId_(projectPartId),
+          ticketNumber_(++ticketCounter),
+          line_(line),
+          column_(column)
+    {
+    }
 
-    const Utf8String &filePath() const;
-    const Utf8String &projectPartId() const;
+    const Utf8String &filePath() const
+    {
+        return filePath_;
+    }
 
-    quint32 line() const;
-    quint32 column() const;
+    const Utf8String &projectPartId() const
+    {
+        return projectPartId_;
+    }
 
-    quint64 ticketNumber() const;
+    quint32 line() const
+    {
+        return line_;
+    }
+
+    quint32 column() const
+    {
+        return column_;
+    }
+
+    quint64 ticketNumber() const
+    {
+        return ticketNumber_;
+    }
+
+    friend QDataStream &operator<<(QDataStream &out, const CompleteCodeMessage &message)
+    {
+        out << message.filePath_;
+        out << message.projectPartId_;
+        out << message.ticketNumber_;
+        out << message.line_;
+        out << message.column_;
+
+        return out;
+    }
+
+    friend QDataStream &operator>>(QDataStream &in, CompleteCodeMessage &message)
+    {
+        in >> message.filePath_;
+        in >> message.projectPartId_;
+        in >> message.ticketNumber_;
+        in >> message.line_;
+        in >> message.column_;
+
+        return in;
+    }
+
+    friend bool operator==(const CompleteCodeMessage &first, const CompleteCodeMessage &second)
+    {
+        return first.ticketNumber_ == second.ticketNumber_
+                && first.filePath_ == second.filePath_
+                && first.projectPartId_ == second.projectPartId_
+                && first.line_ == second.line_
+                && first.column_ == second.column_;
+    }
+
+    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message);
+    friend void PrintTo(const CompleteCodeMessage &message, ::std::ostream* os);
 
 private:
     Utf8String filePath_;
     Utf8String projectPartId_;
-    static quint64 ticketCounter;
+    static CMBIPC_EXPORT quint64 ticketCounter;
     quint64 ticketNumber_;
     quint32 line_ = 0;
     quint32 column_ = 0;
 };
 
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CompleteCodeMessage &message);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, CompleteCodeMessage &message);
-CMBIPC_EXPORT bool operator==(const CompleteCodeMessage &first, const CompleteCodeMessage &second);
-
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message);
-void PrintTo(const CompleteCodeMessage &message, ::std::ostream* os);
-
 DECLARE_MESSAGE(CompleteCodeMessage);
-
 } // namespace ClangBackEnd