diff --git a/src/libs/clangbackendipc/cancelmessage.cpp b/src/libs/clangbackendipc/cancelmessage.cpp index 015f65324ce..ca5adf0ab40 100644 --- a/src/libs/clangbackendipc/cancelmessage.cpp +++ b/src/libs/clangbackendipc/cancelmessage.cpp @@ -38,9 +38,9 @@ QDebug operator<<(QDebug debug, const CancelMessage &) return debug; } -void PrintTo(const CancelMessage &, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const CancelMessage &/*message*/) { - *os << "CancelMessage()"; + return os << "()"; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cancelmessage.h b/src/libs/clangbackendipc/cancelmessage.h index 1107fee21eb..c8924faec6b 100644 --- a/src/libs/clangbackendipc/cancelmessage.h +++ b/src/libs/clangbackendipc/cancelmessage.h @@ -49,7 +49,7 @@ public: }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CancelMessage &message); -void PrintTo(const CancelMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const CancelMessage &message); DECLARE_MESSAGE(CancelMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/clangbackendipcdebugutils.cpp b/src/libs/clangbackendipc/clangbackendipcdebugutils.cpp index 8530c4f20a3..8c0f83e10be 100644 --- a/src/libs/clangbackendipc/clangbackendipcdebugutils.cpp +++ b/src/libs/clangbackendipc/clangbackendipcdebugutils.cpp @@ -95,15 +95,15 @@ Utf8String debugId(const FileContainer &fileContainer) } VerboseScopeDurationTimer::VerboseScopeDurationTimer(const char *id) - : id(id) + : m_id(id) { if (timersLog().isDebugEnabled()) - timer.start(); + m_timer.start(); } VerboseScopeDurationTimer::~VerboseScopeDurationTimer() { - qCDebug(timersLog) << id << "needed" << timer.elapsed() << "ms"; + qCDebug(timersLog) << m_id << "needed" << m_timer.elapsed() << "ms"; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/clangbackendipcdebugutils.h b/src/libs/clangbackendipc/clangbackendipcdebugutils.h index df2ff3194ff..7f766c45d51 100644 --- a/src/libs/clangbackendipc/clangbackendipcdebugutils.h +++ b/src/libs/clangbackendipc/clangbackendipcdebugutils.h @@ -44,8 +44,8 @@ public: ~VerboseScopeDurationTimer(); private: - const char * const id; - QElapsedTimer timer; + const char * const m_id; + QElapsedTimer m_timer; }; } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/clangcodemodelclientproxy.cpp b/src/libs/clangbackendipc/clangcodemodelclientproxy.cpp index a9ee369bf41..953aa49be09 100644 --- a/src/libs/clangbackendipc/clangcodemodelclientproxy.cpp +++ b/src/libs/clangbackendipc/clangcodemodelclientproxy.cpp @@ -44,72 +44,72 @@ namespace ClangBackEnd { ClangCodeModelClientProxy::ClangCodeModelClientProxy(ClangCodeModelServerInterface *server, QIODevice *ioDevice) - : writeMessageBlock(ioDevice), - readMessageBlock(ioDevice), - server(server), - ioDevice(ioDevice) + : m_writeMessageBlock(ioDevice), + m_readMessageBlock(ioDevice), + m_server(server), + m_ioDevice(ioDevice) { - QObject::connect(ioDevice, &QIODevice::readyRead, [this] () {ClangCodeModelClientProxy::readMessages();}); + QObject::connect(m_ioDevice, &QIODevice::readyRead, [this] () {ClangCodeModelClientProxy::readMessages();}); } ClangCodeModelClientProxy::ClangCodeModelClientProxy(ClangCodeModelClientProxy &&other) - : writeMessageBlock(std::move(other.writeMessageBlock)), - readMessageBlock(std::move(other.readMessageBlock)), - server(std::move(other.server)), - ioDevice(std::move(other.ioDevice)) + : m_writeMessageBlock(std::move(other.m_writeMessageBlock)), + m_readMessageBlock(std::move(other.m_readMessageBlock)), + m_server(std::move(other.m_server)), + m_ioDevice(std::move(other.m_ioDevice)) { } ClangCodeModelClientProxy &ClangCodeModelClientProxy::operator=(ClangCodeModelClientProxy &&other) { - writeMessageBlock = std::move(other.writeMessageBlock); - readMessageBlock = std::move(other.readMessageBlock); - server = std::move(other.server); - ioDevice = std::move(other.ioDevice); + m_writeMessageBlock = std::move(other.m_writeMessageBlock); + m_readMessageBlock = std::move(other.m_readMessageBlock); + m_server = std::move(other.m_server); + m_ioDevice = std::move(other.m_ioDevice); return *this; } void ClangCodeModelClientProxy::alive() { - writeMessageBlock.write(AliveMessage()); + m_writeMessageBlock.write(AliveMessage()); } void ClangCodeModelClientProxy::echo(const EchoMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelClientProxy::codeCompleted(const CodeCompletedMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelClientProxy::translationUnitDoesNotExist(const TranslationUnitDoesNotExistMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelClientProxy::projectPartsDoNotExist(const ProjectPartsDoNotExistMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelClientProxy::documentAnnotationsChanged(const DocumentAnnotationsChangedMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelClientProxy::readMessages() { - for (const MessageEnvelop &message : readMessageBlock.readAll()) - server->dispatch(message); + for (const MessageEnvelop &message : m_readMessageBlock.readAll()) + m_server->dispatch(message); } -bool ClangCodeModelClientProxy::isUsingThatIoDevice(QIODevice *ioDevice) const +bool ClangCodeModelClientProxy::isUsingThatIoDevice(QIODevice *m_ioDevice) const { - return this->ioDevice == ioDevice; + return this->m_ioDevice == m_ioDevice; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/clangcodemodelclientproxy.h b/src/libs/clangbackendipc/clangcodemodelclientproxy.h index 300854216e9..005fe30dfa2 100644 --- a/src/libs/clangbackendipc/clangcodemodelclientproxy.h +++ b/src/libs/clangbackendipc/clangcodemodelclientproxy.h @@ -63,10 +63,10 @@ public: bool isUsingThatIoDevice(QIODevice *ioDevice) const; private: - ClangBackEnd::WriteMessageBlock writeMessageBlock; - ClangBackEnd::ReadMessageBlock readMessageBlock; - ClangCodeModelServerInterface *server = nullptr; - QIODevice *ioDevice = nullptr; + ClangBackEnd::WriteMessageBlock m_writeMessageBlock; + ClangBackEnd::ReadMessageBlock m_readMessageBlock; + ClangCodeModelServerInterface *m_server = nullptr; + QIODevice *m_ioDevice = nullptr; }; } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/clangcodemodelserverproxy.cpp b/src/libs/clangbackendipc/clangcodemodelserverproxy.cpp index 4f6aba1019d..aaf91927352 100644 --- a/src/libs/clangbackendipc/clangcodemodelserverproxy.cpp +++ b/src/libs/clangbackendipc/clangcodemodelserverproxy.cpp @@ -47,78 +47,78 @@ namespace ClangBackEnd { ClangCodeModelServerProxy::ClangCodeModelServerProxy(ClangCodeModelClientInterface *client, QIODevice *ioDevice) - : writeMessageBlock(ioDevice), - readMessageBlock(ioDevice), - client(client) + : m_writeMessageBlock(ioDevice), + m_readMessageBlock(ioDevice), + m_client(client) { QObject::connect(ioDevice, &QIODevice::readyRead, [this] () {ClangCodeModelServerProxy::readMessages();}); } void ClangCodeModelServerProxy::readMessages() { - for (const auto &message : readMessageBlock.readAll()) - client->dispatch(message); + for (const auto &message : m_readMessageBlock.readAll()) + m_client->dispatch(message); } void ClangCodeModelServerProxy::resetCounter() { - writeMessageBlock.resetCounter(); - readMessageBlock.resetCounter(); + m_writeMessageBlock.resetCounter(); + m_readMessageBlock.resetCounter(); } void ClangCodeModelServerProxy::end() { - writeMessageBlock.write(EndMessage()); + m_writeMessageBlock.write(EndMessage()); } void ClangCodeModelServerProxy::registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelServerProxy::updateTranslationUnitsForEditor(const ClangBackEnd::UpdateTranslationUnitsForEditorMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelServerProxy::unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelServerProxy::registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelServerProxy::unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangBackEnd::ClangCodeModelServerProxy::registerUnsavedFilesForEditor(const ClangBackEnd::RegisterUnsavedFilesForEditorMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangBackEnd::ClangCodeModelServerProxy::unregisterUnsavedFilesForEditor(const ClangBackEnd::UnregisterUnsavedFilesForEditorMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelServerProxy::completeCode(const CompleteCodeMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelServerProxy::requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } void ClangCodeModelServerProxy::updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message) { - writeMessageBlock.write(message); + m_writeMessageBlock.write(message); } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/clangcodemodelserverproxy.h b/src/libs/clangbackendipc/clangcodemodelserverproxy.h index 18852116721..57421a19074 100644 --- a/src/libs/clangbackendipc/clangcodemodelserverproxy.h +++ b/src/libs/clangbackendipc/clangcodemodelserverproxy.h @@ -66,9 +66,9 @@ public: void resetCounter(); private: - ClangBackEnd::WriteMessageBlock writeMessageBlock; - ClangBackEnd::ReadMessageBlock readMessageBlock; - ClangCodeModelClientInterface *client; + ClangBackEnd::WriteMessageBlock m_writeMessageBlock; + ClangBackEnd::ReadMessageBlock m_readMessageBlock; + ClangCodeModelClientInterface *m_client; }; } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbalivemessage.cpp b/src/libs/clangbackendipc/cmbalivemessage.cpp index 72a4d37bea6..d0ec78d6326 100644 --- a/src/libs/clangbackendipc/cmbalivemessage.cpp +++ b/src/libs/clangbackendipc/cmbalivemessage.cpp @@ -27,6 +27,8 @@ #include +#include + namespace ClangBackEnd { QDebug operator<<(QDebug debug, const AliveMessage &/*message*/) @@ -34,4 +36,9 @@ QDebug operator<<(QDebug debug, const AliveMessage &/*message*/) return debug.nospace() << "AliveMessage()"; } +std::ostream &operator<<(std::ostream &os, const AliveMessage &/*message*/) +{ + return os << "()"; +} + } diff --git a/src/libs/clangbackendipc/cmbalivemessage.h b/src/libs/clangbackendipc/cmbalivemessage.h index 0b49498156a..435423a2f09 100644 --- a/src/libs/clangbackendipc/cmbalivemessage.h +++ b/src/libs/clangbackendipc/cmbalivemessage.h @@ -29,6 +29,8 @@ #include +#include + namespace ClangBackEnd { class AliveMessage @@ -51,6 +53,7 @@ public: }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const AliveMessage &message); +std::ostream &operator<<(std::ostream &os, const AliveMessage &message); DECLARE_MESSAGE(AliveMessage) } diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp b/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp index e322b129237..e5667fd04eb 100644 --- a/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp +++ b/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp @@ -46,23 +46,25 @@ QDebug operator<<(QDebug debug, const CodeCompletedMessage &message) { debug.nospace() << "CodeCompletedMessage("; - debug.nospace() << message.codeCompletions_ << ", " + debug.nospace() << message.m_codeCompletions << ", " << completionCorrectionToText(message.neededCorrection()) << ", " - << message.ticketNumber_; + << message.m_ticketNumber; debug.nospace() << ")"; return debug; } -void PrintTo(const CodeCompletedMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const CodeCompletedMessage &message) { - QString output; - QDebug debug(&output); + os << "(" + << message.m_codeCompletions << ", " + << completionCorrectionToText(message.neededCorrection()) << ", " + << message.m_ticketNumber - debug << message; + << ")"; - *os << output.toUtf8().constData(); + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.h b/src/libs/clangbackendipc/cmbcodecompletedmessage.h index cc686f21d3f..1bcac526ca5 100644 --- a/src/libs/clangbackendipc/cmbcodecompletedmessage.h +++ b/src/libs/clangbackendipc/cmbcodecompletedmessage.h @@ -27,8 +27,9 @@ #include "codecompletion.h" +#include + #include -#include namespace ClangBackEnd { @@ -39,32 +40,32 @@ public: CodeCompletedMessage(const CodeCompletions &codeCompletions, CompletionCorrection neededCorrection, quint64 ticketNumber) - : codeCompletions_(codeCompletions), - ticketNumber_(ticketNumber), - neededCorrection_(neededCorrection) + : m_codeCompletions(codeCompletions), + m_ticketNumber(ticketNumber), + m_neededCorrection(neededCorrection) { } const CodeCompletions &codeCompletions() const { - return codeCompletions_; + return m_codeCompletions; } CompletionCorrection neededCorrection() const { - return neededCorrection_; + return m_neededCorrection; } quint64 ticketNumber() const { - return ticketNumber_; + return m_ticketNumber; } friend QDataStream &operator<<(QDataStream &out, const CodeCompletedMessage &message) { - out << message.codeCompletions_; - out << static_cast(message.neededCorrection_); - out << message.ticketNumber_; + out << message.m_codeCompletions; + out << static_cast(message.m_neededCorrection); + out << message.m_ticketNumber; return out; } @@ -73,29 +74,29 @@ public: { quint32 neededCorrection; - in >> message.codeCompletions_; + in >> message.m_codeCompletions; in >> neededCorrection; - in >> message.ticketNumber_; + in >> message.m_ticketNumber; - message.neededCorrection_ = static_cast(neededCorrection); + message.m_neededCorrection = static_cast(neededCorrection); return in; } friend bool operator==(const CodeCompletedMessage &first, const CodeCompletedMessage &second) { - return first.ticketNumber_ == second.ticketNumber_ - && first.neededCorrection_ == second.neededCorrection_ - && first.codeCompletions_ == second.codeCompletions_; + return first.m_ticketNumber == second.m_ticketNumber + && first.m_neededCorrection == second.m_neededCorrection + && first.m_codeCompletions == second.m_codeCompletions; } friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message); - friend void PrintTo(const CodeCompletedMessage &message, ::std::ostream* os); + friend std::ostream &operator<<(std::ostream &os, const CodeCompletedMessage &message); private: - CodeCompletions codeCompletions_; - quint64 ticketNumber_ = 0; - CompletionCorrection neededCorrection_ = CompletionCorrection::NoCorrection; + CodeCompletions m_codeCompletions; + quint64 m_ticketNumber = 0; + CompletionCorrection m_neededCorrection = CompletionCorrection::NoCorrection; }; DECLARE_MESSAGE(CodeCompletedMessage) diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.cpp b/src/libs/clangbackendipc/cmbcompletecodemessage.cpp index 2fd9bb6729d..3bc968e76d4 100644 --- a/src/libs/clangbackendipc/cmbcompletecodemessage.cpp +++ b/src/libs/clangbackendipc/cmbcompletecodemessage.cpp @@ -37,28 +37,29 @@ QDebug operator<<(QDebug debug, const CompleteCodeMessage &message) { debug.nospace() << "CompleteCodeMessage("; - debug.nospace() << message.filePath_ << ", "; - debug.nospace() << message.line_<< ", "; - debug.nospace() << message.column_<< ", "; - debug.nospace() << message.projectPartId_ << ", "; - debug.nospace() << message.ticketNumber_; + debug.nospace() << message.m_filePath << ", "; + debug.nospace() << message.m_line << ", "; + debug.nospace() << message.m_column << ", "; + debug.nospace() << message.m_projectPartId << ", "; + debug.nospace() << message.m_ticketNumber; debug.nospace() << ")"; return debug; } -void PrintTo(const CompleteCodeMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const CompleteCodeMessage &message) { - *os << "CompleteCodeMessage("; + os << "(" + << message.m_filePath.constData() << ", " + << message.m_line << ", " + << message.m_column << ", " + << message.m_projectPartId.constData() << ", " + << message.m_ticketNumber - *os << message.filePath_.constData() << ", "; - *os << message.line_ << ", "; - *os << message.column_ << ", "; - *os << message.projectPartId_.constData() << ", "; - *os << message.ticketNumber_; + << ")"; - *os << ")"; + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.h b/src/libs/clangbackendipc/cmbcompletecodemessage.h index e7c3dc58fef..1c37a6538b1 100644 --- a/src/libs/clangbackendipc/cmbcompletecodemessage.h +++ b/src/libs/clangbackendipc/cmbcompletecodemessage.h @@ -42,80 +42,80 @@ public: quint32 line, quint32 column, const Utf8String &projectPartId) - : filePath_(filePath), - projectPartId_(projectPartId), - ticketNumber_(++ticketCounter), - line_(line), - column_(column) + : m_filePath(filePath), + m_projectPartId(projectPartId), + m_ticketNumber(++ticketCounter), + m_line(line), + m_column(column) { } const Utf8String &filePath() const { - return filePath_; + return m_filePath; } const Utf8String &projectPartId() const { - return projectPartId_; + return m_projectPartId; } quint32 line() const { - return line_; + return m_line; } quint32 column() const { - return column_; + return m_column; } quint64 ticketNumber() const { - return ticketNumber_; + return m_ticketNumber; } friend QDataStream &operator<<(QDataStream &out, const CompleteCodeMessage &message) { - out << message.filePath_; - out << message.projectPartId_; - out << message.ticketNumber_; - out << message.line_; - out << message.column_; + out << message.m_filePath; + out << message.m_projectPartId; + out << message.m_ticketNumber; + out << message.m_line; + out << message.m_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_; + in >> message.m_filePath; + in >> message.m_projectPartId; + in >> message.m_ticketNumber; + in >> message.m_line; + in >> message.m_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_; + return first.m_ticketNumber == second.m_ticketNumber + && first.m_filePath == second.m_filePath + && first.m_projectPartId == second.m_projectPartId + && first.m_line == second.m_line + && first.m_column == second.m_column; } friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message); - friend void PrintTo(const CompleteCodeMessage &message, ::std::ostream* os); + friend std::ostream &operator<<(std::ostream &os, const CompleteCodeMessage &message); private: - Utf8String filePath_; - Utf8String projectPartId_; + Utf8String m_filePath; + Utf8String m_projectPartId; static CMBIPC_EXPORT quint64 ticketCounter; - quint64 ticketNumber_ = 0; - quint32 line_ = 0; - quint32 column_ = 0; + quint64 m_ticketNumber = 0; + quint32 m_line = 0; + quint32 m_column = 0; }; DECLARE_MESSAGE(CompleteCodeMessage); diff --git a/src/libs/clangbackendipc/cmbechomessage.cpp b/src/libs/clangbackendipc/cmbechomessage.cpp index aac0168e173..734eb0d1033 100644 --- a/src/libs/clangbackendipc/cmbechomessage.cpp +++ b/src/libs/clangbackendipc/cmbechomessage.cpp @@ -36,9 +36,9 @@ QDebug operator<<(QDebug debug, const EchoMessage &) return debug.nospace() << "EchoMessage()"; } -void PrintTo(const EchoMessage &, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const EchoMessage &/*message*/) { - *os << "EchoMessage()"; + return os << "()"; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbechomessage.h b/src/libs/clangbackendipc/cmbechomessage.h index a37f722e5af..098d75f2403 100644 --- a/src/libs/clangbackendipc/cmbechomessage.h +++ b/src/libs/clangbackendipc/cmbechomessage.h @@ -29,6 +29,8 @@ #include "messageenvelop.h" +#include + namespace ClangBackEnd { class EchoMessage @@ -36,13 +38,13 @@ class EchoMessage public: EchoMessage() = default; explicit EchoMessage(const MessageEnvelop &message) - : message_(message) + : m_message(message) { } const MessageEnvelop &message() const { - return message_; + return m_message; } friend QDataStream &operator<<(QDataStream &out, const EchoMessage &message) @@ -54,22 +56,22 @@ public: friend QDataStream &operator>>(QDataStream &in, EchoMessage &message) { - in >> message.message_; + in >> message.m_message; return in; } friend bool operator==(const EchoMessage &first, const EchoMessage &second) { - return first.message_ == second.message_; + return first.m_message == second.m_message; } private: - MessageEnvelop message_; + MessageEnvelop m_message; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EchoMessage &message); -void PrintTo(const EchoMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const EchoMessage &message); DECLARE_MESSAGE(EchoMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbendmessage.cpp b/src/libs/clangbackendipc/cmbendmessage.cpp index 86fd4914736..d4535f45fac 100644 --- a/src/libs/clangbackendipc/cmbendmessage.cpp +++ b/src/libs/clangbackendipc/cmbendmessage.cpp @@ -36,10 +36,9 @@ QDebug operator<<(QDebug debug, const EndMessage &/*message*/) return debug.nospace() << "EndMessage()"; } -void PrintTo(const EndMessage &/*message*/, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const EndMessage &/*message*/) { - *os << "EndMessage()"; + return os << "()"; } } - diff --git a/src/libs/clangbackendipc/cmbendmessage.h b/src/libs/clangbackendipc/cmbendmessage.h index a565f87b8a2..684e5b7a7d2 100644 --- a/src/libs/clangbackendipc/cmbendmessage.h +++ b/src/libs/clangbackendipc/cmbendmessage.h @@ -53,7 +53,7 @@ public: }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EndMessage &message); -void PrintTo(const EndMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const EndMessage &message); DECLARE_MESSAGE(EndMessage) } diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp index 6c1b6a4f8bd..c18cf089802 100644 --- a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp +++ b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp @@ -44,14 +44,13 @@ QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &mess return debug; } -void PrintTo(const RegisterProjectPartsForEditorMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const RegisterProjectPartsForEditorMessage &message) { - *os << "RegisterProjectPartsForEditorMessage("; + os << "(" + << message.projectContainers() + << ")"; - for (const ProjectPartContainer &projectContainer : message.projectContainers()) - PrintTo(projectContainer, os); - - *os << ")"; + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h index 86397e43fce..10880735f7a 100644 --- a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h +++ b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h @@ -37,40 +37,40 @@ class RegisterProjectPartsForEditorMessage public: RegisterProjectPartsForEditorMessage() = default; RegisterProjectPartsForEditorMessage(const QVector &projectContainers) - :projectContainers_(projectContainers) + :m_projectContainers(projectContainers) { } const QVector &projectContainers() const { - return projectContainers_; + return m_projectContainers; } friend QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message) { - out << message.projectContainers_; + out << message.m_projectContainers; return out; } friend QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message) { - in >> message.projectContainers_; + in >> message.m_projectContainers; return in; } friend bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second) { - return first.projectContainers_ == second.projectContainers_; + return first.m_projectContainers == second.m_projectContainers; } private: - QVector projectContainers_; + QVector m_projectContainers; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message); -void PrintTo(const RegisterProjectPartsForEditorMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const RegisterProjectPartsForEditorMessage &message); DECLARE_MESSAGE(RegisterProjectPartsForEditorMessage); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.cpp b/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.cpp index 2f1b7ac65d2..3b3d3e5e288 100644 --- a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.cpp +++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.cpp @@ -48,20 +48,14 @@ QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &m return debug; } -void PrintTo(const RegisterTranslationUnitForEditorMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const RegisterTranslationUnitForEditorMessage &message) { - *os << "RegisterTranslationUnitForEditorMessage("; + os << "RegisterTranslationUnitForEditorMessage(" + << message.fileContainers() << ", " + << message.currentEditorFilePath() << ", " + << message.visibleEditorFilePaths() << ")"; - for (const FileContainer &fileContainer : message.fileContainers()) - PrintTo(fileContainer, os); - - *os << message.currentEditorFilePath().constData() << ", "; - - auto visiblePaths = message.visibleEditorFilePaths(); - - std::copy(visiblePaths.cbegin(), visiblePaths.cend(), std::ostream_iterator(*os, ", ")); - - *os << ")"; + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h b/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h index 374acf600da..85afdf63f9f 100644 --- a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h +++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h @@ -84,7 +84,7 @@ public: && first.visibleEditorFilePaths_ == second.visibleEditorFilePaths_; } - friend void PrintTo(const RegisterTranslationUnitForEditorMessage &message, ::std::ostream* os); + friend std::ostream &operator<<(std::ostream &os, const RegisterTranslationUnitForEditorMessage &message); private: QVector fileContainers_; Utf8String currentEditorFilePath_; diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.cpp b/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.cpp index 9fd83e797c5..e5099269700 100644 --- a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.cpp +++ b/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.cpp @@ -43,14 +43,13 @@ QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &me return debug; } -void PrintTo(const UnregisterProjectPartsForEditorMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const UnregisterProjectPartsForEditorMessage &message) { - *os << "UnregisterProjectPartsForEditorMessage("; + os << "(" + << message.projectPartIds() + << ")"; - for (const Utf8String &fileNames_ : message.projectPartIds()) - *os << fileNames_.constData() << ", "; - - *os << ")"; + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h b/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h index 4af6faae964..355e85217db 100644 --- a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h +++ b/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h @@ -38,40 +38,40 @@ class CMBIPC_EXPORT UnregisterProjectPartsForEditorMessage public: UnregisterProjectPartsForEditorMessage() = default; UnregisterProjectPartsForEditorMessage(const Utf8StringVector &projectPartIds) - : projectPartIds_(projectPartIds) + : m_projectPartIds(projectPartIds) { } const Utf8StringVector &projectPartIds() const { - return projectPartIds_; + return m_projectPartIds; } friend QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForEditorMessage &message) { - out << message.projectPartIds_; + out << message.m_projectPartIds; return out; } friend QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForEditorMessage &message) { - in >> message.projectPartIds_; + in >> message.m_projectPartIds; return in; } friend bool operator==(const UnregisterProjectPartsForEditorMessage &first, const UnregisterProjectPartsForEditorMessage &second) { - return first.projectPartIds_ == second.projectPartIds_; + return first.m_projectPartIds == second.m_projectPartIds; } private: - Utf8StringVector projectPartIds_; + Utf8StringVector m_projectPartIds; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message); -void PrintTo(const UnregisterProjectPartsForEditorMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const UnregisterProjectPartsForEditorMessage &message); DECLARE_MESSAGE(UnregisterProjectPartsForEditorMessage); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.cpp b/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.cpp index 4a7772e5dec..c547b94b2fc 100644 --- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.cpp +++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.cpp @@ -25,12 +25,10 @@ #include "cmbunregistertranslationunitsforeditormessage.h" -#ifdef UNIT_TESTS -#include -#endif - #include +#include + namespace ClangBackEnd { QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message) @@ -45,18 +43,14 @@ QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage return debug; } -#ifdef UNIT_TESTS -void PrintTo(const UnregisterTranslationUnitsForEditorMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const UnregisterTranslationUnitsForEditorMessage &message) { - *os << "UnregisterTranslationUnitsForEditorMessage("; + os << "(" + << message.fileContainers() + << ")"; - for (const FileContainer &fileContainer : message.fileContainers()) - *os << ::testing::PrintToString(fileContainer) << ", "; - - *os << ")"; + return os; } -#endif - } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h b/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h index cf94bc9c56d..ea9df17d286 100644 --- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h +++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h @@ -38,39 +38,38 @@ class UnregisterTranslationUnitsForEditorMessage public: UnregisterTranslationUnitsForEditorMessage() = default; UnregisterTranslationUnitsForEditorMessage(const QVector &fileContainers) - : fileContainers_(fileContainers) + : m_fileContainers(fileContainers) { } const QVector &fileContainers() const { - return fileContainers_; + return m_fileContainers; } friend QDataStream &operator<<(QDataStream &out, const UnregisterTranslationUnitsForEditorMessage &message) { - out << message.fileContainers_; + out << message.m_fileContainers; return out; } friend QDataStream &operator>>(QDataStream &in, UnregisterTranslationUnitsForEditorMessage &message) { - in >> message.fileContainers_; + in >> message.m_fileContainers; return in; } friend bool operator==(const UnregisterTranslationUnitsForEditorMessage &first, const UnregisterTranslationUnitsForEditorMessage &second) { - return first.fileContainers_ == second.fileContainers_; + return first.m_fileContainers == second.m_fileContainers; } -#ifdef UNIT_TESTS - friend void PrintTo(const UnregisterTranslationUnitsForEditorMessage &message, ::std::ostream* os); -#endif + friend std::ostream &operator<<(std::ostream &os, const UnregisterTranslationUnitsForEditorMessage &message); + private: - QVector fileContainers_; + QVector m_fileContainers; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message); diff --git a/src/libs/clangbackendipc/codecompletion.cpp b/src/libs/clangbackendipc/codecompletion.cpp index 6cd2625facf..07b2daac0ff 100644 --- a/src/libs/clangbackendipc/codecompletion.cpp +++ b/src/libs/clangbackendipc/codecompletion.cpp @@ -73,38 +73,38 @@ QDebug operator<<(QDebug debug, const CodeCompletion &message) { debug.nospace() << "CodeCompletion("; - debug.nospace() << message.text_ << ", "; - debug.nospace() << message.priority_ << ", "; - debug.nospace() << completionKindToString(message.completionKind_) << ", "; - debug.nospace() << availabilityToString(message.availability_) << ", "; - debug.nospace() << message.hasParameters_; + debug.nospace() << message.m_text << ", "; + debug.nospace() << message.m_priority << ", "; + debug.nospace() << completionKindToString(message.m_completionKind) << ", "; + debug.nospace() << availabilityToString(message.m_availability) << ", "; + debug.nospace() << message.m_hasParameters; debug.nospace() << ")"; return debug; } -void PrintTo(const CodeCompletion &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const CodeCompletion &message) { - *os << "CodeCompletion("; + os << "(" + << message.m_text << ", " + << message.m_priority << ", " + << message.m_completionKind << ", " + << message.m_availability << ", " + << message.m_hasParameters + << ")"; - *os << message.text_.constData() << ", "; - *os << message.priority_ << ", "; - *os << completionKindToString(message.completionKind_) << ", "; - *os << availabilityToString(message.availability_) << ", "; - *os << message.hasParameters_; - - *os << ")"; + return os; } -void PrintTo(CodeCompletion::Kind kind, ::std::ostream *os) +std::ostream &operator<<(std::ostream &os, const CodeCompletion::Kind kind) { - *os << completionKindToString(kind); + return os << completionKindToString(kind); } -void PrintTo(CodeCompletion::Availability availability, std::ostream *os) +std::ostream &operator<<(std::ostream &os, const CodeCompletion::Availability availability) { - *os << availabilityToString(availability); + return os << availabilityToString(availability); } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/codecompletion.h b/src/libs/clangbackendipc/codecompletion.h index fa952db2523..4b9b2ed7c21 100644 --- a/src/libs/clangbackendipc/codecompletion.h +++ b/src/libs/clangbackendipc/codecompletion.h @@ -77,93 +77,93 @@ public: Kind completionKind = Other, Availability availability = Available, bool hasParameters = false) - : text_(text), - priority_(priority), - completionKind_(completionKind), - availability_(availability), - hasParameters_(hasParameters) + : m_text(text), + m_priority(priority), + m_completionKind(completionKind), + m_availability(availability), + m_hasParameters(hasParameters) { } void setText(const Utf8String &text) { - text_ = text; + m_text = text; } const Utf8String &text() const { - return text_; + return m_text; } void setCompletionKind(Kind completionKind) { - completionKind_ = completionKind; + m_completionKind = completionKind; } Kind completionKind() const { - return completionKind_; + return m_completionKind; } void setChunks(const CodeCompletionChunks &chunks) { - chunks_ = chunks; + m_chunks = chunks; } const CodeCompletionChunks &chunks() const { - return chunks_; + return m_chunks; } void setAvailability(Availability availability) { - availability_ = availability; + m_availability = availability; } Availability availability() const { - return availability_; + return m_availability; } void setHasParameters(bool hasParameters) { - hasParameters_ = hasParameters; + m_hasParameters = hasParameters; } bool hasParameters() const { - return hasParameters_; + return m_hasParameters; } void setPriority(quint32 priority) { - priority_ = priority; + m_priority = priority; } quint32 priority() const { - return priority_; + return m_priority; } void setBriefComment(const Utf8String &briefComment) { - briefComment_ = briefComment; + m_briefComment = briefComment; } const Utf8String &briefComment() const { - return briefComment_; + return m_briefComment; } friend QDataStream &operator<<(QDataStream &out, const CodeCompletion &message) { - out << message.text_; - out << message.briefComment_; - out << message.chunks_; - out << message.priority_; - out << static_cast(message.completionKind_); - out << static_cast(message.availability_); - out << message.hasParameters_; + out << message.m_text; + out << message.m_briefComment; + out << message.m_chunks; + out << message.m_priority; + out << static_cast(message.m_completionKind); + out << static_cast(message.m_availability); + out << message.m_hasParameters; return out; } @@ -173,41 +173,41 @@ public: quint32 completionKind; quint32 availability; - in >> message.text_; - in >> message.briefComment_; - in >> message.chunks_; - in >> message.priority_; + in >> message.m_text; + in >> message.m_briefComment; + in >> message.m_chunks; + in >> message.m_priority; in >> completionKind; in >> availability; - in >> message.hasParameters_; + in >> message.m_hasParameters; - message.completionKind_ = static_cast(completionKind); - message.availability_ = static_cast(availability); + message.m_completionKind = static_cast(completionKind); + message.m_availability = static_cast(availability); return in; } friend bool operator==(const CodeCompletion &first, const CodeCompletion &second) { - return first.text_ == second.text_ - && first.completionKind_ == second.completionKind_; + return first.m_text == second.m_text + && first.m_completionKind == second.m_completionKind; } friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletion &message); - friend void PrintTo(const CodeCompletion &message, ::std::ostream* os); + friend std::ostream &operator<<(std::ostream &os, const CodeCompletion &message); private: - Utf8String text_; - Utf8String briefComment_; - CodeCompletionChunks chunks_; - quint32 priority_ = 0; - Kind completionKind_ = Other; - Availability availability_ = NotAvailable; - bool hasParameters_ = false; + Utf8String m_text; + Utf8String m_briefComment; + CodeCompletionChunks m_chunks; + quint32 m_priority = 0; + Kind m_completionKind = Other; + Availability m_availability = NotAvailable; + bool m_hasParameters = false; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, CodeCompletion::Kind kind); -void PrintTo(CodeCompletion::Kind kind, ::std::ostream *os); -void PrintTo(CodeCompletion::Availability availability, ::std::ostream *os); +std::ostream &operator<<(std::ostream &os, const CodeCompletion::Kind kind); +std::ostream &operator<<(std::ostream &os, const CodeCompletion::Availability availability); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/codecompletionchunk.cpp b/src/libs/clangbackendipc/codecompletionchunk.cpp index 5e3e53bf718..60a0fee2c4b 100644 --- a/src/libs/clangbackendipc/codecompletionchunk.cpp +++ b/src/libs/clangbackendipc/codecompletionchunk.cpp @@ -75,21 +75,23 @@ QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk) return debug; } -void PrintTo(const CodeCompletionChunk &chunk, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk &chunk) { - *os << "{"; - *os << completionChunkKindToString(chunk.kind()) << ", "; - *os << chunk.text().constData(); + os << "(" + << chunk.kind() << ", " + << chunk.text(); if (chunk.isOptional()) - *os << ", optional"; + os << ", optional"; - *os << "}"; + os << ")"; + + return os; } -void PrintTo(const CodeCompletionChunk::Kind &kind, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk::Kind &kind) { - *os << completionChunkKindToString(kind); + return os << completionChunkKindToString(kind); } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/codecompletionchunk.h b/src/libs/clangbackendipc/codecompletionchunk.h index 90decad7e34..8ba1032c8e9 100644 --- a/src/libs/clangbackendipc/codecompletionchunk.h +++ b/src/libs/clangbackendipc/codecompletionchunk.h @@ -69,32 +69,32 @@ public: CodeCompletionChunk(Kind kind, const Utf8String &text, bool isOptional = false) - : text_(text), - kind_(kind), - isOptional_(isOptional) + : m_text(text), + m_kind(kind), + m_isOptional(isOptional) { } Kind kind() const { - return kind_; + return m_kind; } const Utf8String &text() const { - return text_; + return m_text; } bool isOptional() const { - return isOptional_; + return m_isOptional; } friend QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk) { - out << static_cast(chunk.kind_); - out << chunk.text_; - out << chunk.isOptional_; + out << static_cast(chunk.m_kind); + out << chunk.m_text; + out << chunk.m_isOptional; return out; } @@ -104,10 +104,10 @@ public: quint8 kind; in >> kind; - in >> chunk.text_; - in >> chunk.isOptional_; + in >> chunk.m_text; + in >> chunk.m_isOptional; - chunk.kind_ = static_cast(kind); + chunk.m_kind = static_cast(kind); return in; } @@ -120,14 +120,14 @@ public: } private: - Utf8String text_; - Kind kind_ = Invalid; - bool isOptional_ = false; + Utf8String m_text; + Kind m_kind = Invalid; + bool m_isOptional = false; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk); -void PrintTo(const CodeCompletionChunk &chunk, ::std::ostream* os); -void PrintTo(const CodeCompletionChunk::Kind &kind, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk &chunk); +std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk::Kind &kind); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/connectionclient.cpp b/src/libs/clangbackendipc/connectionclient.cpp index 5928ced2dfb..3f85d8f2e6c 100644 --- a/src/libs/clangbackendipc/connectionclient.cpp +++ b/src/libs/clangbackendipc/connectionclient.cpp @@ -39,7 +39,7 @@ namespace ClangBackEnd { ConnectionClient::ConnectionClient() { - processAliveTimer.setInterval(10000); + m_processAliveTimer.setInterval(10000); resetTemporaryDir(); static const bool startAliveTimer = !qEnvironmentVariableIntValue("QTC_CLANG_NO_ALIVE_TIMER"); @@ -54,7 +54,7 @@ ConnectionClient::ConnectionClient() void ConnectionClient::startProcessAndConnectToServerAsynchronously() { - process_ = startProcess(); + m_process = startProcess(); } bool ConnectionClient::disconnectFromServer() @@ -86,13 +86,13 @@ void ConnectionClient::sendEndMessage() void ConnectionClient::resetProcessAliveTimer() { - isAliveTimerResetted = true; - processAliveTimer.start(); + m_isAliveTimerResetted = true; + m_processAliveTimer.start(); } void ConnectionClient::setProcessAliveTimerInterval(int processTimerInterval) { - processAliveTimer.setInterval(processTimerInterval); + m_processAliveTimer.setInterval(processTimerInterval); } QProcessEnvironment ConnectionClient::processEnvironment() const @@ -111,22 +111,22 @@ QProcessEnvironment ConnectionClient::processEnvironment() const const QTemporaryDir &ConnectionClient::temporaryDirectory() const { - return *temporaryDirectory_; + return *m_temporaryDirectory; } LinePrefixer &ConnectionClient::stdErrPrefixer() { - return stdErrPrefixer_; + return m_stdErrPrefixer; } LinePrefixer &ConnectionClient::stdOutPrefixer() { - return stdOutPrefixer_; + return m_stdOutPrefixer; } std::unique_ptr ConnectionClient::startProcess() { - processIsStarting = true; + m_processIsStarting = true; auto process = std::unique_ptr(new QProcess); connectProcessFinished(process.get()); @@ -141,8 +141,8 @@ std::unique_ptr ConnectionClient::startProcess() void ConnectionClient::restartProcessAsynchronously() { - if (!processIsStarting) { - finishProcess(std::move(process_)); + if (!m_processIsStarting) { + finishProcess(std::move(m_process)); resetTemporaryDir(); // clear left-over preambles startProcessAndConnectToServerAsynchronously(); @@ -151,8 +151,8 @@ void ConnectionClient::restartProcessAsynchronously() void ConnectionClient::restartProcessIfTimerIsNotResettedAndSocketIsEmpty() { - if (isAliveTimerResetted) { - isAliveTimerResetted = false; + if (m_isAliveTimerResetted) { + m_isAliveTimerResetted = false; return; // Already reset, but we were scheduled after. } @@ -199,7 +199,7 @@ void ConnectionClient::killProcess(QProcess *process) void ConnectionClient::resetProcessIsStarting() { - processIsStarting = false; + m_processIsStarting = false; } void ConnectionClient::printLocalSocketError(QLocalSocket::LocalSocketError socketError) @@ -210,17 +210,17 @@ void ConnectionClient::printLocalSocketError(QLocalSocket::LocalSocketError sock void ConnectionClient::printStandardOutput() { - qDebug("%s", stdOutPrefixer_.prefix(process_->readAllStandardOutput()).constData()); + qDebug("%s", m_stdOutPrefixer.prefix(m_process->readAllStandardOutput()).constData()); } void ConnectionClient::printStandardError() { - qDebug("%s", stdErrPrefixer_.prefix(process_->readAllStandardError()).constData()); + qDebug("%s", m_stdErrPrefixer.prefix(m_process->readAllStandardError()).constData()); } void ConnectionClient::resetTemporaryDir() { - temporaryDirectory_ = std::make_unique("clang-XXXXXX"); + m_temporaryDirectory = std::make_unique("clang-XXXXXX"); } void ConnectionClient::connectLocalSocketConnected() @@ -246,13 +246,13 @@ void ConnectionClient::connectLocalSocketDisconnected() void ConnectionClient::finishProcess() { - finishProcess(std::move(process_)); + finishProcess(std::move(m_process)); } void ConnectionClient::finishProcess(std::unique_ptr &&process) { if (process) { - processAliveTimer.stop(); + m_processAliveTimer.stop(); disconnectProcessFinished(process.get()); endProcess(process.get()); @@ -291,7 +291,7 @@ bool ConnectionClient::waitForConnected() QProcess *ConnectionClient::processForTestOnly() const { - return process_.get(); + return m_process.get(); } QIODevice *ConnectionClient::ioDevice() @@ -301,7 +301,7 @@ QIODevice *ConnectionClient::ioDevice() bool ConnectionClient::isProcessIsRunning() const { - return process_ && process_->state() == QProcess::Running; + return m_process && m_process->state() == QProcess::Running; } void ConnectionClient::connectProcessFinished(QProcess *process) const @@ -347,7 +347,7 @@ void ConnectionClient::connectLocalSocketError() const void ConnectionClient::connectAliveTimer() { - connect(&processAliveTimer, + connect(&m_processAliveTimer, &QTimer::timeout, this, &ConnectionClient::restartProcessIfTimerIsNotResettedAndSocketIsEmpty); @@ -355,12 +355,12 @@ void ConnectionClient::connectAliveTimer() const QString &ConnectionClient::processPath() const { - return processPath_; + return m_processPath; } void ConnectionClient::setProcessPath(const QString &processPath) { - processPath_ = processPath; + m_processPath = processPath; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/connectionclient.h b/src/libs/clangbackendipc/connectionclient.h index 4baada60738..d8c6692b569 100644 --- a/src/libs/clangbackendipc/connectionclient.h +++ b/src/libs/clangbackendipc/connectionclient.h @@ -121,16 +121,16 @@ private: QProcessEnvironment processEnvironment() const; private: - LinePrefixer stdErrPrefixer_; - LinePrefixer stdOutPrefixer_; + LinePrefixer m_stdErrPrefixer; + LinePrefixer m_stdOutPrefixer; - mutable std::unique_ptr process_; + mutable std::unique_ptr m_process; QLocalSocket localSocket; - std::unique_ptr temporaryDirectory_; - QTimer processAliveTimer; - QString processPath_; - bool isAliveTimerResetted = false; - bool processIsStarting = false; + std::unique_ptr m_temporaryDirectory; + QTimer m_processAliveTimer; + QString m_processPath; + bool m_isAliveTimerResetted = false; + bool m_processIsStarting = false; }; diff --git a/src/libs/clangbackendipc/connectionserver.h b/src/libs/clangbackendipc/connectionserver.h index 4d9593ec505..021ffac0f95 100644 --- a/src/libs/clangbackendipc/connectionserver.h +++ b/src/libs/clangbackendipc/connectionserver.h @@ -54,14 +54,14 @@ public: { ConnectionName::connectionName = connectionName; - aliveTimer.start(5000); + m_aliveTimer.start(5000); - localServer.setMaxPendingConnections(1); + m_localServer.setMaxPendingConnections(1); - QObject::connect(&localServer, + QObject::connect(&m_localServer, &QLocalServer::newConnection, [&] { handleNewConnection(); }); - QObject::connect(&aliveTimer, + QObject::connect(&m_aliveTimer, &QTimer::timeout, [&] { sendAliveMessage(); }); @@ -80,12 +80,12 @@ public: void start() { QLocalServer::removeServer(ConnectionName::connectionName); - localServer.listen(ConnectionName::connectionName); + m_localServer.listen(ConnectionName::connectionName); } void setServer(ServerInterface *ipcServer) { - this->ipcServer = ipcServer; + this->m_ipcServer = ipcServer; } @@ -97,31 +97,31 @@ public: private: void handleNewConnection() { - localSocket = nextPendingConnection(); + m_localSocket = nextPendingConnection(); - ipcClientProxy.reset(new ClientProxy(ipcServer, localSocket)); + m_ipcClientProxy.reset(new ClientProxy(m_ipcServer, m_localSocket)); - ipcServer->setClient(ipcClientProxy.get()); + m_ipcServer->setClient(m_ipcClientProxy.get()); } void sendAliveMessage() { - if (ipcClientProxy) - ipcClientProxy->alive(); + if (m_ipcClientProxy) + m_ipcClientProxy->alive(); } void handleSocketDisconnect() { - ipcClientProxy.reset(); + m_ipcClientProxy.reset(); - localSocket = nullptr; + m_localSocket = nullptr; delayedExitApplicationIfNoSockedIsConnected(); } QLocalSocket *nextPendingConnection() { - QLocalSocket *localSocket = localServer.nextPendingConnection(); + QLocalSocket *localSocket = m_localServer.nextPendingConnection(); QObject::connect(localSocket, &QLocalSocket::disconnected, @@ -132,22 +132,22 @@ private: void delayedExitApplicationIfNoSockedIsConnected() { - if (localSocket == nullptr) + if (m_localSocket == nullptr) QTimer::singleShot(60000, [&] { exitApplicationIfNoSockedIsConnected(); }); } void exitApplicationIfNoSockedIsConnected() { - if (localSocket == nullptr) + if (m_localSocket == nullptr) QCoreApplication::exit(); } private: - std::unique_ptr ipcClientProxy; - QLocalSocket* localSocket; - ServerInterface *ipcServer; - QLocalServer localServer; - QTimer aliveTimer; + std::unique_ptr m_ipcClientProxy; + QLocalSocket* m_localSocket; + ServerInterface *m_ipcServer; + QLocalServer m_localServer; + QTimer m_aliveTimer; }; } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/diagnosticcontainer.cpp b/src/libs/clangbackendipc/diagnosticcontainer.cpp index 4fc45db0996..b73114d6d0b 100644 --- a/src/libs/clangbackendipc/diagnosticcontainer.cpp +++ b/src/libs/clangbackendipc/diagnosticcontainer.cpp @@ -25,6 +25,8 @@ #include "diagnosticcontainer.h" +#include + #include #include @@ -60,26 +62,19 @@ QDebug operator<<(QDebug debug, const DiagnosticContainer &container) return debug; } -void PrintTo(const DiagnosticContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const DiagnosticContainer &container) { - *os << severityToText(container.severity()) << ": " - << container.text().constData() << ", " - << container.category().constData() << ", " - << container.enableOption().constData() << ", "; - PrintTo(container.location(), os); - *os << "["; - for (const auto &range : container.ranges()) - PrintTo(range, os); - *os << "], "; - *os << "["; - for (const auto &fixIt : container.fixIts()) - PrintTo(fixIt, os); - *os << "], "; - *os << "["; - for (const auto &child : container.children()) - PrintTo(child, os); - *os << "], "; - *os << ")"; + os << "(" + << severityToText(container.severity()) << ": " + << container.text() << ", " + << container.category() << ", " + << container.enableOption() << ", " + << container.location() << ", " + << container.ranges() << ", " + << container.fixIts() << ", " + << container.children() << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/diagnosticcontainer.h b/src/libs/clangbackendipc/diagnosticcontainer.h index 7645f418763..56f45abee3a 100644 --- a/src/libs/clangbackendipc/diagnosticcontainer.h +++ b/src/libs/clangbackendipc/diagnosticcontainer.h @@ -47,74 +47,74 @@ public: const QVector &ranges, const QVector &fixIts, const QVector &children) - : location_(location), - ranges_(ranges), - text_(text), - category_(category), - enableOption_(options.first), - disableOption_(options.second), - children_(children), - fixIts_(fixIts), - severity_(severity) + : m_location(location), + m_ranges(ranges), + m_text(text), + m_category(category), + m_enableOption(options.first), + m_disableOption(options.second), + m_children(children), + m_fixIts(fixIts), + m_severity(severity) { } const Utf8String &text() const { - return text_; + return m_text; } const Utf8String &category() const { - return category_; + return m_category; } const Utf8String &enableOption() const { - return enableOption_; + return m_enableOption; } const Utf8String &disableOption() const { - return disableOption_; + return m_disableOption; } const SourceLocationContainer &location() const { - return location_; + return m_location; } const QVector &ranges() const { - return ranges_; + return m_ranges; } DiagnosticSeverity severity() const { - return severity_; + return m_severity; } const QVector &fixIts() const { - return fixIts_; + return m_fixIts; } const QVector &children() const { - return children_; + return m_children; } friend QDataStream &operator<<(QDataStream &out, const DiagnosticContainer &container) { - out << container.text_; - out << container.category_; - out << container.enableOption_; - out << container.disableOption_; - out << container.location_; - out << static_cast(container.severity_); - out << container.ranges_; - out << container.fixIts_; - out << container.children_; + out << container.m_text; + out << container.m_category; + out << container.m_enableOption; + out << container.m_disableOption; + out << container.m_location; + out << static_cast(container.m_severity); + out << container.m_ranges; + out << container.m_fixIts; + out << container.m_children; return out; } @@ -123,25 +123,25 @@ public: { quint32 severity; - in >> container.text_; - in >> container.category_; - in >> container.enableOption_; - in >> container.disableOption_; - in >> container.location_; + in >> container.m_text; + in >> container.m_category; + in >> container.m_enableOption; + in >> container.m_disableOption; + in >> container.m_location; in >> severity; - in >> container.ranges_; - in >> container.fixIts_; - in >> container.children_; + in >> container.m_ranges; + in >> container.m_fixIts; + in >> container.m_children; - container.severity_ = static_cast(severity); + container.m_severity = static_cast(severity); return in; } friend bool operator==(const DiagnosticContainer &first, const DiagnosticContainer &second) { - return first.text_ == second.text_ - && first.location_ == second.location_; + return first.m_text == second.m_text + && first.m_location == second.m_location; } friend bool operator!=(const DiagnosticContainer &first, const DiagnosticContainer &second) @@ -150,18 +150,18 @@ public: } private: - SourceLocationContainer location_; - QVector ranges_; - Utf8String text_; - Utf8String category_; - Utf8String enableOption_; - Utf8String disableOption_; - QVector children_; - QVector fixIts_; - DiagnosticSeverity severity_ = DiagnosticSeverity::Ignored; + SourceLocationContainer m_location; + QVector m_ranges; + Utf8String m_text; + Utf8String m_category; + Utf8String m_enableOption; + Utf8String m_disableOption; + QVector m_children; + QVector m_fixIts; + DiagnosticSeverity m_severity = DiagnosticSeverity::Ignored; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DiagnosticContainer &container); -void PrintTo(const DiagnosticContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const DiagnosticContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/documentannotationschangedmessage.cpp b/src/libs/clangbackendipc/documentannotationschangedmessage.cpp index 6c7ef0d5cb6..a9fef59e4ac 100644 --- a/src/libs/clangbackendipc/documentannotationschangedmessage.cpp +++ b/src/libs/clangbackendipc/documentannotationschangedmessage.cpp @@ -45,15 +45,17 @@ QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message return debug; } -void PrintTo(const DocumentAnnotationsChangedMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const DocumentAnnotationsChangedMessage &message) { - *os << "DocumentAnnotationsChangedMessage("; - PrintTo(message.fileContainer(), os); - *os << "," << message.diagnostics().size(); - *os << "," << !message.firstHeaderErrorDiagnostic().text().isEmpty(); - *os << "," << message.highlightingMarks().size(); - *os << "," << message.skippedPreprocessorRanges().size(); - *os << ")"; + os << "DocumentAnnotationsChangedMessage(" + << message.fileContainer() + << "," << message.diagnostics().size() + << "," << !message.firstHeaderErrorDiagnostic().text().isEmpty() + << "," << message.highlightingMarks().size() + << "," << message.skippedPreprocessorRanges().size() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/documentannotationschangedmessage.h b/src/libs/clangbackendipc/documentannotationschangedmessage.h index b121fc6ecd8..75b9350cd3a 100644 --- a/src/libs/clangbackendipc/documentannotationschangedmessage.h +++ b/src/libs/clangbackendipc/documentannotationschangedmessage.h @@ -41,60 +41,60 @@ public: DocumentAnnotationsChangedMessage() = default; DocumentAnnotationsChangedMessage(const FileContainer &fileContainer, const QVector &diagnostics, - const DiagnosticContainer &firstHeaderErrorDiagnostic_, + const DiagnosticContainer &firstHeaderErrorDiagnostic, const QVector &highlightingMarks, const QVector &skippedPreprocessorRanges) - : fileContainer_(fileContainer), - diagnostics_(diagnostics), - firstHeaderErrorDiagnostic_(firstHeaderErrorDiagnostic_), - highlightingMarks_(highlightingMarks), - skippedPreprocessorRanges_(skippedPreprocessorRanges) + : m_fileContainer(fileContainer), + m_diagnostics(diagnostics), + m_firstHeaderErrorDiagnostic(firstHeaderErrorDiagnostic), + m_highlightingMarks(highlightingMarks), + m_skippedPreprocessorRanges(skippedPreprocessorRanges) { } const FileContainer &fileContainer() const { - return fileContainer_; + return m_fileContainer; } const QVector &diagnostics() const { - return diagnostics_; + return m_diagnostics; } const DiagnosticContainer &firstHeaderErrorDiagnostic() const { - return firstHeaderErrorDiagnostic_; + return m_firstHeaderErrorDiagnostic; } const QVector &highlightingMarks() const { - return highlightingMarks_; + return m_highlightingMarks; } const QVector &skippedPreprocessorRanges() const { - return skippedPreprocessorRanges_; + return m_skippedPreprocessorRanges; } friend QDataStream &operator<<(QDataStream &out, const DocumentAnnotationsChangedMessage &message) { - out << message.fileContainer_; - out << message.diagnostics_; - out << message.firstHeaderErrorDiagnostic_; - out << message.highlightingMarks_; - out << message.skippedPreprocessorRanges_; + out << message.m_fileContainer; + out << message.m_diagnostics; + out << message.m_firstHeaderErrorDiagnostic; + out << message.m_highlightingMarks; + out << message.m_skippedPreprocessorRanges; return out; } friend QDataStream &operator>>(QDataStream &in, DocumentAnnotationsChangedMessage &message) { - in >> message.fileContainer_; - in >> message.diagnostics_; - in >> message.firstHeaderErrorDiagnostic_; - in >> message.highlightingMarks_; - in >> message.skippedPreprocessorRanges_; + in >> message.m_fileContainer; + in >> message.m_diagnostics; + in >> message.m_firstHeaderErrorDiagnostic; + in >> message.m_highlightingMarks; + in >> message.m_skippedPreprocessorRanges; return in; } @@ -102,23 +102,23 @@ public: friend bool operator==(const DocumentAnnotationsChangedMessage &first, const DocumentAnnotationsChangedMessage &second) { - return first.fileContainer_ == second.fileContainer_ - && first.diagnostics_ == second.diagnostics_ - && first.firstHeaderErrorDiagnostic_ == second.firstHeaderErrorDiagnostic_ - && first.highlightingMarks_ == second.highlightingMarks_ - && first.skippedPreprocessorRanges_ == second.skippedPreprocessorRanges_; + return first.m_fileContainer == second.m_fileContainer + && first.m_diagnostics == second.m_diagnostics + && first.m_firstHeaderErrorDiagnostic == second.m_firstHeaderErrorDiagnostic + && first.m_highlightingMarks == second.m_highlightingMarks + && first.m_skippedPreprocessorRanges == second.m_skippedPreprocessorRanges; } private: - FileContainer fileContainer_; - QVector diagnostics_; - DiagnosticContainer firstHeaderErrorDiagnostic_; - QVector highlightingMarks_; - QVector skippedPreprocessorRanges_; + FileContainer m_fileContainer; + QVector m_diagnostics; + DiagnosticContainer m_firstHeaderErrorDiagnostic; + QVector m_highlightingMarks; + QVector m_skippedPreprocessorRanges; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message); -void PrintTo(const DocumentAnnotationsChangedMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const DocumentAnnotationsChangedMessage &message); DECLARE_MESSAGE(DocumentAnnotationsChangedMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.cpp b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.cpp index a17a848feea..a7e367609a4 100644 --- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.cpp +++ b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.cpp @@ -37,23 +37,14 @@ QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &cont return debug; } -void PrintTo(const DynamicASTMatcherDiagnosticContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContainer &container) { - *os << "{["; + os << "(" + << container.messages() << ", " + << container.contexts() + << ")"; - for (const auto &message : container.messages()) { - PrintTo(message, os); - *os << ", "; - } - - *os << "], ["; - - for (const auto &context : container.contexts()) { - PrintTo(context, os); - *os << ", "; - } - - *os << "]}"; + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.h b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.h index 0e9e9b5ea8c..63e59d9ee99 100644 --- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.h +++ b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.h @@ -36,45 +36,45 @@ public: DynamicASTMatcherDiagnosticContainer() = default; DynamicASTMatcherDiagnosticContainer(std::vector &&messages, std::vector &&contexts) - : messages_(std::move(messages)), - contexts_(std::move(contexts)) + : m_messages(std::move(messages)), + m_contexts(std::move(contexts)) { } const std::vector &messages() const { - return messages_; + return m_messages; } const std::vector &contexts() const { - return contexts_; + return m_contexts; } void insertMessage(V2::SourceRangeContainer &&sourceRange, ClangQueryDiagnosticErrorType errorType, Utils::SmallStringVector &&arguments) { - messages_.emplace_back(std::move(sourceRange), errorType, std::move(arguments)); + m_messages.emplace_back(std::move(sourceRange), errorType, std::move(arguments)); } void insertContext(V2::SourceRangeContainer &&sourceRange, ClangQueryDiagnosticContextType contextType, Utils::SmallStringVector &&arguments) { - contexts_.emplace_back(std::move(sourceRange), contextType, std::move(arguments)); + m_contexts.emplace_back(std::move(sourceRange), contextType, std::move(arguments)); } friend QDataStream &operator<<(QDataStream &out, const DynamicASTMatcherDiagnosticContainer &container) { - out << container.messages_; - out << container.contexts_; + out << container.m_messages; + out << container.m_contexts; return out; } friend QDataStream &operator>>(QDataStream &in, DynamicASTMatcherDiagnosticContainer &container) { - in >> container.messages_; - in >> container.contexts_; + in >> container.m_messages; + in >> container.m_contexts; return in; } @@ -82,22 +82,22 @@ public: friend bool operator==(const DynamicASTMatcherDiagnosticContainer &first, const DynamicASTMatcherDiagnosticContainer &second) { - return first.messages_ == second.messages_ - && first.contexts_ == second.contexts_; + return first.m_messages == second.m_messages + && first.m_contexts == second.m_contexts; } DynamicASTMatcherDiagnosticContainer clone() const { - return DynamicASTMatcherDiagnosticContainer(Utils::clone(messages_), - Utils::clone(contexts_)); + return DynamicASTMatcherDiagnosticContainer(Utils::clone(m_messages), + Utils::clone(m_contexts)); } private: - std::vector messages_; - std::vector contexts_; + std::vector m_messages; + std::vector m_contexts; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &container); -void PrintTo(const DynamicASTMatcherDiagnosticContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.cpp b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.cpp index 7740fa051a0..37ce0667063 100644 --- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.cpp +++ b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.cpp @@ -40,21 +40,15 @@ QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContaine return debug; } -void PrintTo(const DynamicASTMatcherDiagnosticContextContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContextContainer &container) { - *os << "{" - << container.contextTypeText() << ": "; + os << "(" + << container.contextTypeText() << ", " + << container.sourceRange() << ", " + << container.arguments() + << ")"; - PrintTo(container.sourceRange(), os); - - *os << ", ["; - - for (const auto &argument : container.arguments()) { - PrintTo(argument, os); - *os << ", "; - } - - *os << "]}"; + return os; } #define RETURN_CASE(name) \ @@ -62,7 +56,7 @@ void PrintTo(const DynamicASTMatcherDiagnosticContextContainer &container, ::std Utils::SmallString DynamicASTMatcherDiagnosticContextContainer::contextTypeText() const { - switch (contextType_) { + switch (m_contextType) { RETURN_CASE(MatcherArg) RETURN_CASE(MatcherConstruct) } diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.h b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.h index 3dbe959e671..2ba2812efa0 100644 --- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.h +++ b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.h @@ -39,34 +39,34 @@ public: DynamicASTMatcherDiagnosticContextContainer(V2::SourceRangeContainer &&sourceRange, ClangQueryDiagnosticContextType contextType, Utils::SmallStringVector &&arguments) - : sourceRange_(sourceRange), - contextType_(contextType), - arguments_(std::move(arguments)) + : m_sourceRange(sourceRange), + m_contextType(contextType), + m_arguments(std::move(arguments)) { } const V2::SourceRangeContainer &sourceRange() const { - return sourceRange_; + return m_sourceRange; } ClangQueryDiagnosticContextType contextType() const { - return contextType_; + return m_contextType; } Utils::SmallString contextTypeText() const; const Utils::SmallStringVector &arguments() const { - return arguments_; + return m_arguments; } friend QDataStream &operator<<(QDataStream &out, const DynamicASTMatcherDiagnosticContextContainer &container) { - out << container.sourceRange_; - out << quint32(container.contextType_); - out << container.arguments_; + out << container.m_sourceRange; + out << quint32(container.m_contextType); + out << container.m_arguments; return out; } @@ -75,11 +75,11 @@ public: { quint32 contextType; - in >> container.sourceRange_; + in >> container.m_sourceRange; in >> contextType; - in >> container.arguments_; + in >> container.m_arguments; - container.contextType_ = static_cast(contextType); + container.m_contextType = static_cast(contextType); return in; } @@ -87,25 +87,25 @@ public: friend bool operator==(const DynamicASTMatcherDiagnosticContextContainer &first, const DynamicASTMatcherDiagnosticContextContainer &second) { - return first.contextType_ == second.contextType_ - && first.sourceRange_ == second.sourceRange_ - && first.arguments_ == second.arguments_; + return first.m_contextType == second.m_contextType + && first.m_sourceRange == second.m_sourceRange + && first.m_arguments == second.m_arguments; } DynamicASTMatcherDiagnosticContextContainer clone() const { - return DynamicASTMatcherDiagnosticContextContainer(sourceRange_.clone(), - contextType_, - arguments_.clone()); + return DynamicASTMatcherDiagnosticContextContainer(m_sourceRange.clone(), + m_contextType, + m_arguments.clone()); } private: - V2::SourceRangeContainer sourceRange_; - ClangQueryDiagnosticContextType contextType_ = ClangQueryDiagnosticContextType::MatcherArg; - Utils::SmallStringVector arguments_; + V2::SourceRangeContainer m_sourceRange; + ClangQueryDiagnosticContextType m_contextType = ClangQueryDiagnosticContextType::MatcherArg; + Utils::SmallStringVector m_arguments; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContainer &container); -void PrintTo(const DynamicASTMatcherDiagnosticContextContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContextContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.cpp b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.cpp index 2ff2d411003..af4de3e058d 100644 --- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.cpp +++ b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.cpp @@ -41,26 +41,20 @@ QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticMessageContaine return debug; } -void PrintTo(const DynamicASTMatcherDiagnosticMessageContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticMessageContainer &container) { - *os << "{" - << container.errorTypeText() << ": "; + os << "(" + << container.errorTypeText() << ", " + << container.sourceRange() << ", " + << container.arguments() + << ")"; - PrintTo(container.sourceRange(), os); - - *os << ", ["; - - for (const auto &argument : container.arguments()) { - PrintTo(argument, os); - *os << ", "; - } - - *os << "]}"; + return os; } Utils::SmallString DynamicASTMatcherDiagnosticMessageContainer::errorTypeText() const { - switch (errorType_) { + switch (m_errorType) { RETURN_CASE(None) RETURN_CASE(RegistryMatcherNotFound) RETURN_CASE(RegistryWrongArgCount) diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.h b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.h index bd7d2d3ee4f..868346a5e0f 100644 --- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.h +++ b/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.h @@ -39,34 +39,34 @@ public: DynamicASTMatcherDiagnosticMessageContainer(V2::SourceRangeContainer &&sourceRange, ClangQueryDiagnosticErrorType errorType, Utils::SmallStringVector &&arguments) - : sourceRange_(sourceRange), - errorType_(errorType), - arguments_(std::move(arguments)) + : m_sourceRange(sourceRange), + m_errorType(errorType), + m_arguments(std::move(arguments)) { } const V2::SourceRangeContainer &sourceRange() const { - return sourceRange_; + return m_sourceRange; } ClangQueryDiagnosticErrorType errorType() const { - return errorType_; + return m_errorType; } Utils::SmallString errorTypeText() const; const Utils::SmallStringVector &arguments() const { - return arguments_; + return m_arguments; } friend QDataStream &operator<<(QDataStream &out, const DynamicASTMatcherDiagnosticMessageContainer &container) { - out << container.sourceRange_; - out << quint32(container.errorType_); - out << container.arguments_; + out << container.m_sourceRange; + out << quint32(container.m_errorType); + out << container.m_arguments; return out; } @@ -75,11 +75,11 @@ public: { quint32 errorType; - in >> container.sourceRange_; + in >> container.m_sourceRange; in >> errorType; - in >> container.arguments_; + in >> container.m_arguments; - container.errorType_ = static_cast(errorType); + container.m_errorType = static_cast(errorType); return in; } @@ -87,25 +87,25 @@ public: friend bool operator==(const DynamicASTMatcherDiagnosticMessageContainer &first, const DynamicASTMatcherDiagnosticMessageContainer &second) { - return first.errorType_ == second.errorType_ - && first.sourceRange_ == second.sourceRange_ - && first.arguments_ == second.arguments_; + return first.m_errorType == second.m_errorType + && first.m_sourceRange == second.m_sourceRange + && first.m_arguments == second.m_arguments; } DynamicASTMatcherDiagnosticMessageContainer clone() const { - return DynamicASTMatcherDiagnosticMessageContainer(sourceRange_.clone(), - errorType_, - arguments_.clone()); + return DynamicASTMatcherDiagnosticMessageContainer(m_sourceRange.clone(), + m_errorType, + m_arguments.clone()); } private: - V2::SourceRangeContainer sourceRange_; - ClangQueryDiagnosticErrorType errorType_ = ClangQueryDiagnosticErrorType::None; - Utils::SmallStringVector arguments_; + V2::SourceRangeContainer m_sourceRange; + ClangQueryDiagnosticErrorType m_errorType = ClangQueryDiagnosticErrorType::None; + Utils::SmallStringVector m_arguments; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticMessageContainer &container); -void PrintTo(const DynamicASTMatcherDiagnosticMessageContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticMessageContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/filecontainer.cpp b/src/libs/clangbackendipc/filecontainer.cpp index 0e493c43c7f..9de0b550a36 100644 --- a/src/libs/clangbackendipc/filecontainer.cpp +++ b/src/libs/clangbackendipc/filecontainer.cpp @@ -54,19 +54,21 @@ QDebug operator<<(QDebug debug, const FileContainer &container) return debug; } -void PrintTo(const FileContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const FileContainer &container) { - *os << "FileContainer(" - << container.filePath().constData() << ", " - << container.projectPartId().constData() << ", " - << container.fileArguments().constData() << ", " + os << "(" + << container.filePath() << ", " + << container.projectPartId() << ", " + << container.fileArguments() << ", " << container.documentRevision(); if (container.hasUnsavedFileContent()) - *os << ", " - << container.unsavedFileContent().constData(); + os << ", " + << container.unsavedFileContent(); - *os << ")"; + os << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/filecontainer.h b/src/libs/clangbackendipc/filecontainer.h index 1c9247adc2f..56779396949 100644 --- a/src/libs/clangbackendipc/filecontainer.h +++ b/src/libs/clangbackendipc/filecontainer.h @@ -43,11 +43,11 @@ public: const Utf8String &unsavedFileContent = Utf8String(), bool hasUnsavedFileContent = false, quint32 documentRevision = 0) - : filePath_(filePath), - projectPartId_(projectPartId), - unsavedFileContent_(unsavedFileContent), - documentRevision_(documentRevision), - hasUnsavedFileContent_(hasUnsavedFileContent) + : m_filePath(filePath), + m_projectPartId(projectPartId), + m_unsavedFileContent(unsavedFileContent), + m_documentRevision(documentRevision), + m_hasUnsavedFileContent(hasUnsavedFileContent) { } @@ -57,12 +57,12 @@ public: const Utf8String &unsavedFileContent = Utf8String(), bool hasUnsavedFileContent = false, quint32 documentRevision = 0) - : filePath_(filePath), - projectPartId_(projectPartId), - fileArguments_(fileArguments), - unsavedFileContent_(unsavedFileContent), - documentRevision_(documentRevision), - hasUnsavedFileContent_(hasUnsavedFileContent) + : m_filePath(filePath), + m_projectPartId(projectPartId), + m_fileArguments(fileArguments), + m_unsavedFileContent(unsavedFileContent), + m_documentRevision(documentRevision), + m_hasUnsavedFileContent(hasUnsavedFileContent) { } @@ -70,83 +70,83 @@ public: const Utf8String &projectPartId, const Utf8StringVector &fileArguments, quint32 documentRevision) - : filePath_(filePath), - projectPartId_(projectPartId), - fileArguments_(fileArguments), - documentRevision_(documentRevision), - hasUnsavedFileContent_(false) + : m_filePath(filePath), + m_projectPartId(projectPartId), + m_fileArguments(fileArguments), + m_documentRevision(documentRevision), + m_hasUnsavedFileContent(false) { } const Utf8String &filePath() const { - return filePath_; + return m_filePath; } const Utf8String &projectPartId() const { - return projectPartId_; + return m_projectPartId; } const Utf8StringVector &fileArguments() const { - return fileArguments_; + return m_fileArguments; } const Utf8String &unsavedFileContent() const { - return unsavedFileContent_; + return m_unsavedFileContent; } bool hasUnsavedFileContent() const { - return hasUnsavedFileContent_; + return m_hasUnsavedFileContent; } quint32 documentRevision() const { - return documentRevision_; + return m_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_; + out << container.m_filePath; + out << container.m_projectPartId; + out << container.m_fileArguments; + out << container.m_unsavedFileContent; + out << container.m_documentRevision; + out << container.m_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_; + in >> container.m_filePath; + in >> container.m_projectPartId; + in >> container.m_fileArguments; + in >> container.m_unsavedFileContent; + in >> container.m_documentRevision; + in >> container.m_hasUnsavedFileContent; return in; } friend bool operator==(const FileContainer &first, const FileContainer &second) { - return first.filePath_ == second.filePath_ && first.projectPartId_ == second.projectPartId_; + return first.m_filePath == second.m_filePath && first.m_projectPartId == second.m_projectPartId; } private: - Utf8String filePath_; - Utf8String projectPartId_; - Utf8StringVector fileArguments_; - Utf8String unsavedFileContent_; - quint32 documentRevision_ = 0; - bool hasUnsavedFileContent_ = false; + Utf8String m_filePath; + Utf8String m_projectPartId; + Utf8StringVector m_fileArguments; + Utf8String m_unsavedFileContent; + quint32 m_documentRevision = 0; + bool m_hasUnsavedFileContent = false; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container); -void PrintTo(const FileContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const FileContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/filecontainerv2.cpp b/src/libs/clangbackendipc/filecontainerv2.cpp index 5aa6431e9fc..57b460d8429 100644 --- a/src/libs/clangbackendipc/filecontainerv2.cpp +++ b/src/libs/clangbackendipc/filecontainerv2.cpp @@ -40,18 +40,20 @@ QDebug operator<<(QDebug debug, const FileContainer &container) return debug; } -void PrintTo(const FileContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const FileContainer &container) { - *os << "(" + os << "(" << container.filePath() << ", " << container.commandLineArguments() << ", " << container.documentRevision(); if (container.unsavedFileContent().hasContent()) - *os << ", \"" + os << ", \"" << container.unsavedFileContent(); - *os << "\")"; + os << "\")"; + + return os; } } // namespace V2 diff --git a/src/libs/clangbackendipc/filecontainerv2.h b/src/libs/clangbackendipc/filecontainerv2.h index 6c9135cdf91..365bb5283dd 100644 --- a/src/libs/clangbackendipc/filecontainerv2.h +++ b/src/libs/clangbackendipc/filecontainerv2.h @@ -42,95 +42,95 @@ public: Utils::SmallString &&unsavedFileContent, Utils::SmallStringVector &&commandLineArguments, quint32 documentRevision = 0) - : filePath_(std::move(filePath)), - unsavedFileContent_(std::move(unsavedFileContent)), - commandLineArguments_(std::move(commandLineArguments)), - documentRevision_(documentRevision) + : m_filePath(std::move(filePath)), + m_unsavedFileContent(std::move(unsavedFileContent)), + m_commandLineArguments(std::move(commandLineArguments)), + m_documentRevision(documentRevision) { } const FilePath &filePath() const { - return filePath_; + return m_filePath; } const Utils::SmallStringVector &commandLineArguments() const { - return commandLineArguments_; + return m_commandLineArguments; } Utils::SmallStringVector takeCommandLineArguments() { - return std::move(commandLineArguments_); + return std::move(m_commandLineArguments); } const Utils::SmallString &unsavedFileContent() const { - return unsavedFileContent_; + return m_unsavedFileContent; } Utils::SmallString takeUnsavedFileContent() { - return std::move(unsavedFileContent_); + return std::move(m_unsavedFileContent); } quint32 documentRevision() const { - return documentRevision_; + return m_documentRevision; } friend QDataStream &operator<<(QDataStream &out, const FileContainer &container) { - out << container.filePath_; - out << container.commandLineArguments_; - out << container.unsavedFileContent_; - out << container.documentRevision_; + out << container.m_filePath; + out << container.m_commandLineArguments; + out << container.m_unsavedFileContent; + out << container.m_documentRevision; return out; } friend QDataStream &operator>>(QDataStream &in, FileContainer &container) { - in >> container.filePath_; - in >> container.commandLineArguments_; - in >> container.unsavedFileContent_; - in >> container.documentRevision_; + in >> container.m_filePath; + in >> container.m_commandLineArguments; + in >> container.m_unsavedFileContent; + in >> container.m_documentRevision; return in; } friend bool operator==(const FileContainer &first, const FileContainer &second) { - return first.filePath_ == second.filePath_ - && first.commandLineArguments_ == second.commandLineArguments_; + return first.m_filePath == second.m_filePath + && first.m_commandLineArguments == second.m_commandLineArguments; } friend bool operator<(const FileContainer &first, const FileContainer &second) { - return std::tie(first.documentRevision_, first.filePath_, first.unsavedFileContent_, first.commandLineArguments_) - < std::tie(second.documentRevision_, second.filePath_, second.unsavedFileContent_, second.commandLineArguments_); + return std::tie(first.m_documentRevision, first.m_filePath, first.m_unsavedFileContent, first.m_commandLineArguments) + < std::tie(second.m_documentRevision, second.m_filePath, second.m_unsavedFileContent, second.m_commandLineArguments); } FileContainer clone() const { - return FileContainer(filePath_.clone(), - unsavedFileContent_.clone(), - commandLineArguments_.clone(), - documentRevision_); + return FileContainer(m_filePath.clone(), + m_unsavedFileContent.clone(), + m_commandLineArguments.clone(), + m_documentRevision); } private: - FilePath filePath_; - Utils::SmallString unsavedFileContent_; - Utils::SmallStringVector commandLineArguments_; - quint32 documentRevision_ = 0; + FilePath m_filePath; + Utils::SmallString m_unsavedFileContent; + Utils::SmallStringVector m_commandLineArguments; + quint32 m_documentRevision = 0; }; using FileContainers = std::vector; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container); -void PrintTo(const FileContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const FileContainer &container); } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/filepath.cpp b/src/libs/clangbackendipc/filepath.cpp index 77bb599ca65..0dbb1b4e266 100644 --- a/src/libs/clangbackendipc/filepath.cpp +++ b/src/libs/clangbackendipc/filepath.cpp @@ -34,9 +34,4 @@ QDebug operator<<(QDebug debug, const FilePath &filePath) return debug; } -void PrintTo(const FilePath &filePath, ::std::ostream* os) -{ - *os << filePath.directory() << "/" << filePath.name(); -} - } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/filepath.h b/src/libs/clangbackendipc/filepath.h index 24c07adb271..d435441a133 100644 --- a/src/libs/clangbackendipc/filepath.h +++ b/src/libs/clangbackendipc/filepath.h @@ -131,6 +131,5 @@ private: }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FilePath &filePath); -void PrintTo(const FilePath &filePath, ::std::ostream* os); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/fixitcontainer.cpp b/src/libs/clangbackendipc/fixitcontainer.cpp index 2534162c7bd..05cea43ffc7 100644 --- a/src/libs/clangbackendipc/fixitcontainer.cpp +++ b/src/libs/clangbackendipc/fixitcontainer.cpp @@ -41,11 +41,14 @@ QDebug operator<<(QDebug debug, const FixItContainer &container) return debug; } -void PrintTo(const FixItContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const FixItContainer &container) { - *os << "FixIt(" << container.text().constData() << ", "; - *os<< ")"; - PrintTo(container.range(), os); + os << "(" + << container.text() << ", " + << container.range() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/fixitcontainer.h b/src/libs/clangbackendipc/fixitcontainer.h index f3eefb5a66e..eac27da02f0 100644 --- a/src/libs/clangbackendipc/fixitcontainer.h +++ b/src/libs/clangbackendipc/fixitcontainer.h @@ -37,48 +37,48 @@ public: FixItContainer() = default; FixItContainer(const Utf8String &text, const SourceRangeContainer &range) - : range_(range), - text_(text) + : m_range(range), + m_text(text) { } const Utf8String &text() const { - return text_; + return m_text; } const SourceRangeContainer &range() const { - return range_; + return m_range; } friend QDataStream &operator<<(QDataStream &out, const FixItContainer &container) { - out << container.text_; - out << container.range_; + out << container.m_text; + out << container.m_range; return out; } friend QDataStream &operator>>(QDataStream &in, FixItContainer &container) { - in >> container.text_; - in >> container.range_; + in >> container.m_text; + in >> container.m_range; return in; } friend bool operator==(const FixItContainer &first, const FixItContainer &second) { - return first.text_ == second.text_ && first.range_ == second.range_; + return first.m_text == second.m_text && first.m_range == second.m_range; } private: - SourceRangeContainer range_; - Utf8String text_; + SourceRangeContainer m_range; + Utf8String m_text; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FixItContainer &container); -void PrintTo(const FixItContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const FixItContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/highlightingmarkcontainer.cpp b/src/libs/clangbackendipc/highlightingmarkcontainer.cpp index 466efec2e62..ab679c8d890 100644 --- a/src/libs/clangbackendipc/highlightingmarkcontainer.cpp +++ b/src/libs/clangbackendipc/highlightingmarkcontainer.cpp @@ -70,31 +70,34 @@ QDebug operator<<(QDebug debug, const HighlightingMarkContainer &container) return debug; } -void PrintTo(HighlightingType highlightingType, std::ostream *os) +std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType) { - *os << highlightingTypeToCStringLiteral(highlightingType); + return os << highlightingTypeToCStringLiteral(highlightingType); } -void PrintTo(const HighlightingTypes &types, std::ostream *os) +std::ostream &operator<<(std::ostream &os, HighlightingTypes types) { - PrintTo(types.mainHighlightingType, os); + os << "(" + << types.mainHighlightingType; - *os << "["; + if (!types.mixinHighlightingTypes.empty()) + os << ", "<< types.mixinHighlightingTypes; - for (HighlightingType type : types.mixinHighlightingTypes) - PrintTo(type, os); + os << ")"; - *os << "]"; + return os; } -void PrintTo(const HighlightingMarkContainer& container, ::std::ostream *os) +std::ostream &operator<<(std::ostream &os, const HighlightingMarkContainer &container) { - *os << "HighlightingMarkContainer(" - << container.line() << ", " - << container.column() << ", " - << container.length() << ", "; - PrintTo(container.types(), os); - *os << ")"; + os << "(" + << container.line() << ", " + << container.column() << ", " + << container.length() << ", " + << container.types() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/highlightingmarkcontainer.h b/src/libs/clangbackendipc/highlightingmarkcontainer.h index d70f36dce4a..56e998f26c0 100644 --- a/src/libs/clangbackendipc/highlightingmarkcontainer.h +++ b/src/libs/clangbackendipc/highlightingmarkcontainer.h @@ -175,8 +175,8 @@ inline bool operator==(const HighlightingTypes &first, const HighlightingTypes & } CMBIPC_EXPORT QDebug operator<<(QDebug debug, const HighlightingMarkContainer &container); -CMBIPC_EXPORT void PrintTo(HighlightingType highlightingType, ::std::ostream *os); -CMBIPC_EXPORT void PrintTo(const HighlightingTypes &types, ::std::ostream *os); -void PrintTo(const HighlightingMarkContainer &container, ::std::ostream *os); +CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType); +CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingTypes types); +std::ostream &operator<<(std::ostream &os, const HighlightingMarkContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/precompiledheadersupdatedmessage.h b/src/libs/clangbackendipc/precompiledheadersupdatedmessage.h index 7780957e797..e4fdcda0112 100644 --- a/src/libs/clangbackendipc/precompiledheadersupdatedmessage.h +++ b/src/libs/clangbackendipc/precompiledheadersupdatedmessage.h @@ -34,24 +34,24 @@ class PrecompiledHeadersUpdatedMessage public: PrecompiledHeadersUpdatedMessage() = default; PrecompiledHeadersUpdatedMessage(std::vector &&projectPartPchs) - : projectPartPchs_(std::move(projectPartPchs)) + : m_projectPartPchs(std::move(projectPartPchs)) {} const std::vector &projectPartPchs() const { - return projectPartPchs_; + return m_projectPartPchs; } friend QDataStream &operator<<(QDataStream &out, const PrecompiledHeadersUpdatedMessage &message) { - out << message.projectPartPchs_; + out << message.m_projectPartPchs; return out; } friend QDataStream &operator>>(QDataStream &in, PrecompiledHeadersUpdatedMessage &message) { - in >> message.projectPartPchs_; + in >> message.m_projectPartPchs; return in; } @@ -59,16 +59,16 @@ public: friend bool operator==(const PrecompiledHeadersUpdatedMessage &first, const PrecompiledHeadersUpdatedMessage &second) { - return first.projectPartPchs_ == second.projectPartPchs_; + return first.m_projectPartPchs == second.m_projectPartPchs; } PrecompiledHeadersUpdatedMessage clone() const { - return PrecompiledHeadersUpdatedMessage(Utils::clone(projectPartPchs_)); + return PrecompiledHeadersUpdatedMessage(Utils::clone(m_projectPartPchs)); } private: - std::vector projectPartPchs_; + std::vector m_projectPartPchs; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &message); diff --git a/src/libs/clangbackendipc/projectpartcontainer.cpp b/src/libs/clangbackendipc/projectpartcontainer.cpp index 5ef34f95db9..f39ba741c3e 100644 --- a/src/libs/clangbackendipc/projectpartcontainer.cpp +++ b/src/libs/clangbackendipc/projectpartcontainer.cpp @@ -60,13 +60,15 @@ QDebug operator<<(QDebug debug, const ProjectPartContainer &container) return debug; } -void PrintTo(const ProjectPartContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const ProjectPartContainer &container) { - *os << "ProjectPartContainer(" - << container.projectPartId().constData() + os << "(" + << container.projectPartId() << "," - << container.arguments().constData() + << container.arguments() << ")"; + + return os; } diff --git a/src/libs/clangbackendipc/projectpartcontainer.h b/src/libs/clangbackendipc/projectpartcontainer.h index 009e3a2fef0..6d5fb147f15 100644 --- a/src/libs/clangbackendipc/projectpartcontainer.h +++ b/src/libs/clangbackendipc/projectpartcontainer.h @@ -39,48 +39,48 @@ public: ProjectPartContainer() = default; ProjectPartContainer(const Utf8String &projectPartId, const Utf8StringVector &arguments = Utf8StringVector()) - : projectPartId_(projectPartId), - arguments_(arguments) + : m_projectPartId(projectPartId), + m_arguments(arguments) { } const Utf8String &projectPartId() const { - return projectPartId_; + return m_projectPartId; } const Utf8StringVector &arguments() const { - return arguments_; + return m_arguments; } friend QDataStream &operator<<(QDataStream &out, const ProjectPartContainer &container) { - out << container.projectPartId_; - out << container.arguments_; + out << container.m_projectPartId; + out << container.m_arguments; return out; } friend QDataStream &operator>>(QDataStream &in, ProjectPartContainer &container) { - in >> container.projectPartId_; - in >> container.arguments_; + in >> container.m_projectPartId; + in >> container.m_arguments; return in; } friend bool operator==(const ProjectPartContainer &first, const ProjectPartContainer &second) { - return first.projectPartId_ == second.projectPartId_; + return first.m_projectPartId == second.m_projectPartId; } private: - Utf8String projectPartId_; - Utf8StringVector arguments_; + Utf8String m_projectPartId; + Utf8StringVector m_arguments; }; QDebug operator<<(QDebug debug, const ProjectPartContainer &container); -void PrintTo(const ProjectPartContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const ProjectPartContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/projectpartcontainerv2.h b/src/libs/clangbackendipc/projectpartcontainerv2.h index 9c6b32f4c9b..a0ad06f3ca4 100644 --- a/src/libs/clangbackendipc/projectpartcontainerv2.h +++ b/src/libs/clangbackendipc/projectpartcontainerv2.h @@ -40,80 +40,80 @@ public: Utils::SmallStringVector &&arguments, Utils::PathStringVector &&headerPaths, Utils::PathStringVector &&sourcePaths) - : projectPartId_(std::move(projectPartId)), - arguments_(std::move(arguments)), - headerPaths_(std::move(headerPaths)), - sourcePaths_(std::move(sourcePaths)) + : m_projectPartId(std::move(projectPartId)), + m_arguments(std::move(arguments)), + m_headerPaths(std::move(headerPaths)), + m_sourcePaths(std::move(sourcePaths)) { } const Utils::SmallString &projectPartId() const { - return projectPartId_; + return m_projectPartId; } const Utils::SmallStringVector &arguments() const { - return arguments_; + return m_arguments; } const Utils::PathStringVector &sourcePaths() const { - return sourcePaths_; + return m_sourcePaths; } const Utils::PathStringVector &headerPaths() const { - return headerPaths_; + return m_headerPaths; } friend QDataStream &operator<<(QDataStream &out, const ProjectPartContainer &container) { - out << container.projectPartId_; - out << container.arguments_; - out << container.headerPaths_; - out << container.sourcePaths_; + out << container.m_projectPartId; + out << container.m_arguments; + out << container.m_headerPaths; + out << container.m_sourcePaths; return out; } friend QDataStream &operator>>(QDataStream &in, ProjectPartContainer &container) { - in >> container.projectPartId_; - in >> container.arguments_; - in >> container.headerPaths_; - in >> container.sourcePaths_; + in >> container.m_projectPartId; + in >> container.m_arguments; + in >> container.m_headerPaths; + in >> container.m_sourcePaths; return in; } friend bool operator==(const ProjectPartContainer &first, const ProjectPartContainer &second) { - return first.projectPartId_ == second.projectPartId_ - && first.arguments_ == second.arguments_ - && first.headerPaths_ == second.headerPaths_ - && first.sourcePaths_ == second.sourcePaths_; + return first.m_projectPartId == second.m_projectPartId + && first.m_arguments == second.m_arguments + && first.m_headerPaths == second.m_headerPaths + && first.m_sourcePaths == second.m_sourcePaths; } friend bool operator<(const ProjectPartContainer &first, const ProjectPartContainer &second) { - return std::tie(first.projectPartId_, first.arguments_, first.headerPaths_, first.sourcePaths_) - < std::tie(second.projectPartId_, second.arguments_, second.headerPaths_, second.sourcePaths_); + return std::tie(first.m_projectPartId, first.m_arguments, first.m_headerPaths, first.m_sourcePaths) + < std::tie(second.m_projectPartId, second.m_arguments, second.m_headerPaths, second.m_sourcePaths); } ProjectPartContainer clone() const { - return ProjectPartContainer(projectPartId_.clone(), - arguments_.clone(), - headerPaths_.clone(), - sourcePaths_.clone()); + return ProjectPartContainer(m_projectPartId.clone(), + m_arguments.clone(), + m_headerPaths.clone(), + m_sourcePaths.clone()); } private: - Utils::SmallString projectPartId_; - Utils::SmallStringVector arguments_; - Utils::PathStringVector headerPaths_; - Utils::PathStringVector sourcePaths_; + Utils::SmallString m_projectPartId; + Utils::SmallStringVector m_arguments; + Utils::PathStringVector m_headerPaths; + Utils::PathStringVector m_sourcePaths; }; using ProjectPartContainers = std::vector; diff --git a/src/libs/clangbackendipc/projectpartpch.h b/src/libs/clangbackendipc/projectpartpch.h index 0d541671c2f..6798f0eafbc 100644 --- a/src/libs/clangbackendipc/projectpartpch.h +++ b/src/libs/clangbackendipc/projectpartpch.h @@ -36,32 +36,32 @@ class ProjectPartPch public: ProjectPartPch() = default; ProjectPartPch(Utils::SmallString &&projectPartId, Utils::SmallString &&pchPath) - : projectPartId(std::move(projectPartId)), - pchPath(std::move(pchPath)) + : m_projectPartId(std::move(projectPartId)), + m_pchPath(std::move(pchPath)) {} const Utils::SmallString &id() const { - return projectPartId; + return m_projectPartId; } const Utils::SmallString &path() const { - return pchPath; + return m_pchPath; } friend QDataStream &operator<<(QDataStream &out, const ProjectPartPch &container) { - out << container.projectPartId; - out << container.pchPath; + out << container.m_projectPartId; + out << container.m_pchPath; return out; } friend QDataStream &operator>>(QDataStream &in, ProjectPartPch &container) { - in >> container.projectPartId; - in >> container.pchPath; + in >> container.m_projectPartId; + in >> container.m_pchPath; return in; } @@ -69,18 +69,18 @@ public: friend bool operator==(const ProjectPartPch &first, const ProjectPartPch &second) { - return first.projectPartId == second.projectPartId - && first.pchPath == second.pchPath; + return first.m_projectPartId == second.m_projectPartId + && first.m_pchPath == second.m_pchPath; } ProjectPartPch clone() const { - return ProjectPartPch(projectPartId.clone(), pchPath.clone()); + return ProjectPartPch(m_projectPartId.clone(), m_pchPath.clone()); } private: - Utils::SmallString projectPartId; - Utils::SmallString pchPath; + Utils::SmallString m_projectPartId; + Utils::SmallString m_pchPath; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const ProjectPartPch &projectPartPch); diff --git a/src/libs/clangbackendipc/projectpartsdonotexistmessage.cpp b/src/libs/clangbackendipc/projectpartsdonotexistmessage.cpp index 879c52129ef..18fc44e0ab7 100644 --- a/src/libs/clangbackendipc/projectpartsdonotexistmessage.cpp +++ b/src/libs/clangbackendipc/projectpartsdonotexistmessage.cpp @@ -42,16 +42,14 @@ QDebug operator<<(QDebug debug, const ProjectPartsDoNotExistMessage &message) return debug; } -void PrintTo(const ProjectPartsDoNotExistMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const ProjectPartsDoNotExistMessage &message) { - QString output; - QDebug debug(&output); + os << "(" + << message.projectPartIds() + << ")"; - debug << message; - - *os << output.toUtf8().constData(); + return os; } - } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/projectpartsdonotexistmessage.h b/src/libs/clangbackendipc/projectpartsdonotexistmessage.h index d0c84451279..65a8132dc5f 100644 --- a/src/libs/clangbackendipc/projectpartsdonotexistmessage.h +++ b/src/libs/clangbackendipc/projectpartsdonotexistmessage.h @@ -38,40 +38,40 @@ class ProjectPartsDoNotExistMessage public: ProjectPartsDoNotExistMessage() = default; ProjectPartsDoNotExistMessage(const Utf8StringVector &projectPartIds) - : projectPartIds_(projectPartIds) + : m_projectPartIds(projectPartIds) { } const Utf8StringVector &projectPartIds() const { - return projectPartIds_; + return m_projectPartIds; } friend QDataStream &operator<<(QDataStream &out, const ProjectPartsDoNotExistMessage &message) { - out << message.projectPartIds_; + out << message.m_projectPartIds; return out; } friend QDataStream &operator>>(QDataStream &in, ProjectPartsDoNotExistMessage &message) { - in >> message.projectPartIds_; + in >> message.m_projectPartIds; return in; } friend bool operator==(const ProjectPartsDoNotExistMessage &first, const ProjectPartsDoNotExistMessage &second) { - return first.projectPartIds_ == second.projectPartIds_; + return first.m_projectPartIds == second.m_projectPartIds; } private: - Utf8StringVector projectPartIds_; + Utf8StringVector m_projectPartIds; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const ProjectPartsDoNotExistMessage &message); -void PrintTo(const ProjectPartsDoNotExistMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const ProjectPartsDoNotExistMessage &message); DECLARE_MESSAGE(ProjectPartsDoNotExistMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/readmessageblock.cpp b/src/libs/clangbackendipc/readmessageblock.cpp index 208b1e2caab..e566093074c 100644 --- a/src/libs/clangbackendipc/readmessageblock.cpp +++ b/src/libs/clangbackendipc/readmessageblock.cpp @@ -35,9 +35,9 @@ namespace ClangBackEnd { ReadMessageBlock::ReadMessageBlock(QIODevice *ioDevice) - : ioDevice(ioDevice), - messageCounter(0), - blockSize(0) + : m_ioDevice(ioDevice), + m_messageCounter(0), + m_blockSize(0) { } @@ -49,19 +49,19 @@ bool ReadMessageBlock::checkIfMessageIsLost(QDataStream &in) bool messageIsLost = false; #ifndef DONT_CHECK_MESSAGE_COUNTER - messageIsLost = !((currentMessageCounter == 0 && messageCounter == 0) || (messageCounter + 1 == currentMessageCounter)); + messageIsLost = !((currentMessageCounter == 0 && m_messageCounter == 0) || (m_messageCounter + 1 == currentMessageCounter)); if (messageIsLost) - qWarning() << "message lost: " << messageCounter << currentMessageCounter; + qWarning() << "message lost: " << m_messageCounter << currentMessageCounter; #endif - messageCounter = currentMessageCounter; + m_messageCounter = currentMessageCounter; return messageIsLost; } MessageEnvelop ReadMessageBlock::read() { - QDataStream in(ioDevice); + QDataStream in(m_ioDevice); MessageEnvelop message; @@ -94,21 +94,21 @@ QVector ReadMessageBlock::readAll() void ReadMessageBlock::resetCounter() { - messageCounter = 0; + m_messageCounter = 0; } bool ReadMessageBlock::isTheWholeMessageReadable(QDataStream &in) { - if (ioDevice->bytesAvailable() < qint64(sizeof(blockSize))) + if (m_ioDevice->bytesAvailable() < qint64(sizeof(m_blockSize))) return false; - if (blockSize == 0) - in >> blockSize; + if (m_blockSize == 0) + in >> m_blockSize; - if (ioDevice->bytesAvailable() < blockSize) + if (m_ioDevice->bytesAvailable() < m_blockSize) return false; - blockSize = 0; + m_blockSize = 0; return true; } diff --git a/src/libs/clangbackendipc/readmessageblock.h b/src/libs/clangbackendipc/readmessageblock.h index d2ee8673009..54c06b9fe6f 100644 --- a/src/libs/clangbackendipc/readmessageblock.h +++ b/src/libs/clangbackendipc/readmessageblock.h @@ -51,9 +51,9 @@ private: bool checkIfMessageIsLost(QDataStream &in); private: - QIODevice *ioDevice; - qint64 messageCounter; - qint32 blockSize; + QIODevice *m_ioDevice; + qint64 m_messageCounter; + qint32 m_blockSize; }; } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp index 9f3b2496f2c..2881382ce8e 100644 --- a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp +++ b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp @@ -43,14 +43,13 @@ QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &mess return debug; } -void PrintTo(const RegisterUnsavedFilesForEditorMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const RegisterUnsavedFilesForEditorMessage &message) { - *os << "RegisterUnsavedFilesForEditorMessage("; + os << "(" + << message.fileContainers() + << ")"; - for (const FileContainer &fileContainer : message.fileContainers()) - PrintTo(fileContainer, os); - - *os << ")"; + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h index 53a794326bc..973fe9294fd 100644 --- a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h +++ b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h @@ -36,40 +36,40 @@ class RegisterUnsavedFilesForEditorMessage public: RegisterUnsavedFilesForEditorMessage() = default; RegisterUnsavedFilesForEditorMessage(const QVector &fileContainers) - : fileContainers_(fileContainers) + : m_fileContainers(fileContainers) { } const QVector &fileContainers() const { - return fileContainers_; + return m_fileContainers; } friend QDataStream &operator<<(QDataStream &out, const RegisterUnsavedFilesForEditorMessage &message) { - out << message.fileContainers_; + out << message.m_fileContainers; return out; } friend QDataStream &operator>>(QDataStream &in, RegisterUnsavedFilesForEditorMessage &message) { - in >> message.fileContainers_; + in >> message.m_fileContainers; return in; } friend bool operator==(const RegisterUnsavedFilesForEditorMessage &first, const RegisterUnsavedFilesForEditorMessage &second) { - return first.fileContainers_ == second.fileContainers_; + return first.m_fileContainers == second.m_fileContainers; } private: - QVector fileContainers_; + QVector m_fileContainers; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message); -void PrintTo(const RegisterUnsavedFilesForEditorMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const RegisterUnsavedFilesForEditorMessage &message); DECLARE_MESSAGE(RegisterUnsavedFilesForEditorMessage); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/removepchprojectpartsmessage.h b/src/libs/clangbackendipc/removepchprojectpartsmessage.h index 2c052bab22d..c6ae105dd0b 100644 --- a/src/libs/clangbackendipc/removepchprojectpartsmessage.h +++ b/src/libs/clangbackendipc/removepchprojectpartsmessage.h @@ -34,29 +34,29 @@ class RemovePchProjectPartsMessage public: RemovePchProjectPartsMessage() = default; RemovePchProjectPartsMessage(Utils::SmallStringVector &&projectsPartIds) - : projectsPartIds_(std::move(projectsPartIds)) + : m_projectsPartIds(std::move(projectsPartIds)) {} const Utils::SmallStringVector &projectsPartIds() const { - return projectsPartIds_; + return m_projectsPartIds; } Utils::SmallStringVector takeProjectsPartIds() { - return std::move(projectsPartIds_); + return std::move(m_projectsPartIds); } friend QDataStream &operator<<(QDataStream &out, const RemovePchProjectPartsMessage &message) { - out << message.projectsPartIds_; + out << message.m_projectsPartIds; return out; } friend QDataStream &operator>>(QDataStream &in, RemovePchProjectPartsMessage &message) { - in >> message.projectsPartIds_; + in >> message.m_projectsPartIds; return in; } @@ -64,16 +64,16 @@ public: friend bool operator==(const RemovePchProjectPartsMessage &first, const RemovePchProjectPartsMessage &second) { - return first.projectsPartIds_ == second.projectsPartIds_; + return first.m_projectsPartIds == second.m_projectsPartIds; } RemovePchProjectPartsMessage clone() const { - return RemovePchProjectPartsMessage(projectsPartIds_.clone()); + return RemovePchProjectPartsMessage(m_projectsPartIds.clone()); } private: - Utils::SmallStringVector projectsPartIds_; + Utils::SmallStringVector m_projectsPartIds; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message); diff --git a/src/libs/clangbackendipc/requestdocumentannotations.cpp b/src/libs/clangbackendipc/requestdocumentannotations.cpp index 81f54cdb318..6d3400ccc3a 100644 --- a/src/libs/clangbackendipc/requestdocumentannotations.cpp +++ b/src/libs/clangbackendipc/requestdocumentannotations.cpp @@ -40,10 +40,14 @@ QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message return debug; } -void PrintTo(const RequestDocumentAnnotationsMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const RequestDocumentAnnotationsMessage &message) { - *os << message.fileContainer().filePath().constData() - << "(" << message.fileContainer().projectPartId().constData() << ")"; + os << "(" + << message.fileContainer().filePath() << "," + << message.fileContainer().projectPartId() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/requestdocumentannotations.h b/src/libs/clangbackendipc/requestdocumentannotations.h index 175fb1a6965..e8facfef332 100644 --- a/src/libs/clangbackendipc/requestdocumentannotations.h +++ b/src/libs/clangbackendipc/requestdocumentannotations.h @@ -34,40 +34,40 @@ class RequestDocumentAnnotationsMessage public: RequestDocumentAnnotationsMessage() = default; RequestDocumentAnnotationsMessage(const FileContainer &fileContainer) - : fileContainer_(fileContainer) + : m_fileContainer(fileContainer) { } const FileContainer fileContainer() const { - return fileContainer_; + return m_fileContainer; } friend QDataStream &operator<<(QDataStream &out, const RequestDocumentAnnotationsMessage &message) { - out << message.fileContainer_; + out << message.m_fileContainer; return out; } friend QDataStream &operator>>(QDataStream &in, RequestDocumentAnnotationsMessage &message) { - in >> message.fileContainer_; + in >> message.m_fileContainer; return in; } friend bool operator==(const RequestDocumentAnnotationsMessage &first, const RequestDocumentAnnotationsMessage &second) { - return first.fileContainer_ == second.fileContainer_; + return first.m_fileContainer == second.m_fileContainer; } private: - FileContainer fileContainer_; + FileContainer m_fileContainer; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message); -void PrintTo(const RequestDocumentAnnotationsMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const RequestDocumentAnnotationsMessage &message); DECLARE_MESSAGE(RequestDocumentAnnotationsMessage); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.cpp b/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.cpp index 534ec0be76a..6d5d8a24a1e 100644 --- a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.cpp +++ b/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.cpp @@ -38,19 +38,18 @@ QDebug operator<<(QDebug debug, const RequestSourceLocationsForRenamingMessage & return debug; } -void PrintTo(const RequestSourceLocationsForRenamingMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const RequestSourceLocationsForRenamingMessage &message) { - Q_UNUSED(message) - Q_UNUSED(os) -#ifdef UNIT_TESTS - *os << "RequestSourceLocationsForRenamingMessage(" - << ::testing::PrintToString(message.filePath()) << ", (" - << message.line() << ", " - << message.column() << "), " - << message.unsavedContent() << ", " - << message.commandLine() - << ")"; -#endif + + os << "(" + << message.filePath() << ", " + << message.line() << ", " + << message.column() << ", " + << message.unsavedContent() << ", " + << message.commandLine() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h b/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h index db2d0e93438..8b1f46798c1 100644 --- a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h +++ b/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h @@ -42,98 +42,98 @@ public: Utils::SmallString &&unsavedContent, Utils::SmallStringVector &&commandLine, int textDocumentRevision) - : filePath_(std::move(filePath)), - unsavedContent_(std::move(unsavedContent)), - commandLine_(std::move(commandLine)), - line_(line), - column_(column), - revision(textDocumentRevision) + : m_filePath(std::move(filePath)), + m_unsavedContent(std::move(unsavedContent)), + m_commandLine(std::move(commandLine)), + m_line(line), + m_column(column), + m_revision(textDocumentRevision) {} const FilePath &filePath() const { - return filePath_; + return m_filePath; } uint line() const { - return line_; + return m_line; } uint column() const { - return column_; + return m_column; } const Utils::SmallString &unsavedContent() const { - return unsavedContent_; + return m_unsavedContent; } const Utils::SmallStringVector &commandLine() const { - return commandLine_; + return m_commandLine; } int textDocumentRevision() const { - return revision; + return m_revision; } friend QDataStream &operator<<(QDataStream &out, const RequestSourceLocationsForRenamingMessage &message) { - out << message.filePath_; - out << message.unsavedContent_; - out << message.commandLine_; - out << message.line_; - out << message.column_; - out << message.revision; + out << message.m_filePath; + out << message.m_unsavedContent; + out << message.m_commandLine; + out << message.m_line; + out << message.m_column; + out << message.m_revision; return out; } friend QDataStream &operator>>(QDataStream &in, RequestSourceLocationsForRenamingMessage &message) { - in >> message.filePath_; - in >> message.unsavedContent_; - in >> message.commandLine_; - in >> message.line_; - in >> message.column_; - in >> message.revision; + in >> message.m_filePath; + in >> message.m_unsavedContent; + in >> message.m_commandLine; + in >> message.m_line; + in >> message.m_column; + in >> message.m_revision; return in; } friend bool operator==(const RequestSourceLocationsForRenamingMessage &first, const RequestSourceLocationsForRenamingMessage &second) { - return first.filePath_ == second.filePath_ - && first.line_ == second.line_ - && first.column_ == second.column_ - && first.revision == second.revision - && first.unsavedContent_ == second.unsavedContent_ - && first.commandLine_ == second.commandLine_; + return first.m_filePath == second.m_filePath + && first.m_line == second.m_line + && first.m_column == second.m_column + && first.m_revision == second.m_revision + && first.m_unsavedContent == second.m_unsavedContent + && first.m_commandLine == second.m_commandLine; } RequestSourceLocationsForRenamingMessage clone() const { - return RequestSourceLocationsForRenamingMessage(filePath_.clone(), - line_, column_, - unsavedContent_.clone(), - commandLine_.clone(), - revision); + return RequestSourceLocationsForRenamingMessage(m_filePath.clone(), + m_line, m_column, + m_unsavedContent.clone(), + m_commandLine.clone(), + m_revision); } private: - FilePath filePath_; - Utils::SmallString unsavedContent_; - Utils::SmallStringVector commandLine_; - uint line_ = 1; - uint column_ = 1; - int revision = 1; + FilePath m_filePath; + Utils::SmallString m_unsavedContent; + Utils::SmallStringVector m_commandLine; + uint m_line = 1; + uint m_column = 1; + int m_revision = 1; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestSourceLocationsForRenamingMessage &message); -void PrintTo(const RequestSourceLocationsForRenamingMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const RequestSourceLocationsForRenamingMessage &message); DECLARE_MESSAGE(RequestSourceLocationsForRenamingMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.cpp b/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.cpp index 5489eeaba7f..5bbc9065049 100644 --- a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.cpp +++ b/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.cpp @@ -36,16 +36,14 @@ QDebug operator<<(QDebug debug, const RequestSourceRangesAndDiagnosticsForQueryM return debug; } -void PrintTo(const RequestSourceRangesAndDiagnosticsForQueryMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const RequestSourceRangesAndDiagnosticsForQueryMessage &message) { - Q_UNUSED(message) - Q_UNUSED(os) -#ifdef UNIT_TESTS - *os << "RequestSourceRangesAndDiagnosticsForQuery(" - << message.query() << ", " - << message.sources() - << ")"; -#endif + os << "(" + << message.query() << ", " + << message.sources() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.h index 92bc71ddccf..bbc97aa8d15 100644 --- a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.h +++ b/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.h @@ -36,56 +36,56 @@ public: RequestSourceRangesAndDiagnosticsForQueryMessage(Utils::SmallString &&query, std::vector &&sources, std::vector &&unsavedContent) - : query_(std::move(query)), - sources_(std::move(sources)), - unsavedContent_(std::move(unsavedContent)) + : m_query(std::move(query)), + m_sources(std::move(sources)), + m_unsavedContent(std::move(unsavedContent)) {} const std::vector &sources() const { - return sources_; + return m_sources; } std::vector takeSources() { - return std::move(sources_); + return std::move(m_sources); } const std::vector &unsavedContent() const { - return unsavedContent_; + return m_unsavedContent; } std::vector takeUnsavedContent() { - return std::move(unsavedContent_); + return std::move(m_unsavedContent); } const Utils::SmallString &query() const { - return query_; + return m_query; } Utils::SmallString takeQuery() { - return std::move(query_); + return std::move(m_query); } friend QDataStream &operator<<(QDataStream &out, const RequestSourceRangesAndDiagnosticsForQueryMessage &message) { - out << message.query_; - out << message.sources_; - out << message.unsavedContent_; + out << message.m_query; + out << message.m_sources; + out << message.m_unsavedContent; return out; } friend QDataStream &operator>>(QDataStream &in, RequestSourceRangesAndDiagnosticsForQueryMessage &message) { - in >> message.query_; - in >> message.sources_; - in >> message.unsavedContent_; + in >> message.m_query; + in >> message.m_sources; + in >> message.m_unsavedContent; return in; } @@ -93,26 +93,26 @@ public: friend bool operator==(const RequestSourceRangesAndDiagnosticsForQueryMessage &first, const RequestSourceRangesAndDiagnosticsForQueryMessage &second) { - return first.query_ == second.query_ - && first.sources_ == second.sources_ - && first.unsavedContent_ == second.unsavedContent_; + return first.m_query == second.m_query + && first.m_sources == second.m_sources + && first.m_unsavedContent == second.m_unsavedContent; } RequestSourceRangesAndDiagnosticsForQueryMessage clone() const { - return RequestSourceRangesAndDiagnosticsForQueryMessage(query_.clone(), - Utils::clone(sources_), - Utils::clone(unsavedContent_)); + return RequestSourceRangesAndDiagnosticsForQueryMessage(m_query.clone(), + Utils::clone(m_sources), + Utils::clone(m_unsavedContent)); } private: - Utils::SmallString query_; - std::vector sources_; - std::vector unsavedContent_; + Utils::SmallString m_query; + std::vector m_sources; + std::vector m_unsavedContent; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesAndDiagnosticsForQueryMessage &message); -void PrintTo(const RequestSourceRangesAndDiagnosticsForQueryMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const RequestSourceRangesAndDiagnosticsForQueryMessage &message); DECLARE_MESSAGE(RequestSourceRangesAndDiagnosticsForQueryMessage) diff --git a/src/libs/clangbackendipc/sourcefilepathcontainerbase.h b/src/libs/clangbackendipc/sourcefilepathcontainerbase.h index 40a5a68db6b..af5f8b570c6 100644 --- a/src/libs/clangbackendipc/sourcefilepathcontainerbase.h +++ b/src/libs/clangbackendipc/sourcefilepathcontainerbase.h @@ -38,14 +38,14 @@ class SourceFilePathContainerBase public: SourceFilePathContainerBase() = default; SourceFilePathContainerBase(std::unordered_map &&filePathHash) - : filePathHash(std::move(filePathHash)) + : m_filePathHash(std::move(filePathHash)) { } void insertFilePath(uint fileId, Utils::SmallString &&fileDirectory, Utils::SmallString &&fileName) { - if (filePathHash.find(fileId) == filePathHash.end()) { - filePathHash.emplace(std::piecewise_construct, + if (m_filePathHash.find(fileId) == m_filePathHash.end()) { + m_filePathHash.emplace(std::piecewise_construct, std::forward_as_tuple(fileId), std::forward_as_tuple(std::move(fileDirectory), std::move(fileName))); } @@ -53,16 +53,16 @@ public: void reserve(std::size_t size) { - filePathHash.reserve(size / 3); + m_filePathHash.reserve(size / 3); } const FilePathDict &filePaths() const { - return filePathHash; + return m_filePathHash; } protected: - FilePathDict filePathHash; + FilePathDict m_filePathHash; }; } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.cpp b/src/libs/clangbackendipc/sourcelocationcontainer.cpp index f274eb3e59f..f4c9648f563 100644 --- a/src/libs/clangbackendipc/sourcelocationcontainer.cpp +++ b/src/libs/clangbackendipc/sourcelocationcontainer.cpp @@ -35,42 +35,42 @@ namespace ClangBackEnd { SourceLocationContainer::SourceLocationContainer(const Utf8String &filePath, uint line, uint column) - : filePath_(filePath), - line_(line), - column_(column) + : m_filePath(filePath), + m_line(line), + m_column(column) { } const Utf8String &SourceLocationContainer::filePath() const { - return filePath_; + return m_filePath; } uint SourceLocationContainer::line() const { - return line_; + return m_line; } uint SourceLocationContainer::column() const { - return column_; + return m_column; } QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container) { - out << container.filePath_; - out << container.line_; - out << container.column_; + out << container.m_filePath; + out << container.m_line; + out << container.m_column; return out; } QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container) { - in >> container.filePath_; - in >> container.line_; - in >> container.column_; + in >> container.m_filePath; + in >> container.m_line; + in >> container.m_column; return in; } @@ -82,9 +82,9 @@ bool operator==(const SourceLocationContainer &first, const SourceLocationContai bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second) { - return first.line_ != second.line_ - || first.column_ != second.column_ - || first.filePath_ != second.filePath_; + return first.m_line != second.m_line + || first.m_column != second.m_column + || first.m_filePath != second.m_filePath; } QDebug operator<<(QDebug debug, const SourceLocationContainer &container) @@ -97,13 +97,15 @@ QDebug operator<<(QDebug debug, const SourceLocationContainer &container) return debug; } -void PrintTo(const SourceLocationContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container) { - *os << "[" - << container.filePath().constData() << ", " - << container.line() << ", " - << container.column() - << "]"; + os << "(" + << container.filePath() << ", " + << container.line() << ", " + << container.column() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.h b/src/libs/clangbackendipc/sourcelocationcontainer.h index bcad2d79f4f..6514b484697 100644 --- a/src/libs/clangbackendipc/sourcelocationcontainer.h +++ b/src/libs/clangbackendipc/sourcelocationcontainer.h @@ -48,9 +48,9 @@ public: uint column() const; private: - Utf8String filePath_; - uint line_ = 0; - uint column_ = 0; + Utf8String m_filePath; + uint m_line = 0; + uint m_column = 0; }; CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container); @@ -59,6 +59,6 @@ CMBIPC_EXPORT bool operator==(const SourceLocationContainer &first, const Source CMBIPC_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second); CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container); -void PrintTo(const SourceLocationContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcelocationcontainerv2.cpp b/src/libs/clangbackendipc/sourcelocationcontainerv2.cpp index b63c1ba94dc..b65803e7c65 100644 --- a/src/libs/clangbackendipc/sourcelocationcontainerv2.cpp +++ b/src/libs/clangbackendipc/sourcelocationcontainerv2.cpp @@ -43,14 +43,16 @@ QDebug operator<<(QDebug debug, const SourceLocationContainer &container) return debug; } -void PrintTo(const SourceLocationContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container) { - *os << "(" - << container.line() << ", " - << container.column() << ", " - << container.offset() << ", " - << container.fileHash() - << ")"; + os << "(" + << container.line() << ", " + << container.column() << ", " + << container.offset() << ", " + << container.fileHash() + << ")"; + + return os; } } // namespace V2 diff --git a/src/libs/clangbackendipc/sourcelocationcontainerv2.h b/src/libs/clangbackendipc/sourcelocationcontainerv2.h index 81b2a4361f1..6f508ae4a3d 100644 --- a/src/libs/clangbackendipc/sourcelocationcontainerv2.h +++ b/src/libs/clangbackendipc/sourcelocationcontainerv2.h @@ -41,49 +41,49 @@ public: uint line, uint column, uint offset) - : fileHash_(fileHash), - line_(line), - column_(column), - offset_(offset) + : m_fileHash(fileHash), + m_line(line), + m_column(column), + m_offset(offset) { } uint fileHash() const { - return fileHash_; + return m_fileHash; } uint line() const { - return line_; + return m_line; } uint column() const { - return column_; + return m_column; } uint offset() const { - return offset_; + return m_offset; } friend QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container) { - out << container.fileHash_; - out << container.line_; - out << container.column_; - out << container.offset_; + out << container.m_fileHash; + out << container.m_line; + out << container.m_column; + out << container.m_offset; return out; } friend QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container) { - in >> container.fileHash_; - in >> container.line_; - in >> container.column_; - in >> container.offset_; + in >> container.m_fileHash; + in >> container.m_line; + in >> container.m_column; + in >> container.m_offset; return in; } @@ -95,26 +95,26 @@ public: friend bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second) { - return first.line_ != second.line_ - || first.column_ != second.column_ - || first.fileHash_ != second.fileHash_ - || first.offset_ != second.offset_; + return first.m_line != second.m_line + || first.m_column != second.m_column + || first.m_fileHash != second.m_fileHash + || first.m_offset != second.m_offset; } SourceLocationContainer clone() const { - return SourceLocationContainer(fileHash_, line_, column_, offset_); + return SourceLocationContainer(m_fileHash, m_line, m_column, m_offset); } private: - uint fileHash_ = 0; - uint line_ = 1; - uint column_ = 1; - uint offset_ = 0; + uint m_fileHash = 0; + uint m_line = 1; + uint m_column = 1; + uint m_offset = 0; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container); -void PrintTo(const SourceLocationContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container); } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcelocationscontainer.cpp b/src/libs/clangbackendipc/sourcelocationscontainer.cpp index 90bf2d5f82e..c5775e6a761 100644 --- a/src/libs/clangbackendipc/sourcelocationscontainer.cpp +++ b/src/libs/clangbackendipc/sourcelocationscontainer.cpp @@ -44,16 +44,13 @@ QDebug operator<<(QDebug debug, const SourceLocationsContainer &container) return debug; } -void PrintTo(const SourceLocationsContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceLocationsContainer &container) { - *os << "("; - for (const auto &sourceLocation: container.sourceLocationContainers()) { - *os << "(" - << container.filePathForSourceLocation(sourceLocation).name() << "," - << sourceLocation.line() << "," - << sourceLocation.column() << "), "; - } - *os << ")"; + os << "(" + << container.sourceLocationContainers() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcelocationscontainer.h b/src/libs/clangbackendipc/sourcelocationscontainer.h index 9fc2acc876e..731ad16906b 100644 --- a/src/libs/clangbackendipc/sourcelocationscontainer.h +++ b/src/libs/clangbackendipc/sourcelocationscontainer.h @@ -39,69 +39,69 @@ public: SourceLocationsContainer(std::unordered_map &&filePathHash, std::vector &&sourceLocationContainers) : SourceFilePathContainerBase(std::move(filePathHash)), - sourceLocationContainers_(std::move(sourceLocationContainers)) + m_sourceLocationContainers(std::move(sourceLocationContainers)) {} const FilePath &filePathForSourceLocation(const V2::SourceLocationContainer &sourceLocation) const { - auto found = filePathHash.find(sourceLocation.fileHash()); + auto found = m_filePathHash.find(sourceLocation.fileHash()); return found->second; } const std::vector &sourceLocationContainers() const { - return sourceLocationContainers_; + return m_sourceLocationContainers; } bool hasContent() const { - return !sourceLocationContainers_.empty(); + return !m_sourceLocationContainers.empty(); } void insertSourceLocation(uint fileId, uint line, uint column, uint offset) { - sourceLocationContainers_.emplace_back(fileId, line, column, offset); + m_sourceLocationContainers.emplace_back(fileId, line, column, offset); } void reserve(std::size_t size) { SourceFilePathContainerBase::reserve(size); - sourceLocationContainers_.reserve(size); + m_sourceLocationContainers.reserve(size); } friend QDataStream &operator<<(QDataStream &out, const SourceLocationsContainer &container) { - out << container.filePathHash; - out << container.sourceLocationContainers_; + out << container.m_filePathHash; + out << container.m_sourceLocationContainers; return out; } friend QDataStream &operator>>(QDataStream &in, SourceLocationsContainer &container) { - in >> container.filePathHash; - in >> container.sourceLocationContainers_; + in >> container.m_filePathHash; + in >> container.m_sourceLocationContainers; return in; } friend bool operator==(const SourceLocationsContainer &first, const SourceLocationsContainer &second) { - return first.sourceLocationContainers_ == second.sourceLocationContainers_; + return first.m_sourceLocationContainers == second.m_sourceLocationContainers; } SourceLocationsContainer clone() const { - return SourceLocationsContainer(Utils::clone(filePathHash), Utils::clone(sourceLocationContainers_)); + return SourceLocationsContainer(Utils::clone(m_filePathHash), Utils::clone(m_sourceLocationContainers)); } - std::vector sourceLocationContainers_; + std::vector m_sourceLocationContainers; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsContainer &container); -void PrintTo(const SourceLocationsContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceLocationsContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.cpp b/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.cpp index eff8449354d..0ce0b8f7a87 100644 --- a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.cpp +++ b/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.cpp @@ -36,13 +36,15 @@ QDebug operator<<(QDebug debug, const SourceLocationsForRenamingMessage &message return debug; } -void PrintTo(const SourceLocationsForRenamingMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceLocationsForRenamingMessage &message) { - *os << "SourceLocationsForRenamingMessage(\"" - << message.symbolName() << "\", " - << message.textDocumentRevision() << ", "; - PrintTo(message.sourceLocations(), os); - *os << ")"; + os << "(" + << message.symbolName() << ", " + << message.textDocumentRevision() << ", " + << message.sourceLocations() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.h b/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.h index 2216ba02a8b..5362ed2e46b 100644 --- a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.h +++ b/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.h @@ -38,66 +38,66 @@ public: SourceLocationsForRenamingMessage(Utils::SmallString &&symbolName, SourceLocationsContainer &&sourceLocationContainer, int textDocumentRevision) - : symbolName_(std::move(symbolName)), - sourceLocationContainer(std::move(sourceLocationContainer)), - revision(textDocumentRevision) + : m_symbolName(std::move(symbolName)), + m_sourceLocationContainer(std::move(sourceLocationContainer)), + m_revision(textDocumentRevision) {} const Utils::SmallString &symbolName() const { - return symbolName_; + return m_symbolName; } int textDocumentRevision() const { - return revision; + return m_revision; } const SourceLocationsContainer &sourceLocations() const { - return sourceLocationContainer; + return m_sourceLocationContainer; } friend QDataStream &operator<<(QDataStream &out, const SourceLocationsForRenamingMessage &message) { - out << message.symbolName_; - out << message.sourceLocationContainer; - out << message.revision; + out << message.m_symbolName; + out << message.m_sourceLocationContainer; + out << message.m_revision; return out; } friend QDataStream &operator>>(QDataStream &in, SourceLocationsForRenamingMessage &message) { - in >> message.symbolName_; - in >> message.sourceLocationContainer; - in >> message.revision; + in >> message.m_symbolName; + in >> message.m_sourceLocationContainer; + in >> message.m_revision; return in; } friend bool operator==(const SourceLocationsForRenamingMessage &first, const SourceLocationsForRenamingMessage &second) { - return first.revision == second.revision - && first.symbolName_ == second.symbolName_ - && first.sourceLocationContainer == second.sourceLocationContainer; + return first.m_revision == second.m_revision + && first.m_symbolName == second.m_symbolName + && first.m_sourceLocationContainer == second.m_sourceLocationContainer; } SourceLocationsForRenamingMessage clone() const { - return SourceLocationsForRenamingMessage(symbolName_.clone(), - sourceLocationContainer.clone(), - revision); + return SourceLocationsForRenamingMessage(m_symbolName.clone(), + m_sourceLocationContainer.clone(), + m_revision); } private: - Utils::SmallString symbolName_; - SourceLocationsContainer sourceLocationContainer; - int revision = 0; + Utils::SmallString m_symbolName; + SourceLocationsContainer m_sourceLocationContainer; + int m_revision = 0; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsForRenamingMessage &message); -void PrintTo(const SourceLocationsForRenamingMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceLocationsForRenamingMessage &message); DECLARE_MESSAGE(SourceLocationsForRenamingMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcerangecontainer.cpp b/src/libs/clangbackendipc/sourcerangecontainer.cpp index 2bee6377ab4..a2db7545eb5 100644 --- a/src/libs/clangbackendipc/sourcerangecontainer.cpp +++ b/src/libs/clangbackendipc/sourcerangecontainer.cpp @@ -42,13 +42,14 @@ QDebug operator<<(QDebug debug, const SourceRangeContainer &container) return debug; } -void PrintTo(const SourceRangeContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container) { - *os << "["; - PrintTo(container.start(), os); - *os << ", "; - PrintTo(container.end(), os); - *os<< "]"; + os << "(" + << container.start() << ", " + << container.end() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcerangecontainer.h b/src/libs/clangbackendipc/sourcerangecontainer.h index 6d9e3ed0c8f..ff871cf8edb 100644 --- a/src/libs/clangbackendipc/sourcerangecontainer.h +++ b/src/libs/clangbackendipc/sourcerangecontainer.h @@ -37,49 +37,49 @@ public: SourceRangeContainer() = default; SourceRangeContainer(SourceLocationContainer start, SourceLocationContainer end) - : start_(start), - end_(end) + : m_start(start), + m_end(end) { } SourceLocationContainer start() const { - return start_; + return m_start; } SourceLocationContainer end() const { - return end_; + return m_end; } friend QDataStream &operator<<(QDataStream &out, const SourceRangeContainer &container) { - out << container.start_; - out << container.end_; + out << container.m_start; + out << container.m_end; return out; } friend QDataStream &operator>>(QDataStream &in, SourceRangeContainer &container) { - in >> container.start_; - in >> container.end_; + in >> container.m_start; + in >> container.m_end; return in; } friend bool operator==(const SourceRangeContainer &first, const SourceRangeContainer &second) { - return first.start_ == second.start_ && first.end_ == second.end_; + return first.m_start == second.m_start && first.m_end == second.m_end; } private: - SourceLocationContainer start_; - SourceLocationContainer end_; + SourceLocationContainer m_start; + SourceLocationContainer m_end; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container); -void PrintTo(const SourceRangeContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcerangecontainerv2.cpp b/src/libs/clangbackendipc/sourcerangecontainerv2.cpp index d783d97ebb2..47907beb8da 100644 --- a/src/libs/clangbackendipc/sourcerangecontainerv2.cpp +++ b/src/libs/clangbackendipc/sourcerangecontainerv2.cpp @@ -42,14 +42,14 @@ QDebug operator<<(QDebug debug, const SourceRangeContainer &container) return debug; } -void PrintTo(const SourceRangeContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container) { - *os << "((" - << container.start().line() << ", " - << container.start().column() << "), (" - << container.end().line() << ", " - << container.end().column() - << "))"; + os << "(" + << container.start() << ", " + << container.end() + << ")"; + + return os; } } // namespace V2 diff --git a/src/libs/clangbackendipc/sourcerangecontainerv2.h b/src/libs/clangbackendipc/sourcerangecontainerv2.h index d10f7b759d4..7ffac75a02d 100644 --- a/src/libs/clangbackendipc/sourcerangecontainerv2.h +++ b/src/libs/clangbackendipc/sourcerangecontainerv2.h @@ -36,8 +36,8 @@ public: SourceRangeContainer() = default; SourceRangeContainer(SourceLocationContainer start, SourceLocationContainer end) - : start_(start), - end_(end) + : m_start(start), + m_end(end) { } @@ -48,58 +48,58 @@ public: uint endLine, uint endColumn, uint endOffset) - : start_(fileHash, startLine, startColumn, startOffset), - end_(fileHash, endLine, endColumn, endOffset) + : m_start(fileHash, startLine, startColumn, startOffset), + m_end(fileHash, endLine, endColumn, endOffset) { } SourceLocationContainer start() const { - return start_; + return m_start; } SourceLocationContainer end() const { - return end_; + return m_end; } uint fileHash() const { - return start_.fileHash(); + return m_start.fileHash(); } friend QDataStream &operator<<(QDataStream &out, const SourceRangeContainer &container) { - out << container.start_; - out << container.end_; + out << container.m_start; + out << container.m_end; return out; } friend QDataStream &operator>>(QDataStream &in, SourceRangeContainer &container) { - in >> container.start_; - in >> container.end_; + in >> container.m_start; + in >> container.m_end; return in; } friend bool operator==(const SourceRangeContainer &first, const SourceRangeContainer &second) { - return first.start_ == second.start_ && first.end_ == second.end_; + return first.m_start == second.m_start && first.m_end == second.m_end; } SourceRangeContainer clone() const { - return SourceRangeContainer(start_.clone(), end_.clone()); + return SourceRangeContainer(m_start.clone(), m_end.clone()); } private: - SourceLocationContainer start_; - SourceLocationContainer end_; + SourceLocationContainer m_start; + SourceLocationContainer m_end; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container); -void PrintTo(const SourceRangeContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container); } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.cpp b/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.cpp index c0ff250ffbb..f4ac78ea438 100644 --- a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.cpp +++ b/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.cpp @@ -36,15 +36,14 @@ QDebug operator<<(QDebug debug, const SourceRangesAndDiagnosticsForQueryMessage return debug; } -void PrintTo(const SourceRangesAndDiagnosticsForQueryMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceRangesAndDiagnosticsForQueryMessage &message) { - Q_UNUSED(message) - Q_UNUSED(os) -#ifdef UNIT_TESTS - *os << "SourceRangesAndDiagnosticsForQueryMessage(" - << testing::PrintToString(message.sourceRanges()) << ", " - << testing::PrintToString(message.diagnostics()) << ")"; -#endif + os << "(" + << message.sourceRanges() << ", " + << message.diagnostics() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.h index d17730301bf..f6c17a95290 100644 --- a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.h +++ b/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.h @@ -86,7 +86,7 @@ private: }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangesAndDiagnosticsForQueryMessage &message); -void PrintTo(const SourceRangesAndDiagnosticsForQueryMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceRangesAndDiagnosticsForQueryMessage &message); DECLARE_MESSAGE(SourceRangesAndDiagnosticsForQueryMessage) diff --git a/src/libs/clangbackendipc/sourcerangescontainer.cpp b/src/libs/clangbackendipc/sourcerangescontainer.cpp index 17fdc9c2e57..ff833be8749 100644 --- a/src/libs/clangbackendipc/sourcerangescontainer.cpp +++ b/src/libs/clangbackendipc/sourcerangescontainer.cpp @@ -44,18 +44,13 @@ QDebug operator<<(QDebug debug, const SourceRangesContainer &container) return debug; } -void PrintTo(const SourceRangesContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceRangesContainer &container) { - *os << "SourceRangesContainer("; - for (const auto &sourceRangeWithText: container.sourceRangeWithTextContainers()) { - *os << "[" - << container.filePathForSourceRange(sourceRangeWithText).name() << "," - << sourceRangeWithText.start().line() << "," - << sourceRangeWithText.start().column() << "), (" - << sourceRangeWithText.end().line() << "," - << sourceRangeWithText.end().column() << ")], "; - } - *os << ")"; + os << "(" + << container.sourceRangeWithTextContainers() + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcerangescontainer.h b/src/libs/clangbackendipc/sourcerangescontainer.h index 209921f9430..11ea542136a 100644 --- a/src/libs/clangbackendipc/sourcerangescontainer.h +++ b/src/libs/clangbackendipc/sourcerangescontainer.h @@ -39,29 +39,29 @@ public: SourceRangesContainer(std::unordered_map &&filePathHash, std::vector &&sourceRangeWithTextContainers) : SourceFilePathContainerBase(std::move(filePathHash)), - sourceRangeWithTextContainers_(std::move(sourceRangeWithTextContainers)) + m_sourceRangeWithTextContainers(std::move(sourceRangeWithTextContainers)) {} const FilePath &filePathForSourceRange(const SourceRangeWithTextContainer &sourceRange) const { - auto found = filePathHash.find(sourceRange.fileHash()); + auto found = m_filePathHash.find(sourceRange.fileHash()); return found->second; } const std::vector &sourceRangeWithTextContainers() const { - return sourceRangeWithTextContainers_; + return m_sourceRangeWithTextContainers; } std::vector takeSourceRangeWithTextContainers() { - return std::move(sourceRangeWithTextContainers_); + return std::move(m_sourceRangeWithTextContainers); } bool hasContent() const { - return !sourceRangeWithTextContainers_.empty(); + return !m_sourceRangeWithTextContainers.empty(); } void insertSourceRange(uint fileId, @@ -73,53 +73,53 @@ public: uint endOffset, Utils::SmallString &&text) { - sourceRangeWithTextContainers_.emplace_back(fileId, - startLine, - startColumn, - startOffset, - endLine, - endColumn, - endOffset, - std::move(text)); + m_sourceRangeWithTextContainers.emplace_back(fileId, + startLine, + startColumn, + startOffset, + endLine, + endColumn, + endOffset, + std::move(text)); } void reserve(std::size_t size) { SourceFilePathContainerBase::reserve(size); - sourceRangeWithTextContainers_.reserve(size); + m_sourceRangeWithTextContainers.reserve(size); } friend QDataStream &operator<<(QDataStream &out, const SourceRangesContainer &container) { - out << container.filePathHash; - out << container.sourceRangeWithTextContainers_; + out << container.m_filePathHash; + out << container.m_sourceRangeWithTextContainers; return out; } friend QDataStream &operator>>(QDataStream &in, SourceRangesContainer &container) { - in >> container.filePathHash; - in >> container.sourceRangeWithTextContainers_; + in >> container.m_filePathHash; + in >> container.m_sourceRangeWithTextContainers; return in; } friend bool operator==(const SourceRangesContainer &first, const SourceRangesContainer &second) { - return first.sourceRangeWithTextContainers_ == second.sourceRangeWithTextContainers_; + return first.m_sourceRangeWithTextContainers == second.m_sourceRangeWithTextContainers; } SourceRangesContainer clone() const { - return SourceRangesContainer(Utils::clone(filePathHash), Utils::clone(sourceRangeWithTextContainers_)); + return SourceRangesContainer(Utils::clone(m_filePathHash), Utils::clone(m_sourceRangeWithTextContainers)); } - std::vector sourceRangeWithTextContainers_; + std::vector m_sourceRangeWithTextContainers; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangesContainer &container); -void PrintTo(const SourceRangesContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceRangesContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcerangewithtextcontainer.cpp b/src/libs/clangbackendipc/sourcerangewithtextcontainer.cpp index 2be07150da7..82f410c8968 100644 --- a/src/libs/clangbackendipc/sourcerangewithtextcontainer.cpp +++ b/src/libs/clangbackendipc/sourcerangewithtextcontainer.cpp @@ -42,20 +42,15 @@ QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container) return debug; } -void PrintTo(const SourceRangeWithTextContainer &container, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const SourceRangeWithTextContainer &container) { - Q_UNUSED(container) - Q_UNUSED(os) -#ifdef UNIT_TESTS - *os << "((" - << container.start().line() << ", " - << container.start().column() << ", " - << container.start().offset() << "), (" - << container.end().line() << ", " - << container.end().column() << ", " - << container.end().offset() << "), " - << testing::PrintToString(container.text()) + + os << "(" + << container.start() << ", " + << container.end() << ", " + << container.text() << ")"; -#endif + + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/sourcerangewithtextcontainer.h b/src/libs/clangbackendipc/sourcerangewithtextcontainer.h index 2d825191de1..12b25084c3d 100644 --- a/src/libs/clangbackendipc/sourcerangewithtextcontainer.h +++ b/src/libs/clangbackendipc/sourcerangewithtextcontainer.h @@ -50,19 +50,19 @@ public: endLine, endColumn, endOffset), - text_(std::move(text)) + m_text(std::move(text)) {} SourceRangeWithTextContainer(V2::SourceRangeContainer &&base, Utils::SmallString &&text) : V2::SourceRangeContainer(std::move(base)), - text_(std::move(text)) + m_text(std::move(text)) { } const Utils::SmallString &text() const { - return text_; + return m_text; } using V2::SourceRangeContainer::start; @@ -72,7 +72,7 @@ public: friend QDataStream &operator<<(QDataStream &out, const SourceRangeWithTextContainer &container) { out << container.base(); - out << container.text_; + out << container.m_text; return out; } @@ -80,7 +80,7 @@ public: friend QDataStream &operator>>(QDataStream &in, SourceRangeWithTextContainer &container) { in >> container.base(); - in >> container.text_; + in >> container.m_text; return in; } @@ -88,7 +88,7 @@ public: friend bool operator==(const SourceRangeWithTextContainer &first, const SourceRangeWithTextContainer &second) { - return first.base() == second.base() && first.text_ == second.text_; + return first.base() == second.base() && first.m_text == second.m_text; } V2::SourceRangeContainer &base() @@ -103,13 +103,13 @@ public: SourceRangeWithTextContainer clone() const { - return SourceRangeWithTextContainer(base().clone(), text_.clone()); + return SourceRangeWithTextContainer(base().clone(), m_text.clone()); } private: - Utils::SmallString text_; + Utils::SmallString m_text; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container); -void PrintTo(const SourceRangeWithTextContainer &container, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const SourceRangeWithTextContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.cpp b/src/libs/clangbackendipc/translationunitdoesnotexistmessage.cpp index 22b104a9460..28f54325bb3 100644 --- a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.cpp +++ b/src/libs/clangbackendipc/translationunitdoesnotexistmessage.cpp @@ -42,14 +42,13 @@ QDebug operator<<(QDebug debug, const TranslationUnitDoesNotExistMessage &messag return debug; } -void PrintTo(const TranslationUnitDoesNotExistMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const TranslationUnitDoesNotExistMessage &message) { - QString output; - QDebug debug(&output); + os << "(" + << message.fileContainer() + << ")"; - debug << message; - - *os << output.toUtf8().constData(); + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h b/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h index 1cecbbe78d2..67c6601fae9 100644 --- a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h +++ b/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h @@ -34,55 +34,55 @@ class TranslationUnitDoesNotExistMessage public: TranslationUnitDoesNotExistMessage() = default; TranslationUnitDoesNotExistMessage(const FileContainer &fileContainer) - : fileContainer_(fileContainer) + : m_fileContainer(fileContainer) { } TranslationUnitDoesNotExistMessage(const Utf8String &filePath, const Utf8String &projectPartId) - : fileContainer_(filePath, projectPartId) + : m_fileContainer(filePath, projectPartId) { } const FileContainer &fileContainer() const { - return fileContainer_; + return m_fileContainer; } const Utf8String &filePath() const { - return fileContainer_.filePath(); + return m_fileContainer.filePath(); } const Utf8String &projectPartId() const { - return fileContainer_.projectPartId(); + return m_fileContainer.projectPartId(); } friend QDataStream &operator<<(QDataStream &out, const TranslationUnitDoesNotExistMessage &message) { - out << message.fileContainer_; + out << message.m_fileContainer; return out; } friend QDataStream &operator>>(QDataStream &in, TranslationUnitDoesNotExistMessage &message) { - in >> message.fileContainer_; + in >> message.m_fileContainer; return in; } friend bool operator==(const TranslationUnitDoesNotExistMessage &first, const TranslationUnitDoesNotExistMessage &second) { - return first.fileContainer_ == second.fileContainer_; + return first.m_fileContainer == second.m_fileContainer; } private: - FileContainer fileContainer_; + FileContainer m_fileContainer; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const TranslationUnitDoesNotExistMessage &message); -void PrintTo(const TranslationUnitDoesNotExistMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const TranslationUnitDoesNotExistMessage &message); DECLARE_MESSAGE(TranslationUnitDoesNotExistMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.cpp b/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.cpp index ab020280c26..7cd14039091 100644 --- a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.cpp +++ b/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.cpp @@ -43,16 +43,14 @@ QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &me return debug; } -void PrintTo(const UnregisterUnsavedFilesForEditorMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const UnregisterUnsavedFilesForEditorMessage &message) { - *os << "UnregisterUnsavedFilesForEditorMessage("; + os << "(" + << message.fileContainers() + << ")"; - for (const FileContainer &fileContainer : message.fileContainers()) - PrintTo(fileContainer, os); - - *os << ")"; + return os; } - } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h b/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h index f77162590ce..cc43e188726 100644 --- a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h +++ b/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h @@ -36,41 +36,41 @@ class UnregisterUnsavedFilesForEditorMessage public: UnregisterUnsavedFilesForEditorMessage() = default; UnregisterUnsavedFilesForEditorMessage(const QVector &fileContainers) - : fileContainers_(fileContainers) + : m_fileContainers(fileContainers) { } const QVector &fileContainers() const { - return fileContainers_; + return m_fileContainers; } friend QDataStream &operator<<(QDataStream &out, const UnregisterUnsavedFilesForEditorMessage &message) { - out << message.fileContainers_; + out << message.m_fileContainers; return out; } friend QDataStream &operator>>(QDataStream &in, UnregisterUnsavedFilesForEditorMessage &message) { - in >> message.fileContainers_; + in >> message.m_fileContainers; return in; } friend bool operator==(const UnregisterUnsavedFilesForEditorMessage &first, const UnregisterUnsavedFilesForEditorMessage &second) { - return first.fileContainers_ == second.fileContainers_; + return first.m_fileContainers == second.m_fileContainers; } private: - QVector fileContainers_; + QVector m_fileContainers; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message); -void PrintTo(const UnregisterUnsavedFilesForEditorMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const UnregisterUnsavedFilesForEditorMessage &message); DECLARE_MESSAGE(UnregisterUnsavedFilesForEditorMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/updatepchprojectpartsmessage.h b/src/libs/clangbackendipc/updatepchprojectpartsmessage.h index c308e3e4dff..67301faf447 100644 --- a/src/libs/clangbackendipc/updatepchprojectpartsmessage.h +++ b/src/libs/clangbackendipc/updatepchprojectpartsmessage.h @@ -36,42 +36,42 @@ public: UpdatePchProjectPartsMessage() = default; UpdatePchProjectPartsMessage(V2::ProjectPartContainers &&projectsParts, V2::FileContainers &&generatedFiles) - : projectsParts_(std::move(projectsParts)), - generatedFiles_(std::move(generatedFiles)) + : m_projectsParts(std::move(projectsParts)), + m_generatedFiles(std::move(generatedFiles)) {} const V2::ProjectPartContainers &projectsParts() const { - return projectsParts_; + return m_projectsParts; } V2::ProjectPartContainers takeProjectsParts() { - return std::move(projectsParts_); + return std::move(m_projectsParts); } const V2::FileContainers &generatedFiles() const { - return generatedFiles_; + return m_generatedFiles; } V2::FileContainers takeGeneratedFiles() { - return std::move(generatedFiles_); + return std::move(m_generatedFiles); } friend QDataStream &operator<<(QDataStream &out, const UpdatePchProjectPartsMessage &message) { - out << message.projectsParts_; - out << message.generatedFiles_; + out << message.m_projectsParts; + out << message.m_generatedFiles; return out; } friend QDataStream &operator>>(QDataStream &in, UpdatePchProjectPartsMessage &message) { - in >> message.projectsParts_; - in >> message.generatedFiles_; + in >> message.m_projectsParts; + in >> message.m_generatedFiles; return in; } @@ -79,19 +79,19 @@ public: friend bool operator==(const UpdatePchProjectPartsMessage &first, const UpdatePchProjectPartsMessage &second) { - return first.projectsParts_ == second.projectsParts_ - && first.generatedFiles_ == second.generatedFiles_; + return first.m_projectsParts == second.m_projectsParts + && first.m_generatedFiles == second.m_generatedFiles; } UpdatePchProjectPartsMessage clone() const { - return UpdatePchProjectPartsMessage(Utils::clone(projectsParts_), - Utils::clone(generatedFiles_)); + return UpdatePchProjectPartsMessage(Utils::clone(m_projectsParts), + Utils::clone(m_generatedFiles)); } private: - V2::ProjectPartContainers projectsParts_; - V2::FileContainers generatedFiles_; + V2::ProjectPartContainers m_projectsParts; + V2::FileContainers m_generatedFiles; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdatePchProjectPartsMessage &message); diff --git a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.cpp b/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.cpp index dbfddb712a9..0dc0d861a7b 100644 --- a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.cpp +++ b/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.cpp @@ -43,14 +43,13 @@ QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &me return debug; } -void PrintTo(const UpdateTranslationUnitsForEditorMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const UpdateTranslationUnitsForEditorMessage &message) { - *os << "UpdateTranslationUnitsForEditorMessage("; + os << "UpdateTranslationUnitsForEditorMessage(" + << message.fileContainers() + << ")"; - for (const FileContainer &fileContainer : message.fileContainers()) - PrintTo(fileContainer, os); - - *os << ")"; + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h b/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h index dd5807a8553..3838ea89aec 100644 --- a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h +++ b/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h @@ -36,40 +36,40 @@ class UpdateTranslationUnitsForEditorMessage public: UpdateTranslationUnitsForEditorMessage() = default; UpdateTranslationUnitsForEditorMessage(const QVector &fileContainers) - : fileContainers_(fileContainers) + : m_fileContainers(fileContainers) { } const QVector &fileContainers() const { - return fileContainers_; + return m_fileContainers; } friend QDataStream &operator<<(QDataStream &out, const UpdateTranslationUnitsForEditorMessage &message) { - out << message.fileContainers_; + out << message.m_fileContainers; return out; } friend QDataStream &operator>>(QDataStream &in, UpdateTranslationUnitsForEditorMessage &message) { - in >> message.fileContainers_; + in >> message.m_fileContainers; return in; } friend bool operator==(const UpdateTranslationUnitsForEditorMessage &first, const UpdateTranslationUnitsForEditorMessage &second) { - return first.fileContainers_ == second.fileContainers_; + return first.m_fileContainers == second.m_fileContainers; } private: - QVector fileContainers_; + QVector m_fileContainers; }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message); -void PrintTo(const UpdateTranslationUnitsForEditorMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const UpdateTranslationUnitsForEditorMessage &message); DECLARE_MESSAGE(UpdateTranslationUnitsForEditorMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp index 643be9470e3..00f154f4c83 100644 --- a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp +++ b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp @@ -47,17 +47,14 @@ QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &mess return debug; } -void PrintTo(const UpdateVisibleTranslationUnitsMessage &message, ::std::ostream* os) +std::ostream &operator<<(std::ostream &os, const UpdateVisibleTranslationUnitsMessage &message) { - *os << "UpdateVisibleTranslationUnitsMessage("; + os << "(" + << message.currentEditorFilePath() << ", " + << message.visibleEditorFilePaths() + << ")"; - *os << message.currentEditorFilePath().constData() << ", "; - - auto visiblePaths = message.visibleEditorFilePaths(); - - std::copy(visiblePaths.cbegin(), visiblePaths.cend(), std::ostream_iterator(*os, ", ")); - - *os << ")"; + return os; } } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h index 01d4e99c5a3..033d3a98a16 100644 --- a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h +++ b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h @@ -81,7 +81,7 @@ private: }; CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message); -void PrintTo(const UpdateVisibleTranslationUnitsMessage &message, ::std::ostream* os); +std::ostream &operator<<(std::ostream &os, const UpdateVisibleTranslationUnitsMessage &message); DECLARE_MESSAGE(UpdateVisibleTranslationUnitsMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/writemessageblock.cpp b/src/libs/clangbackendipc/writemessageblock.cpp index de3d6ca6439..7561d4cd642 100644 --- a/src/libs/clangbackendipc/writemessageblock.cpp +++ b/src/libs/clangbackendipc/writemessageblock.cpp @@ -35,8 +35,8 @@ namespace ClangBackEnd { WriteMessageBlock::WriteMessageBlock(QIODevice *ioDevice) - : messageCounter(0), - ioDevice(ioDevice) + : m_messageCounter(0), + m_ioDevice(ioDevice) { } @@ -48,26 +48,26 @@ void WriteMessageBlock::write(const MessageEnvelop &message) const qint32 dummyBockSize = 0; out << dummyBockSize; - out << messageCounter; + out << m_messageCounter; out << message; out.device()->seek(0); out << qint32(block.size() - sizeof(qint32)); - ++messageCounter; + ++m_messageCounter; - ioDevice->write(block); + m_ioDevice->write(block); } qint64 WriteMessageBlock::counter() const { - return messageCounter; + return m_messageCounter; } void WriteMessageBlock::resetCounter() { - messageCounter = 0; + m_messageCounter = 0; } diff --git a/src/libs/clangbackendipc/writemessageblock.h b/src/libs/clangbackendipc/writemessageblock.h index 0fa8d03dd38..edf1d74a1c7 100644 --- a/src/libs/clangbackendipc/writemessageblock.h +++ b/src/libs/clangbackendipc/writemessageblock.h @@ -49,8 +49,8 @@ public: void resetCounter(); private: - qint64 messageCounter; - QIODevice *ioDevice; + qint64 m_messageCounter; + QIODevice *m_ioDevice; }; } // namespace ClangBackEnd diff --git a/src/libs/sqlite/utf8stringvector.cpp b/src/libs/sqlite/utf8stringvector.cpp index 621f889ab00..f892a173db1 100644 --- a/src/libs/sqlite/utf8stringvector.cpp +++ b/src/libs/sqlite/utf8stringvector.cpp @@ -111,8 +111,3 @@ QDebug operator<<(QDebug debug, const Utf8StringVector &textVector) return debug; } - -void PrintTo(const Utf8StringVector &textVector, ::std::ostream* os) -{ - *os << "Utf8StringVector(" << textVector.join(Utf8StringLiteral(", ")).constData() << ")"; -} diff --git a/src/libs/sqlite/utf8stringvector.h b/src/libs/sqlite/utf8stringvector.h index b63c8f51b36..b1a2a9af11c 100644 --- a/src/libs/sqlite/utf8stringvector.h +++ b/src/libs/sqlite/utf8stringvector.h @@ -64,6 +64,34 @@ bool Utf8StringVector::removeFast(const Utf8String &valueToBeRemoved) return hasEntry; } +namespace std { // it has to be in std namespace for lookup + +template +ostream &operator<<(ostream &out, const QVector &vector) +{ + out << "["; + + copy(vector.cbegin(), vector.cend(), ostream_iterator(out, ", ")); + + out << "]"; + + return out; +} + +inline +ostream &operator<<(ostream &out, const Utf8StringVector &vector) +{ + out << "["; + + copy(vector.cbegin(), vector.cend(), ostream_iterator(out, ", ")); + + out << "]"; + + return out; +} + +} // namespace std + inline QDataStream &operator<<(QDataStream &s, const Utf8StringVector &v) { return s << static_cast &>(v); } @@ -71,6 +99,5 @@ inline QDataStream &operator>>(QDataStream &s, Utf8StringVector &v) { return s >> static_cast &>(v); } SQLITE_EXPORT QDebug operator<<(QDebug debug, const Utf8StringVector &textVector); -SQLITE_EXPORT void PrintTo(const Utf8StringVector &textVector, ::std::ostream* os); Q_DECLARE_METATYPE(Utf8StringVector) diff --git a/src/libs/utils/sizedarray.h b/src/libs/utils/sizedarray.h index 7a5e8ee7831..6e61ebc7987 100644 --- a/src/libs/utils/sizedarray.h +++ b/src/libs/utils/sizedarray.h @@ -27,11 +27,8 @@ #include #include - -#pragma push_macro("constexpr") -#ifndef __cpp_constexpr -#define constexpr -#endif +#include +#include namespace Utils { @@ -113,10 +110,17 @@ public: std::array::fill(T{}); } + friend std::ostream &operator<<(std::ostream &out, SizedArray array) + { + out << "["; + copy(array.cbegin(), array.cend(), std::ostream_iterator(out, ", ")); + out << "]"; + + return out; + } + private: std::uint8_t m_size = 0; }; } // namespace Utils - -#pragma pop_macro("constexpr") diff --git a/src/tools/clangbackend/ipcsource/highlightingmark.cpp b/src/tools/clangbackend/ipcsource/highlightingmark.cpp index b448b45f11f..d3d66282374 100644 --- a/src/tools/clangbackend/ipcsource/highlightingmark.cpp +++ b/src/tools/clangbackend/ipcsource/highlightingmark.cpp @@ -422,13 +422,15 @@ void HighlightingMark::collectKinds(CXTranslationUnit cxTranslationUnit, } } -void PrintTo(const HighlightingMark &information, ::std::ostream *os) +std::ostream &operator<<(std::ostream &os, const HighlightingMark& highlightingMark) { - *os << "type: "; - PrintTo(information.types, os); - *os << " line: " << information.line - << " column: " << information.column - << " length: " << information.length; + os << "(type: " << highlightingMark.types << ", " + << " line: " << highlightingMark.line << ", " + << " column: " << highlightingMark.column << ", " + << " length: " << highlightingMark.length + << ")"; + + return os; } } // namespace ClangBackEnd diff --git a/src/tools/clangbackend/ipcsource/highlightingmark.h b/src/tools/clangbackend/ipcsource/highlightingmark.h index f678e0954c8..9d3f2f8feee 100644 --- a/src/tools/clangbackend/ipcsource/highlightingmark.h +++ b/src/tools/clangbackend/ipcsource/highlightingmark.h @@ -37,7 +37,6 @@ namespace ClangBackEnd { class HighlightingMark { friend bool operator==(const HighlightingMark &first, const HighlightingMark &second); - friend void PrintTo(const HighlightingMark& highlightingMark, ::std::ostream *os); enum class Recursion { FirstPass, @@ -78,6 +77,8 @@ private: void filterOutPreviousOutputArguments(); bool isArgumentInCurrentOutputArgumentLocations() const; + friend std::ostream &operator<<(std::ostream &os, const HighlightingMark& highlightingMark); + private: std::vector *currentOutputArgumentRanges = nullptr; Cursor originalCursor; @@ -88,7 +89,6 @@ private: HighlightingTypes types; }; -void PrintTo(const HighlightingMark& highlightingMark, ::std::ostream *os); inline bool operator==(const HighlightingMark &first, const HighlightingMark &second) {