feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Inline FileContainer

Browse Source 
Change-Id: Id27d0369c7e67fd4aa61b6d908b6cc7a8ee1de75
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Marco Bubke
2016-07-19 11:53:32 +02:00
committed by Tim Jenssen
parent 32d8e4a74f
commit 66c8b86ff4
2 changed files with 78 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/libs/clangbackendipc/filecontainer.cpp
View File

@@ -27,97 +27,12 @@
#include "clangbackendipcdebugutils.h"
#include <QDataStream>
#include <QDebug>
#include <ostream>
namespace ClangBackEnd {
FileContainer::FileContainer(const Utf8String &filePath,
const Utf8String &projectPartId,
const Utf8String &unsavedFileContent,
bool hasUnsavedFileContent,
quint32 documentRevision)
: filePath_(filePath),
projectPartId_(projectPartId),
unsavedFileContent_(unsavedFileContent),
documentRevision_(documentRevision),
hasUnsavedFileContent_(hasUnsavedFileContent)
{
}
FileContainer::FileContainer(const Utf8String &filePath,
const Utf8String &projectPartId,
const Utf8StringVector &fileArguments,
quint32 documentRevision)
: filePath_(filePath),
projectPartId_(projectPartId),
fileArguments_(fileArguments),
documentRevision_(documentRevision),
hasUnsavedFileContent_(false)
{
}
const Utf8String &FileContainer::filePath() const
{
return filePath_;
}
const Utf8String &FileContainer::projectPartId() const
{
return projectPartId_;
}
const Utf8StringVector &FileContainer::fileArguments() const
{
return fileArguments_;
}
const Utf8String &FileContainer::unsavedFileContent() const
{
return unsavedFileContent_;
}
bool FileContainer::hasUnsavedFileContent() const
{
return hasUnsavedFileContent_;
}
quint32 FileContainer::documentRevision() const
{
return documentRevision_;
}
QDataStream &operator<<(QDataStream &out, const FileContainer &container)
{
out << container.filePath_;
out << container.projectPartId_;
out << container.fileArguments_;
out << container.unsavedFileContent_;
out << container.documentRevision_;
out << container.hasUnsavedFileContent_;
return out;
}
QDataStream &operator>>(QDataStream &in, FileContainer &container)
{
in >> container.filePath_;
in >> container.projectPartId_;
in >> container.fileArguments_;
in >> container.unsavedFileContent_;
in >> container.documentRevision_;
in >> container.hasUnsavedFileContent_;
return in;
}
bool operator==(const FileContainer &first, const FileContainer &second)
{
return first.filePath_ == second.filePath_ && first.projectPartId_ == second.projectPartId_;
}
QDebug operator<<(QDebug debug, const FileContainer &container)
{
debug.nospace() << "FileContainer("

94
src/libs/clangbackendipc/filecontainer.h
View File

@@ -30,31 +30,97 @@
#include <utf8string.h>
#include <utf8stringvector.h>
#include <QDataStream>
namespace ClangBackEnd {
class CMBIPC_EXPORT FileContainer
class FileContainer
{
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const FileContainer &container);
friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, FileContainer &container);
friend CMBIPC_EXPORT bool operator==(const FileContainer &first, const FileContainer &second);
public:
FileContainer() = default;
FileContainer(const Utf8String &filePath,
const Utf8String &projectPartId,
const Utf8String &unsavedFileContent = Utf8String(),
bool hasUnsavedFileContent = false,
quint32 documentRevision = 0);
quint32 documentRevision = 0)
: filePath_(filePath),
projectPartId_(projectPartId),
unsavedFileContent_(unsavedFileContent),
documentRevision_(documentRevision),
hasUnsavedFileContent_(hasUnsavedFileContent)
{
}
FileContainer(const Utf8String &filePath,
const Utf8String &projectPartId,
const Utf8StringVector &fileArguments,
quint32 documentRevision);
quint32 documentRevision)
: filePath_(filePath),
projectPartId_(projectPartId),
fileArguments_(fileArguments),
documentRevision_(documentRevision),
hasUnsavedFileContent_(false)
{
}
const Utf8String &filePath() const;
const Utf8String &projectPartId() const;
const Utf8StringVector &fileArguments() const;
const Utf8String &unsavedFileContent() const;
bool hasUnsavedFileContent() const;
quint32 documentRevision() const;
const Utf8String &filePath() const
{
return filePath_;
}
const Utf8String &projectPartId() const
{
return projectPartId_;
}
const Utf8StringVector &fileArguments() const
{
return fileArguments_;
}
const Utf8String &unsavedFileContent() const
{
return unsavedFileContent_;
}
bool hasUnsavedFileContent() const
{
return hasUnsavedFileContent_;
}
quint32 documentRevision() const
{
return documentRevision_;
}
friend QDataStream &operator<<(QDataStream &out, const FileContainer &container)
{
out << container.filePath_;
out << container.projectPartId_;
out << container.fileArguments_;
out << container.unsavedFileContent_;
out << container.documentRevision_;
out << container.hasUnsavedFileContent_;
return out;
}
friend QDataStream &operator>>(QDataStream &in, FileContainer &container)
{
in >> container.filePath_;
in >> container.projectPartId_;
in >> container.fileArguments_;
in >> container.unsavedFileContent_;
in >> container.documentRevision_;
in >> container.hasUnsavedFileContent_;
return in;
}
friend bool operator==(const FileContainer &first, const FileContainer &second)
{
return first.filePath_ == second.filePath_ && first.projectPartId_ == second.projectPartId_;
}
private:
Utf8String filePath_;
@@ -65,10 +131,6 @@ private:
bool hasUnsavedFileContent_ = false;
};
CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const FileContainer &container);
CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, FileContainer &container);
CMBIPC_EXPORT bool operator==(const FileContainer &first, const FileContainer &second);
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
void PrintTo(const FileContainer &container, ::std::ostream* os);