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

Clang: Typedef some often used types

Browse Source 
using CodeCompletions = QVector<CodeCompletion>;
using CodeCompletionChunks = QVector<CodeCompletionChunk>;

Change-Id: Id729a43566c23dc000e44d79ccf4a49e4f235f51
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-07-22 17:33:27 +02:00
parent 5643a45a83
commit e4748fe801
22 changed files with 90 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/clangbackendipc/cmbcodecompletedcommand.cpp
View File

@@ -37,13 +37,13 @@
namespace ClangBackEnd {
CodeCompletedCommand::CodeCompletedCommand(const QVector<CodeCompletion> &codeCompletions, quint64 ticketNumber)
CodeCompletedCommand::CodeCompletedCommand(const CodeCompletions &codeCompletions, quint64 ticketNumber)
: codeCompletions_(codeCompletions),
ticketNumber_(ticketNumber)
{
}
const QVector<CodeCompletion> &CodeCompletedCommand::codeCompletions() const
const CodeCompletions &CodeCompletedCommand::codeCompletions() const
{
return codeCompletions_;
}

6
src/libs/clangbackendipc/cmbcodecompletedcommand.h
View File

@@ -48,14 +48,14 @@ class CMBIPC_EXPORT CodeCompletedCommand
friend void PrintTo(const CodeCompletedCommand &command, ::std::ostream* os);
public:
CodeCompletedCommand() = default;
CodeCompletedCommand(const QVector<CodeCompletion> &codeCompletions, quint64 ticketNumber);
CodeCompletedCommand(const CodeCompletions &codeCompletions, quint64 ticketNumber);
const QVector<CodeCompletion> &codeCompletions() const;
const CodeCompletions &codeCompletions() const;
quint64 ticketNumber() const;
private:
QVector<CodeCompletion> codeCompletions_;
CodeCompletions codeCompletions_;
quint64 ticketNumber_ = 0;
};

4
src/libs/clangbackendipc/codecompletion.cpp
View File

@@ -70,12 +70,12 @@ CodeCompletion::Kind CodeCompletion::completionKind() const
return completionKind_;
}
void CodeCompletion::setChunks(const QVector<CodeCompletionChunk> &chunks)
void CodeCompletion::setChunks(const CodeCompletionChunks &chunks)
{
chunks_ = chunks;
}
const QVector<CodeCompletionChunk> &CodeCompletion::chunks() const
const CodeCompletionChunks &CodeCompletion::chunks() const
{
return chunks_;
}

10
src/libs/clangbackendipc/codecompletion.h
View File

@@ -37,9 +37,13 @@
#include <utf8string.h>
#include <QMetaType>
#include <QVector>
namespace ClangBackEnd {
class CodeCompletion;
using CodeCompletions = QVector<CodeCompletion>;
class CMBIPC_EXPORT CodeCompletion
{
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CodeCompletion &command);
@@ -91,8 +95,8 @@ public:
void setCompletionKind(Kind completionKind);
Kind completionKind() const;
void setChunks(const QVector<CodeCompletionChunk> &chunks);
const QVector<CodeCompletionChunk> &chunks() const;
void setChunks(const CodeCompletionChunks &chunks);
const CodeCompletionChunks &chunks() const;
void setAvailability(Availability availability);
Availability availability() const;
@@ -109,7 +113,7 @@ private:
private:
Utf8String text_;
QVector<CodeCompletionChunk> chunks_;
CodeCompletionChunks chunks_;
quint32 priority_ = 0;
Kind completionKind_ = Other;
Availability availability_ = NotAvailable;

4
src/libs/clangbackendipc/codecompletionchunk.cpp
View File

@@ -44,7 +44,7 @@ CodeCompletionChunk::CodeCompletionChunk()
CodeCompletionChunk::CodeCompletionChunk(CodeCompletionChunk::Kind kind,
const Utf8String &text,
const QVector<CodeCompletionChunk> &optionalChunks)
const CodeCompletionChunks &optionalChunks)
: text_(text),
optionalChunks_(optionalChunks),
kind_(kind)
@@ -61,7 +61,7 @@ const Utf8String &CodeCompletionChunk::text() const
return text_;
}
const QVector<CodeCompletionChunk> &CodeCompletionChunk::optionalChunks() const
const CodeCompletionChunks &CodeCompletionChunk::optionalChunks() const
{
return optionalChunks_;
}

9
src/libs/clangbackendipc/codecompletionchunk.h
View File

@@ -39,6 +39,9 @@
namespace ClangBackEnd {
class CodeCompletionChunk;
using CodeCompletionChunks = QVector<CodeCompletionChunk>;
class CMBIPC_EXPORT CodeCompletionChunk
{
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk);
@@ -73,18 +76,18 @@ public:
CodeCompletionChunk();
CodeCompletionChunk(Kind kind,
const Utf8String &text,
const QVector<CodeCompletionChunk> &optionalChunks = QVector<CodeCompletionChunk>());
const CodeCompletionChunks &optionalChunks = CodeCompletionChunks());
Kind kind() const;
const Utf8String &text() const;
const QVector<CodeCompletionChunk> &optionalChunks() const;
const CodeCompletionChunks &optionalChunks() const;
private:
quint32 &kindAsInt();
private:
Utf8String text_;
QVector<CodeCompletionChunk> optionalChunks_;
CodeCompletionChunks optionalChunks_;
Kind kind_ = Invalid;
};