ClangSupport: Rename export macro

Change-Id: Ia314f82212210f8ed17067c1f8bb412367e6aa90
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

src/libs/clangsupport/cancelmessage.h

@@ -48,7 +48,7 @@ public:
     }
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CancelMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CancelMessage &message);
 std::ostream &operator<<(std::ostream &os, const CancelMessage &message);
 
 DECLARE_MESSAGE(CancelMessage)

src/libs/clangsupport/clangcodemodelclientinterface.h

@@ -49,7 +49,7 @@ class UnregisterUnsavedFilesForEditorMessage;
 class UpdateTranslationUnitsForEditorMessage;
 class UpdateVisibleTranslationUnitsMessage;
 
-class CMBIPC_EXPORT ClangCodeModelClientInterface : public IpcClientInterface
+class CLANGSUPPORT_EXPORT ClangCodeModelClientInterface : public IpcClientInterface
 {
 public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;

src/libs/clangsupport/clangcodemodelclientproxy.h

@@ -41,7 +41,7 @@ QT_END_NAMESPACE
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT ClangCodeModelClientProxy : public ClangCodeModelClientInterface
+class CLANGSUPPORT_EXPORT ClangCodeModelClientProxy : public ClangCodeModelClientInterface
 {
 public:
     explicit ClangCodeModelClientProxy(ClangCodeModelServerInterface *server, QIODevice *ioDevice);

src/libs/clangsupport/clangcodemodelconnectionclient.h

@@ -29,7 +29,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT ClangCodeModelConnectionClient : public ConnectionClient
+class CLANGSUPPORT_EXPORT ClangCodeModelConnectionClient : public ConnectionClient
 {
 public:
     ClangCodeModelConnectionClient(ClangCodeModelClientInterface *client);

src/libs/clangsupport/clangcodemodelserverinterface.h

@@ -33,7 +33,7 @@ namespace ClangBackEnd {
 
 class ClangCodeModelClientInterface;
 
-class CMBIPC_EXPORT ClangCodeModelServerInterface : public IpcServerInterface
+class CLANGSUPPORT_EXPORT ClangCodeModelServerInterface : public IpcServerInterface
 {
 public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;

src/libs/clangsupport/clangcodemodelserverproxy.h

@@ -42,7 +42,7 @@ QT_END_NAMESPACE
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT ClangCodeModelServerProxy : public ClangCodeModelServerInterface
+class CLANGSUPPORT_EXPORT ClangCodeModelServerProxy : public ClangCodeModelServerInterface
 {
 public:
     ClangCodeModelServerProxy(ClangCodeModelClientInterface *client, QIODevice *ioDevice);

src/libs/clangsupport/clangsupport_global.h

@@ -36,11 +36,11 @@
 #endif
 
 #if defined(CLANGSUPPORT_BUILD_LIB)
-#  define CMBIPC_EXPORT Q_DECL_EXPORT
+#  define CLANGSUPPORT_EXPORT Q_DECL_EXPORT
 #elif defined(CLANGSUPPORT_BUILD_STATIC_LIB)
-#  define CMBIPC_EXPORT
+#  define CLANGSUPPORT_EXPORT
 #else
-#  define CMBIPC_EXPORT Q_DECL_IMPORT
+#  define CLANGSUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 #ifndef CLANGBACKENDPROCESSPATH

src/libs/clangsupport/clangsupportdebugutils.h

@@ -37,7 +37,7 @@ namespace ClangBackEnd {
 Utf8String debugWriteFileForInspection(const Utf8String &fileContent, const Utf8String &id);
 Utf8String debugId(const FileContainer &fileContainer);
 
-class CMBIPC_EXPORT VerboseScopeDurationTimer
+class CLANGSUPPORT_EXPORT VerboseScopeDurationTimer
 {
 public:
     VerboseScopeDurationTimer(const char *id = 0);

src/libs/clangsupport/cmbalivemessage.h

@@ -52,7 +52,7 @@ public:
     }
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const AliveMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const AliveMessage &message);
 std::ostream &operator<<(std::ostream &os, const AliveMessage &message);
 
 DECLARE_MESSAGE(AliveMessage)

src/libs/clangsupport/cmbcodecompletedmessage.h

@@ -90,7 +90,7 @@ public:
             && first.m_codeCompletions == second.m_codeCompletions;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const CodeCompletedMessage &message);
 
 private:

src/libs/clangsupport/cmbcompletecodemessage.h

@@ -126,13 +126,13 @@ public:
                 && first.m_funcNameStartColumn == second.m_funcNameStartColumn;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const CompleteCodeMessage &message);
 
 private:
     Utf8String m_filePath;
     Utf8String m_projectPartId;
-    static CMBIPC_EXPORT quint64 ticketCounter;
+    static CLANGSUPPORT_EXPORT quint64 ticketCounter;
     quint64 m_ticketNumber = 0;
     quint32 m_line = 0;
     quint32 m_column = 0;

src/libs/clangsupport/cmbechomessage.h

@@ -70,7 +70,7 @@ private:
     MessageEnvelop m_message;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EchoMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const EchoMessage &message);
 std::ostream &operator<<(std::ostream &os, const EchoMessage &message);
 
 DECLARE_MESSAGE(EchoMessage)

src/libs/clangsupport/cmbendmessage.h

@@ -52,7 +52,7 @@ public:
     }
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EndMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const EndMessage &message);
 std::ostream &operator<<(std::ostream &os, const EndMessage &message);
 
 DECLARE_MESSAGE(EndMessage)

src/libs/clangsupport/cmbregisterprojectsforeditormessage.h

@@ -69,7 +69,7 @@ private:
     QVector<ProjectPartContainer> m_projectContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const RegisterProjectPartsForEditorMessage &message);
 
 DECLARE_MESSAGE(RegisterProjectPartsForEditorMessage);

