From 38d3d8e72783623dca235436d96b7f9f3b1dde84 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 19 Jul 2016 13:12:26 +0200 Subject: [PATCH] Clang: Inline RegisterUnsavedFilesForEditorMessage Change-Id: I22c23c1875cd7c73321cda15ad8a1e18c43db818 Reviewed-by: Tim Jenssen --- .../registerunsavedfilesforeditormessage.cpp | 30 -------------- .../registerunsavedfilesforeditormessage.h | 39 +++++++++++++------ 2 files changed, 28 insertions(+), 41 deletions(-) diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp index f0a4e176a44..9f3b2496f2c 100644 --- a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp +++ b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp @@ -25,42 +25,12 @@ #include "registerunsavedfilesforeditormessage.h" -#include #include #include namespace ClangBackEnd { -RegisterUnsavedFilesForEditorMessage::RegisterUnsavedFilesForEditorMessage(const QVector &fileContainers) - : fileContainers_(fileContainers) -{ -} - -const QVector &RegisterUnsavedFilesForEditorMessage::fileContainers() const -{ - return fileContainers_; -} - -QDataStream &operator<<(QDataStream &out, const RegisterUnsavedFilesForEditorMessage &message) -{ - out << message.fileContainers_; - - return out; -} - -QDataStream &operator>>(QDataStream &in, RegisterUnsavedFilesForEditorMessage &message) -{ - in >> message.fileContainers_; - - return in; -} - -bool operator==(const RegisterUnsavedFilesForEditorMessage &first, const RegisterUnsavedFilesForEditorMessage &second) -{ - return first.fileContainers_ == second.fileContainers_; -} - QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message) { debug.nospace() << "RegisterUnsavedFilesForEditorMessage("; diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h index 0fd28da1825..53a794326bc 100644 --- a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h +++ b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h @@ -31,26 +31,43 @@ namespace ClangBackEnd { -class CMBIPC_EXPORT RegisterUnsavedFilesForEditorMessage +class RegisterUnsavedFilesForEditorMessage { - friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterUnsavedFilesForEditorMessage &message); - friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterUnsavedFilesForEditorMessage &message); - friend CMBIPC_EXPORT bool operator==(const RegisterUnsavedFilesForEditorMessage &first, const RegisterUnsavedFilesForEditorMessage &second); - friend void PrintTo(const RegisterUnsavedFilesForEditorMessage &message, ::std::ostream* os); public: RegisterUnsavedFilesForEditorMessage() = default; - RegisterUnsavedFilesForEditorMessage(const QVector &fileContainers); + RegisterUnsavedFilesForEditorMessage(const QVector &fileContainers) + : fileContainers_(fileContainers) + { + } - const QVector &fileContainers() const; + const QVector &fileContainers() const + { + return fileContainers_; + } + + friend QDataStream &operator<<(QDataStream &out, const RegisterUnsavedFilesForEditorMessage &message) + { + out << message.fileContainers_; + + return out; + } + + friend QDataStream &operator>>(QDataStream &in, RegisterUnsavedFilesForEditorMessage &message) + { + in >> message.fileContainers_; + + return in; + } + + friend bool operator==(const RegisterUnsavedFilesForEditorMessage &first, const RegisterUnsavedFilesForEditorMessage &second) + { + return first.fileContainers_ == second.fileContainers_; + } private: QVector fileContainers_; }; -CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterUnsavedFilesForEditorMessage &message); -CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterUnsavedFilesForEditorMessage &message); -CMBIPC_EXPORT bool operator==(const RegisterUnsavedFilesForEditorMessage &first, const RegisterUnsavedFilesForEditorMessage &second); - CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message); void PrintTo(const RegisterUnsavedFilesForEditorMessage &message, ::std::ostream* os);