From 5ccc1ac14a1395e4251858570f6b55ba35b1778f Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 19 Jul 2016 13:07:34 +0200
Subject: [PATCH] Clang: Inline SourceRangeContainer

Change-Id: I04e5f1abbe17d6e007a2cba5cd28c84a3428bcbf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../clangbackendipc/sourcerangecontainer.cpp  | 37 --------------
 .../clangbackendipc/sourcerangecontainer.h    | 49 ++++++++++++++-----
 2 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/src/libs/clangbackendipc/sourcerangecontainer.cpp b/src/libs/clangbackendipc/sourcerangecontainer.cpp
index dceb741e124..2bee6377ab4 100644
--- a/src/libs/clangbackendipc/sourcerangecontainer.cpp
+++ b/src/libs/clangbackendipc/sourcerangecontainer.cpp
@@ -25,49 +25,12 @@
 
 #include "sourcerangecontainer.h"
 
-#include <QDataStream>
 #include <QDebug>
 
 #include <ostream>
 
 namespace ClangBackEnd {
-SourceRangeContainer::SourceRangeContainer(SourceLocationContainer start,
-                                           SourceLocationContainer end)
-    : start_(start),
-      end_(end)
-{
-}
 
-SourceLocationContainer SourceRangeContainer::start() const
-{
-    return start_;
-}
-
-SourceLocationContainer SourceRangeContainer::end() const
-{
-    return end_;
-}
-
-QDataStream &operator<<(QDataStream &out, const SourceRangeContainer &container)
-{
-    out << container.start_;
-    out << container.end_;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, SourceRangeContainer &container)
-{
-    in >> container.start_;
-    in >> container.end_;
-
-    return in;
-}
-
-bool operator==(const SourceRangeContainer &first, const SourceRangeContainer &second)
-{
-    return first.start_ == second.start_ && first.end_ == second.end_;
-}
 
 QDebug operator<<(QDebug debug, const SourceRangeContainer &container)
 {
diff --git a/src/libs/clangbackendipc/sourcerangecontainer.h b/src/libs/clangbackendipc/sourcerangecontainer.h
index b8198effd16..6d9e3ed0c8f 100644
--- a/src/libs/clangbackendipc/sourcerangecontainer.h
+++ b/src/libs/clangbackendipc/sourcerangecontainer.h
@@ -27,20 +27,51 @@
 
 #include "sourcelocationcontainer.h"
 
+#include <QDataStream>
+
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT SourceRangeContainer
+class SourceRangeContainer
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const SourceRangeContainer &container);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, SourceRangeContainer &container);
-    friend CMBIPC_EXPORT bool operator==(const SourceRangeContainer &first, const SourceRangeContainer &second);
 public:
     SourceRangeContainer() = default;
     SourceRangeContainer(SourceLocationContainer start,
-                         SourceLocationContainer end);
+                         SourceLocationContainer end)
+        : start_(start),
+          end_(end)
+    {
+    }
 
-    SourceLocationContainer start() const;
-    SourceLocationContainer end() const;
+    SourceLocationContainer start() const
+    {
+        return start_;
+    }
+
+    SourceLocationContainer end() const
+    {
+        return end_;
+    }
+
+    friend QDataStream &operator<<(QDataStream &out, const SourceRangeContainer &container)
+    {
+        out << container.start_;
+        out << container.end_;
+
+        return out;
+    }
+
+    friend QDataStream &operator>>(QDataStream &in, SourceRangeContainer &container)
+    {
+        in >> container.start_;
+        in >> container.end_;
+
+        return in;
+    }
+
+    friend bool operator==(const SourceRangeContainer &first, const SourceRangeContainer &second)
+    {
+        return first.start_ == second.start_ && first.end_ == second.end_;
+    }
 
 private:
     SourceLocationContainer start_;
@@ -48,10 +79,6 @@ private:
 
 };
 
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const SourceRangeContainer &container);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, SourceRangeContainer &container);
-CMBIPC_EXPORT bool operator==(const SourceRangeContainer &first, const SourceRangeContainer &second);
-
 CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
 void PrintTo(const SourceRangeContainer &container, ::std::ostream* os);