src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h

@@ -91,7 +91,7 @@ private:
     Utf8StringVector visibleEditorFilePaths_;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message);
 
 DECLARE_MESSAGE(RegisterTranslationUnitForEditorMessage);
 } // namespace ClangBackEnd

src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h

@@ -33,7 +33,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT UnregisterProjectPartsForEditorMessage
+class CLANGSUPPORT_EXPORT UnregisterProjectPartsForEditorMessage
 {
 public:
     UnregisterProjectPartsForEditorMessage() = default;
@@ -70,7 +70,7 @@ private:
     Utf8StringVector m_projectPartIds;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const UnregisterProjectPartsForEditorMessage &message);
 
 DECLARE_MESSAGE(UnregisterProjectPartsForEditorMessage);

src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h

@@ -72,7 +72,7 @@ private:
     QVector<FileContainer> m_fileContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message);
 
 DECLARE_MESSAGE(UnregisterTranslationUnitsForEditorMessage);
 } // namespace ClangBackEnd

src/libs/clangsupport/codecompletion.h

@@ -193,7 +193,7 @@ public:
                 && first.m_completionKind == second.m_completionKind;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletion &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletion &message);
     friend std::ostream &operator<<(std::ostream &os, const CodeCompletion &message);
 
 private:
@@ -206,8 +206,8 @@ private:
     bool m_hasParameters = false;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, CodeCompletion::Kind kind);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, CodeCompletion::Kind kind);
 
-CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, const CodeCompletion::Kind kind);
-CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, const CodeCompletion::Availability availability);
+CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, const CodeCompletion::Kind kind);
+CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, const CodeCompletion::Availability availability);
 } // namespace ClangBackEnd

src/libs/clangsupport/codecompletionchunk.h

@@ -125,7 +125,7 @@ private:
     bool m_isOptional = false;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk);
 
 std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk &chunk);
 std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk::Kind &kind);

src/libs/clangsupport/connectionclient.h

