Commit 1402c067 authored by Marco Bubke's avatar Marco Bubke

Clang: Rename CodeModelBackEnd in ClangBackEnd

Change-Id: I13e8a458634110456375956d4d4da7239c86957f
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@theqtcompany.com>
parent 1e92b846
...@@ -117,7 +117,7 @@ tmp/ ...@@ -117,7 +117,7 @@ tmp/
*.dll *.dll
*.exe *.exe
/bin/buildoutputparser /bin/buildoutputparser
/bin/codemodelbackend /bin/clangbackend
/bin/cpaster /bin/cpaster
/bin/cplusplus-ast2png /bin/cplusplus-ast2png
/bin/cplusplus-frontend /bin/cplusplus-frontend
......
contains(CONFIG, dll) { contains(CONFIG, dll) {
DEFINES += CODEMODELBACKENDIPC_BUILD_LIB DEFINES += CLANGBACKENDIPC_BUILD_LIB
} else { } else {
DEFINES += CODEMODELBACKENDIPC_BUILD_STATIC_LIB DEFINES += CLANGBACKENDIPC_BUILD_STATIC_LIB
} }
QT += network QT += network
DEFINES += CODEMODELBACKENDIPC_LIBRARY DEFINES += CLANGBACKENDIPC_LIBRARY
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
...@@ -31,7 +31,6 @@ SOURCES += $$PWD/ipcserverinterface.cpp \ ...@@ -31,7 +31,6 @@ SOURCES += $$PWD/ipcserverinterface.cpp \
$$PWD/cmbcompletecodecommand.cpp \ $$PWD/cmbcompletecodecommand.cpp \
$$PWD/cmbcodecompletedcommand.cpp \ $$PWD/cmbcodecompletedcommand.cpp \
$$PWD/codecompletion.cpp \ $$PWD/codecompletion.cpp \
$$PWD/codemodelbackendipc_global.cpp \
$$PWD/cmbregisterprojectsforcodecompletioncommand.cpp \ $$PWD/cmbregisterprojectsforcodecompletioncommand.cpp \
$$PWD/cmbunregisterprojectsforcodecompletioncommand.cpp \ $$PWD/cmbunregisterprojectsforcodecompletioncommand.cpp \
$$PWD/translationunitdoesnotexistcommand.cpp \ $$PWD/translationunitdoesnotexistcommand.cpp \
...@@ -40,7 +39,7 @@ SOURCES += $$PWD/ipcserverinterface.cpp \ ...@@ -40,7 +39,7 @@ SOURCES += $$PWD/ipcserverinterface.cpp \
$$PWD/projectpartsdonotexistcommand.cpp $$PWD/projectpartsdonotexistcommand.cpp
HEADERS += $$PWD/codemodelbackendipc_global.h \ HEADERS += \
$$PWD/ipcserverinterface.h \ $$PWD/ipcserverinterface.h \
$$PWD/ipcserverproxy.h \ $$PWD/ipcserverproxy.h \
$$PWD/ipcserver.h \ $$PWD/ipcserver.h \
...@@ -68,6 +67,7 @@ HEADERS += $$PWD/codemodelbackendipc_global.h \ ...@@ -68,6 +67,7 @@ HEADERS += $$PWD/codemodelbackendipc_global.h \
$$PWD/codecompletionchunk.h \ $$PWD/codecompletionchunk.h \
$$PWD/projectpartcontainer.h \ $$PWD/projectpartcontainer.h \
$$PWD/projectpartsdonotexistcommand.h \ $$PWD/projectpartsdonotexistcommand.h \
$$PWD/container_common.h $$PWD/container_common.h \
$$PWD/clangbackendipc_global.h
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
include(../../qtcreatorlibrary.pri) include(../../qtcreatorlibrary.pri)
include(codemodelbackendipc-lib.pri) include(clangbackendipc-lib.pri)
import qbs 1.0 import qbs 1.0
QtcLibrary { QtcLibrary {
name: "CodeModelBackEndIpc" name: "ClangBackEndIpc"
Depends { name: "Qt.network" } Depends { name: "Qt.network" }
Depends { name: "Sqlite" } Depends { name: "Sqlite" }
cpp.defines: base.concat("CODEMODELBACKENDIPC_LIBRARY") cpp.defines: base.concat("CLANGIPC_LIBRARY")
cpp.includePaths: base.concat(".") cpp.includePaths: base.concat(".")
Group { Group {
......
QTC_LIB_NAME = Clangbackendipc
QTC_LIB_DEPENDS += sqlite
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/clangbackendipc
...@@ -28,23 +28,23 @@ ...@@ -28,23 +28,23 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef CODEMODELBACKENDIPC_GLOBAL_H #ifndef CLANGBACKENDIPC_GLOBAL_H
#define CODEMODELBACKENDIPC_GLOBAL_H #define CLANGBACKENDIPC_GLOBAL_H
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#if defined(CODEMODELBACKENDIPC_LIBRARY) #if defined(CLANGBACKENDIPC_LIBRARY)
# define CMBIPC_EXPORT Q_DECL_EXPORT # define CMBIPC_EXPORT Q_DECL_EXPORT
#else #else
# define CMBIPC_EXPORT Q_DECL_IMPORT # define CMBIPC_EXPORT Q_DECL_IMPORT
#endif #endif
#ifndef CODEMODELBACKENDPROCESSPATH #ifndef CLANGBACKENDPROCESSPATH
# define CODEMODELBACKENDPROCESSPATH "" # define CLANGBACKENDPROCESSPATH ""
#endif #endif
namespace CodeModelBackEnd { namespace ClangBackEnd {
CMBIPC_EXPORT void registerTypes(); CMBIPC_EXPORT void registerTypes();
} }
#endif // CODEMODELBACKENDIPC_GLOBAL_H #endif // CLANGBACKENDIPC_GLOBAL_H
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <QDataStream> #include <QDataStream>
namespace CodeModelBackEnd { namespace ClangBackEnd {
QDataStream &operator<<(QDataStream &out, const AliveCommand &/*command*/) QDataStream &operator<<(QDataStream &out, const AliveCommand &/*command*/)
{ {
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#ifndef CMBALIVECOMMAND_H #ifndef CMBALIVECOMMAND_H
#define CMBALIVECOMMAND_H #define CMBALIVECOMMAND_H
#include "codemodelbackendipc_global.h" #include "clangbackendipc_global.h"
#include <QMetaType> #include <QMetaType>
namespace CodeModelBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT AliveCommand class CMBIPC_EXPORT AliveCommand
{ {
...@@ -50,6 +50,6 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const AliveCommand &command); ...@@ -50,6 +50,6 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const AliveCommand &command);
} }
Q_DECLARE_METATYPE(CodeModelBackEnd::AliveCommand) Q_DECLARE_METATYPE(ClangBackEnd::AliveCommand)
#endif // CMBALIVECOMMAND_H #endif // CMBALIVECOMMAND_H
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <ostream> #include <ostream>
namespace CodeModelBackEnd { namespace ClangBackEnd {
CodeCompletedCommand::CodeCompletedCommand(const QVector<CodeCompletion> &codeCompletions, quint64 ticketNumber) CodeCompletedCommand::CodeCompletedCommand(const QVector<CodeCompletion> &codeCompletions, quint64 ticketNumber)
: codeCompletions_(codeCompletions), : codeCompletions_(codeCompletions),
...@@ -102,5 +102,5 @@ void PrintTo(const CodeCompletedCommand &command, ::std::ostream* os) ...@@ -102,5 +102,5 @@ void PrintTo(const CodeCompletedCommand &command, ::std::ostream* os)
*os << output.toUtf8().constData(); *os << output.toUtf8().constData();
} }
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef CODEMODELBACKEND_CODECOMPLETEDCOMMAND_H #ifndef CLANGBACKEND_CODECOMPLETEDCOMMAND_H
#define CODEMODELBACKEND_CODECOMPLETEDCOMMAND_H #define CLANGBACKEND_CODECOMPLETEDCOMMAND_H
#include <QMetaType> #include <QMetaType>
#include <QVector> #include <QVector>
#include "codecompletion.h" #include "codecompletion.h"
namespace CodeModelBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT CodeCompletedCommand class CMBIPC_EXPORT CodeCompletedCommand
{ {
...@@ -67,8 +67,8 @@ CMBIPC_EXPORT bool operator<(const CodeCompletedCommand &first, const CodeComple ...@@ -67,8 +67,8 @@ CMBIPC_EXPORT bool operator<(const CodeCompletedCommand &first, const CodeComple
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedCommand &command); CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedCommand &command);
void PrintTo(const CodeCompletedCommand &command, ::std::ostream* os); void PrintTo(const CodeCompletedCommand &command, ::std::ostream* os);
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
Q_DECLARE_METATYPE(CodeModelBackEnd::CodeCompletedCommand) Q_DECLARE_METATYPE(ClangBackEnd::CodeCompletedCommand)
#endif // CODEMODELBACKEND_CODECOMPLETEDCOMMAND_H #endif // CLANGBACKEND_CODECOMPLETEDCOMMAND_H
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <QDataStream> #include <QDataStream>
namespace CodeModelBackEnd { namespace ClangBackEnd {
void Commands::registerCommands() void Commands::registerCommands()
{ {
...@@ -104,5 +104,5 @@ void Commands::registerCommands() ...@@ -104,5 +104,5 @@ void Commands::registerCommands()
QMetaType::registerComparators<ProjectPartsDoNotExistCommand>(); QMetaType::registerComparators<ProjectPartsDoNotExistCommand>();
} }
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
...@@ -28,18 +28,18 @@ ...@@ -28,18 +28,18 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef CODEMODELBACKEND_COMMANDS_H #ifndef CLANGBACKEND_COMMANDS_H
#define CODEMODELBACKEND_COMMANDS_H #define CLANGBACKEND_COMMANDS_H
#include <codemodelbackendipc_global.h> #include <clangbackendipc_global.h>
namespace CodeModelBackEnd { namespace ClangBackEnd {
namespace Commands namespace Commands
{ {
CMBIPC_EXPORT void registerCommands(); CMBIPC_EXPORT void registerCommands();
} }
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
#endif // CODEMODELBACKEND_COMMANDS_H #endif // CLANGBACKEND_COMMANDS_H
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <ostream> #include <ostream>
namespace CodeModelBackEnd { namespace ClangBackEnd {
quint64 CompleteCodeCommand::ticketCounter = 0; quint64 CompleteCodeCommand::ticketCounter = 0;
...@@ -142,5 +142,5 @@ void PrintTo(const CompleteCodeCommand &command, ::std::ostream* os) ...@@ -142,5 +142,5 @@ void PrintTo(const CompleteCodeCommand &command, ::std::ostream* os)
*os << ")"; *os << ")";
} }
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef CODEMODELBACKEND_COMPLETECODECOMMAND_H #ifndef CLANGBACKEND_COMPLETECODECOMMAND_H
#define CODEMODELBACKEND_COMPLETECODECOMMAND_H #define CLANGBACKEND_COMPLETECODECOMMAND_H
#include "codemodelbackendipc_global.h" #include "clangbackendipc_global.h"
#include <QMetaType> #include <QMetaType>
#include <utf8string.h> #include <utf8string.h>
namespace CodeModelBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT CompleteCodeCommand class CMBIPC_EXPORT CompleteCodeCommand
{ {
...@@ -79,8 +79,8 @@ CMBIPC_EXPORT bool operator<(const CompleteCodeCommand &first, const CompleteCod ...@@ -79,8 +79,8 @@ CMBIPC_EXPORT bool operator<(const CompleteCodeCommand &first, const CompleteCod
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeCommand &command); CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeCommand &command);
void PrintTo(const CompleteCodeCommand &command, ::std::ostream* os); void PrintTo(const CompleteCodeCommand &command, ::std::ostream* os);
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
Q_DECLARE_METATYPE(CodeModelBackEnd::CompleteCodeCommand) Q_DECLARE_METATYPE(ClangBackEnd::CompleteCodeCommand)
#endif // CODEMODELBACKEND_COMPLETECODECOMMAND_H #endif // CLANGBACKEND_COMPLETECODECOMMAND_H
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <ostream> #include <ostream>
namespace CodeModelBackEnd { namespace ClangBackEnd {
EchoCommand::EchoCommand(const QVariant &command) EchoCommand::EchoCommand(const QVariant &command)
: command_(command) : command_(command)
...@@ -88,5 +88,5 @@ void PrintTo(const EchoCommand &command, ::std::ostream* os) ...@@ -88,5 +88,5 @@ void PrintTo(const EchoCommand &command, ::std::ostream* os)
*os << output.toUtf8().constData(); *os << output.toUtf8().constData();
} }
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef CODEMODELBACKEND_ECHOCOMMAND_H #ifndef CLANGBACKEND_ECHOCOMMAND_H
#define CODEMODELBACKEND_ECHOCOMMAND_H #define CLANGBACKEND_ECHOCOMMAND_H
#include "codemodelbackendipc_global.h" #include "clangbackendipc_global.h"
#include <QMetaType> #include <QMetaType>
#include <QVariant> #include <QVariant>
namespace CodeModelBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT EchoCommand class CMBIPC_EXPORT EchoCommand
{ {
...@@ -61,8 +61,8 @@ CMBIPC_EXPORT bool operator<(const EchoCommand &first, const EchoCommand &second ...@@ -61,8 +61,8 @@ CMBIPC_EXPORT bool operator<(const EchoCommand &first, const EchoCommand &second
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EchoCommand &command); CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EchoCommand &command);
void PrintTo(const EchoCommand &command, ::std::ostream* os); void PrintTo(const EchoCommand &command, ::std::ostream* os);
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
Q_DECLARE_METATYPE(CodeModelBackEnd::EchoCommand) Q_DECLARE_METATYPE(ClangBackEnd::EchoCommand)
#endif // CODEMODELBACKEND_ECHOCOMMAND_H #endif // CLANGBACKEND_ECHOCOMMAND_H
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <ostream> #include <ostream>
namespace CodeModelBackEnd { namespace ClangBackEnd {
QDataStream &operator<<(QDataStream &out, const EndCommand &/*command*/) QDataStream &operator<<(QDataStream &out, const EndCommand &/*command*/)
{ {
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#ifndef CMBENDCOMMAND_H #ifndef CMBENDCOMMAND_H
#define CMBENDCOMMAND_H #define CMBENDCOMMAND_H
#include "codemodelbackendipc_global.h" #include "clangbackendipc_global.h"
#include <QMetaType> #include <QMetaType>
namespace CodeModelBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT EndCommand class CMBIPC_EXPORT EndCommand
{ {
...@@ -50,6 +50,6 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EndCommand &command); ...@@ -50,6 +50,6 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EndCommand &command);
void PrintTo(const EndCommand &command, ::std::ostream* os); void PrintTo(const EndCommand &command, ::std::ostream* os);
} }
Q_DECLARE_METATYPE(CodeModelBackEnd::EndCommand) Q_DECLARE_METATYPE(ClangBackEnd::EndCommand)
#endif // CMBENDCOMMAND_H #endif // CMBENDCOMMAND_H
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
#include <algorithm> #include <algorithm>
#include <container_common.h> #include "container_common.h"
namespace CodeModelBackEnd { namespace ClangBackEnd {
RegisterProjectPartsForCodeCompletionCommand::RegisterProjectPartsForCodeCompletionCommand(const QVector<ProjectPartContainer> &projectContainers) RegisterProjectPartsForCodeCompletionCommand::RegisterProjectPartsForCodeCompletionCommand(const QVector<ProjectPartContainer> &projectContainers)
:projectContainers_(projectContainers) :projectContainers_(projectContainers)
...@@ -98,5 +98,5 @@ void PrintTo(const RegisterProjectPartsForCodeCompletionCommand &command, ::std: ...@@ -98,5 +98,5 @@ void PrintTo(const RegisterProjectPartsForCodeCompletionCommand &command, ::std:
*os << ")"; *os << ")";
} }
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef CODEMODELBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H #ifndef CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
#define CODEMODELBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H #define CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
#include <QMetaType> #include <QMetaType>
#include <QVector> #include <QVector>
#include "projectpartcontainer.h" #include "projectpartcontainer.h"
namespace CodeModelBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT RegisterProjectPartsForCodeCompletionCommand class CMBIPC_EXPORT RegisterProjectPartsForCodeCompletionCommand
{ {
...@@ -62,8 +62,8 @@ CMBIPC_EXPORT bool operator<(const RegisterProjectPartsForCodeCompletionCommand ...@@ -62,8 +62,8 @@ CMBIPC_EXPORT bool operator<(const RegisterProjectPartsForCodeCompletionCommand
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForCodeCompletionCommand &command); CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForCodeCompletionCommand &command);
void PrintTo(const RegisterProjectPartsForCodeCompletionCommand &command, ::std::ostream* os); void PrintTo(const RegisterProjectPartsForCodeCompletionCommand &command, ::std::ostream* os);
} // namespace CodeModelBackEnd } // namespace ClangBackEnd
Q_DECLARE_METATYPE(CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand)<