@@ -48,7 +48,7 @@ namespace ClangBackEnd {
 
 class FileContainer;
 
-class CMBIPC_EXPORT ConnectionClient : public QObject
+class CLANGSUPPORT_EXPORT ConnectionClient : public QObject
 {
     Q_OBJECT
 

src/libs/clangsupport/connectionserver.h

@@ -41,7 +41,7 @@ namespace ClangBackEnd {
 class ClangCodeModelServerInterface;
 class ClangCodeModelClientProxy;
 
-struct CMBIPC_EXPORT ConnectionName {
+struct CLANGSUPPORT_EXPORT ConnectionName {
     static QString connectionName;
 };
 

src/libs/clangsupport/diagnosticcontainer.h

@@ -161,7 +161,7 @@ private:
     DiagnosticSeverity m_severity = DiagnosticSeverity::Ignored;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DiagnosticContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DiagnosticContainer &container);
 std::ostream &operator<<(std::ostream &os, const DiagnosticContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/documentannotationschangedmessage.h

@@ -35,7 +35,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT DocumentAnnotationsChangedMessage
+class CLANGSUPPORT_EXPORT DocumentAnnotationsChangedMessage
 {
 public:
     DocumentAnnotationsChangedMessage() = default;
@@ -117,7 +117,7 @@ private:
     QVector<SourceRangeContainer> m_skippedPreprocessorRanges;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message);
 std::ostream &operator<<(std::ostream &os, const DocumentAnnotationsChangedMessage &message);
 
 DECLARE_MESSAGE(DocumentAnnotationsChangedMessage)

src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h

@@ -98,7 +98,7 @@ private:
 
 using DynamicASTMatcherDiagnosticContainers = std::vector<DynamicASTMatcherDiagnosticContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &container);
 std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h

@@ -55,7 +55,7 @@ public:
         return m_contextType;
     }
 
-    CMBIPC_EXPORT Utils::SmallString contextTypeText() const;
+    CLANGSUPPORT_EXPORT Utils::SmallString contextTypeText() const;
 
     const Utils::SmallStringVector &arguments() const
     {
@@ -107,7 +107,7 @@ private:
 
 using DynamicASTMatcherDiagnosticContextContainers = std::vector<DynamicASTMatcherDiagnosticContextContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContainer &container);
 std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContextContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h

@@ -55,7 +55,7 @@ public:
         return m_errorType;
     }
 
-    CMBIPC_EXPORT Utils::SmallString errorTypeText() const;
+    CLANGSUPPORT_EXPORT Utils::SmallString errorTypeText() const;
 
     const Utils::SmallStringVector &arguments() const
     {
@@ -107,7 +107,7 @@ private:
 
 using DynamicASTMatcherDiagnosticMessageContainers = std::vector<DynamicASTMatcherDiagnosticMessageContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticMessageContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticMessageContainer &container);
 std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticMessageContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/filecontainer.h

@@ -146,7 +146,7 @@ private:
     bool m_hasUnsavedFileContent = false;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
 std::ostream &operator<<(std::ostream &os, const FileContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/filecontainerv2.h

@@ -129,7 +129,7 @@ private:
 
 using FileContainers = std::vector<FileContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
 std::ostream &operator<<(std::ostream &os, const FileContainer &container);
 
 } // namespace V2

src/libs/clangsupport/filepath.h

@@ -130,6 +130,6 @@ private:
     std::size_t m_slashIndex = 0;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FilePath &filePath);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FilePath &filePath);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/fixitcontainer.h

@@ -78,7 +78,7 @@ private:
     Utf8String m_text;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FixItContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FixItContainer &container);
 std::ostream &operator<<(std::ostream &os, const FixItContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/followsymbolmessage.h

@@ -83,7 +83,7 @@ public:
                 && first.m_sourceRange == second.m_sourceRange;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FollowSymbolMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FollowSymbolMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const FollowSymbolMessage &message);
 private:
     FileContainer m_fileContainer;

src/libs/clangsupport/highlightingmarkcontainer.h

@@ -200,9 +200,9 @@ inline bool operator==(const HighlightingTypes &first, const HighlightingTypes &
         && first.mixinHighlightingTypes == second.mixinHighlightingTypes;
 }
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const HighlightingMarkContainer &container);
-CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType);
-CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingTypes types);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const HighlightingMarkContainer &container);
+CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType);
+CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingTypes types);
 std::ostream &operator<<(std::ostream &os, const HighlightingMarkContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/ipcclientinterface.h

@@ -29,7 +29,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT IpcClientInterface : public IpcInterface
+class CLANGSUPPORT_EXPORT IpcClientInterface : public IpcInterface
 {
 public:
     IpcClientInterface();

src/libs/clangsupport/ipcinterface.h

@@ -33,7 +33,7 @@ namespace ClangBackEnd {
 
 class MessageEnvelop;
 
-class CMBIPC_EXPORT IpcInterface
+class CLANGSUPPORT_EXPORT IpcInterface
 {
 public:
     virtual ~IpcInterface();

src/libs/clangsupport/lineprefixer.h

@@ -33,7 +33,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT LinePrefixer
+class CLANGSUPPORT_EXPORT LinePrefixer
 {
 public:
     LinePrefixer() = default;

src/libs/clangsupport/pchmanagerclientinterface.h

@@ -31,7 +31,7 @@ namespace ClangBackEnd {
 
 class PrecompiledHeadersUpdatedMessage;
 
-class CMBIPC_EXPORT PchManagerClientInterface : public IpcClientInterface
+class CLANGSUPPORT_EXPORT PchManagerClientInterface : public IpcClientInterface
 {
 public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;

src/libs/clangsupport/pchmanagerclientproxy.h

@@ -34,7 +34,7 @@ namespace ClangBackEnd {
 
 class PchManagerServerInterface;
 
-class CMBIPC_EXPORT PchManagerClientProxy : public PchManagerClientInterface
+class CLANGSUPPORT_EXPORT PchManagerClientProxy : public PchManagerClientInterface
 {
 public:
     explicit PchManagerClientProxy(PchManagerServerInterface *server, QIODevice *ioDevice);

src/libs/clangsupport/pchmanagerserverinterface.h

@@ -35,7 +35,7 @@ class PchManagerClientInterface;
 class RemovePchProjectPartsMessage;
 class UpdatePchProjectPartsMessage;
 
-class CMBIPC_EXPORT PchManagerServerInterface : public ProjectManagementServerInterface
+class CLANGSUPPORT_EXPORT PchManagerServerInterface : public ProjectManagementServerInterface
 {
 public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;

src/libs/clangsupport/pchmanagerserverproxy.h

@@ -42,7 +42,7 @@ namespace ClangBackEnd {
 
 class PchManagerClientInterface;
 
-class CMBIPC_EXPORT PchManagerServerProxy final : public PchManagerServerInterface
+class CLANGSUPPORT_EXPORT PchManagerServerProxy final : public PchManagerServerInterface
 {
 public:
     explicit PchManagerServerProxy(PchManagerClientInterface *client, QIODevice *ioDevice);

src/libs/clangsupport/precompiledheadersupdatedmessage.cpp

@@ -29,7 +29,7 @@
 
 namespace ClangBackEnd {
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &)
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &)
 {
     debug.nospace() << "PrecompiledHeaderUpdatedMessage()";
 

src/libs/clangsupport/precompiledheadersupdatedmessage.h

@@ -71,7 +71,7 @@ private:
     std::vector<ProjectPartPch> m_projectPartPchs;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &message);
 std::ostream &operator<<(std::ostream &out, const PrecompiledHeadersUpdatedMessage &message);
 
 DECLARE_MESSAGE(PrecompiledHeadersUpdatedMessage)

src/libs/clangsupport/projectmanagementserverinterface.h

@@ -32,7 +32,7 @@ namespace ClangBackEnd {
 class RemovePchProjectPartsMessage;
 class UpdatePchProjectPartsMessage;
 
-class CMBIPC_EXPORT ProjectManagementServerInterface : public IpcInterface
+class CLANGSUPPORT_EXPORT ProjectManagementServerInterface : public IpcInterface
 {
 public:
     virtual void updatePchProjectParts(UpdatePchProjectPartsMessage &&message) = 0;

src/libs/clangsupport/projectpartpch.h

@@ -83,6 +83,6 @@ private:
     Utils::SmallString m_pchPath;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const ProjectPartPch &projectPartPch);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const ProjectPartPch &projectPartPch);
 std::ostream &operator<<(std::ostream &out, const ProjectPartPch &projectPartPch);
 } // namespace ClangBackEnd

src/libs/clangsupport/refactoringclientinterface.h

@@ -36,7 +36,7 @@ class SourceRangesAndDiagnosticsForQueryMessage;
 class SourceRangesForQueryMessage;
 class SourceLocationsContainer;
 
-class CMBIPC_EXPORT RefactoringClientInterface : public IpcClientInterface
+class CLANGSUPPORT_EXPORT RefactoringClientInterface : public IpcClientInterface
 {
 public:
     using RenameCallback = std::function<void(const QString &,

src/libs/clangsupport/refactoringclientproxy.h

@@ -36,7 +36,7 @@ namespace ClangBackEnd {
 
 class RefactoringServerInterface;
 
-class CMBIPC_EXPORT RefactoringClientProxy : public RefactoringClientInterface
+class CLANGSUPPORT_EXPORT RefactoringClientProxy : public RefactoringClientInterface
 {
 public:
     explicit RefactoringClientProxy(RefactoringServerInterface *server, QIODevice *ioDevice);

src/libs/clangsupport/refactoringserverinterface.h

@@ -39,7 +39,7 @@ class CancelMessage;
 class UpdatePchProjectPartsMessage;
 class RemovePchProjectPartsMessage;
 
-class CMBIPC_EXPORT RefactoringServerInterface : public ProjectManagementServerInterface
+class CLANGSUPPORT_EXPORT RefactoringServerInterface : public ProjectManagementServerInterface
 
 {
 public:

src/libs/clangsupport/refactoringserverproxy.h

@@ -42,7 +42,7 @@ namespace ClangBackEnd {
 
 class RefactoringClientInterface;
 
-class CMBIPC_EXPORT RefactoringServerProxy final : public RefactoringServerInterface
+class CLANGSUPPORT_EXPORT RefactoringServerProxy final : public RefactoringServerInterface
 {
 public:
     explicit RefactoringServerProxy(RefactoringClientInterface *client, QIODevice *ioDevice);

src/libs/clangsupport/referencesmessage.h

@@ -96,7 +96,7 @@ public:
             && first.m_references == second.m_references;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const ReferencesMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const ReferencesMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const ReferencesMessage &message);
 
 private:

src/libs/clangsupport/registerunsavedfilesforeditormessage.h

@@ -68,7 +68,7 @@ private:
     QVector<FileContainer> m_fileContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const RegisterUnsavedFilesForEditorMessage &message);
 
 DECLARE_MESSAGE(RegisterUnsavedFilesForEditorMessage);

src/libs/clangsupport/removepchprojectpartsmessage.cpp

@@ -27,7 +27,7 @@
 
 namespace ClangBackEnd {
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message)
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message)
 {
     debug.nospace() << "RemoveProjectPartsMessage("
                     << message.projectsPartIds() << ")";

src/libs/clangsupport/removepchprojectpartsmessage.h

@@ -76,7 +76,7 @@ private:
     Utils::SmallStringVector m_projectsPartIds;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message);
 std::ostream &operator<<(std::ostream &out, const RemovePchProjectPartsMessage &message);
 
 DECLARE_MESSAGE(RemovePchProjectPartsMessage)

src/libs/clangsupport/requestdocumentannotations.h

@@ -66,7 +66,7 @@ private:
     FileContainer m_fileContainer;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message);
 std::ostream &operator<<(std::ostream &os, const RequestDocumentAnnotationsMessage &message);
 
 DECLARE_MESSAGE(RequestDocumentAnnotationsMessage);

src/libs/clangsupport/requestfollowsymbolmessage.h

@@ -106,7 +106,7 @@ public:
             && first.m_dependentFiles == second.m_dependentFiles;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestFollowSymbolMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestFollowSymbolMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const RequestFollowSymbolMessage &message);
 private:
     FileContainer m_fileContainer;
@@ -114,7 +114,7 @@ private:
     quint32 m_line = 0;
     quint32 m_column = 0;
     QVector<Utf8String> m_dependentFiles;
-    static CMBIPC_EXPORT quint64 ticketCounter;
+    static CLANGSUPPORT_EXPORT quint64 ticketCounter;
 };
 
 DECLARE_MESSAGE(RequestFollowSymbolMessage);

src/libs/clangsupport/requestreferencesmessage.h

@@ -96,7 +96,7 @@ public:
             && first.m_fileContainer == second.m_fileContainer;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestReferencesMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestReferencesMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const RequestReferencesMessage &message);
 
 private:
@@ -104,7 +104,7 @@ private:
     quint64 m_ticketNumber = 0;
     quint32 m_line = 0;
     quint32 m_column = 0;
-    static CMBIPC_EXPORT quint64 ticketCounter;
+    static CLANGSUPPORT_EXPORT quint64 ticketCounter;
 };
 
 DECLARE_MESSAGE(RequestReferencesMessage);

src/libs/clangsupport/requestsourcelocationforrenamingmessage.h

@@ -32,7 +32,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT RequestSourceLocationsForRenamingMessage
+class CLANGSUPPORT_EXPORT RequestSourceLocationsForRenamingMessage
 {
 public:
     RequestSourceLocationsForRenamingMessage() = default;
@@ -132,7 +132,7 @@ private:
     int m_revision = 1;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestSourceLocationsForRenamingMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceLocationsForRenamingMessage &message);
 std::ostream &operator<<(std::ostream &os, const RequestSourceLocationsForRenamingMessage &message);
 
 DECLARE_MESSAGE(RequestSourceLocationsForRenamingMessage)

src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h

@@ -93,7 +93,7 @@ private:
     V2::FileContainer m_source;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesAndDiagnosticsForQueryMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesAndDiagnosticsForQueryMessage &message);
 std::ostream &operator<<(std::ostream &os, const RequestSourceRangesAndDiagnosticsForQueryMessage &message);
 
 DECLARE_MESSAGE(RequestSourceRangesAndDiagnosticsForQueryMessage)

src/libs/clangsupport/requestsourcerangesforquerymessage.h

@@ -110,7 +110,7 @@ private:
 };
 
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesForQueryMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesForQueryMessage &message);
 std::ostream &operator<<(std::ostream &os, const RequestSourceRangesForQueryMessage &message);
 
 DECLARE_MESSAGE(RequestSourceRangesForQueryMessage)

src/libs/clangsupport/sourcelocationcontainer.h

@@ -31,12 +31,12 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT SourceLocationContainer
+class CLANGSUPPORT_EXPORT SourceLocationContainer
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container);
-    friend CMBIPC_EXPORT bool operator==(const SourceLocationContainer &first, const SourceLocationContainer &second);
-    friend CMBIPC_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second);
+    friend CLANGSUPPORT_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);
+    friend CLANGSUPPORT_EXPORT QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container);
+    friend CLANGSUPPORT_EXPORT bool operator==(const SourceLocationContainer &first, const SourceLocationContainer &second);
+    friend CLANGSUPPORT_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second);
 public:
     SourceLocationContainer() = default;
     SourceLocationContainer(const Utf8String &filePath,
@@ -53,12 +53,12 @@ private:
     uint m_column = 0;
 };
 
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container);
-CMBIPC_EXPORT bool operator==(const SourceLocationContainer &first, const SourceLocationContainer &second);
-CMBIPC_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second);
+CLANGSUPPORT_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);
+CLANGSUPPORT_EXPORT QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container);
+CLANGSUPPORT_EXPORT bool operator==(const SourceLocationContainer &first, const SourceLocationContainer &second);
+CLANGSUPPORT_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second);
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/sourcelocationcontainerv2.h

@@ -119,7 +119,7 @@ private:
     uint m_offset = 0;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container);
 
 } // namespace V2

src/libs/clangsupport/sourcelocationscontainer.h

@@ -100,7 +100,7 @@ public:
 };
 
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceLocationsContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/sourcelocationsforrenamingmessage.h

@@ -96,7 +96,7 @@ private:
     int m_revision = 0;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsForRenamingMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsForRenamingMessage &message);
 std::ostream &operator<<(std::ostream &os, const SourceLocationsForRenamingMessage &message);
 
 DECLARE_MESSAGE(SourceLocationsForRenamingMessage)

src/libs/clangsupport/sourcerangecontainer.h

@@ -79,7 +79,7 @@ private:
 
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/sourcerangecontainerv2.h

@@ -109,7 +109,7 @@ private:
 
 using SourceRangeContainers = std::vector<SourceRangeContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container);
 } // namespace V2
 } // namespace ClangBackEnd

src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h

@@ -95,7 +95,7 @@ private:
     DynamicASTMatcherDiagnosticContainers m_diagnosticContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangesAndDiagnosticsForQueryMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesAndDiagnosticsForQueryMessage &message);
 std::ostream &operator<<(std::ostream &os, const SourceRangesAndDiagnosticsForQueryMessage &message);
 
 DECLARE_MESSAGE(SourceRangesAndDiagnosticsForQueryMessage)

src/libs/clangsupport/sourcerangescontainer.h

@@ -124,7 +124,7 @@ public:
 };
 
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangesContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceRangesContainer &container);
 
 } // namespace ClangBackEnd

src/libs/clangsupport/sourcerangesforquerymessage.h

@@ -78,7 +78,7 @@ private:
     SourceRangesContainer m_sourceRangesContainer;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangesForQueryMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesForQueryMessage &message);
 std::ostream &operator<<(std::ostream &os, const SourceRangesForQueryMessage &message);
 
 DECLARE_MESSAGE(SourceRangesForQueryMessage)

src/libs/clangsupport/sourcerangewithtextcontainer.h

@@ -112,7 +112,7 @@ private:
 
 using SourceRangeWithTextContainers = std::vector<SourceRangeWithTextContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceRangeWithTextContainer &container);
 } // namespace ClangBackEnd
 

src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h

@@ -69,7 +69,7 @@ private:
     QVector<FileContainer> m_fileContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const UnregisterUnsavedFilesForEditorMessage &message);
 
 DECLARE_MESSAGE(UnregisterUnsavedFilesForEditorMessage)

src/libs/clangsupport/updatepchprojectpartsmessage.h

@@ -94,7 +94,7 @@ private:
     V2::FileContainers m_generatedFiles;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdatePchProjectPartsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdatePchProjectPartsMessage &message);
 std::ostream &operator<<(std::ostream &out, const UpdatePchProjectPartsMessage &message);
 
 DECLARE_MESSAGE(UpdatePchProjectPartsMessage)

src/libs/clangsupport/updatetranslationunitsforeditormessage.h

@@ -68,7 +68,7 @@ private:
     QVector<FileContainer> m_fileContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const UpdateTranslationUnitsForEditorMessage &message);
 
 DECLARE_MESSAGE(UpdateTranslationUnitsForEditorMessage)

src/libs/clangsupport/updatevisibletranslationunitsmessage.h

@@ -80,7 +80,7 @@ private:
     Utf8StringVector visibleEditorFilePaths_;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message);
 std::ostream &operator<<(std::ostream &os, const UpdateVisibleTranslationUnitsMessage &message);
 
 DECLARE_MESSAGE(UpdateVisibleTranslationUnitsMessage)