Commit 1410bf3f authored by Nikolai Kosjar's avatar Nikolai Kosjar

Clang: Use "clang" prefix plugin files

...for consistency and to avoid future file name clashes.

Change-Id: If595c8debfa1ceb01a1bb0ed34649fa513660503
Reviewed-by: default avatarMarco Bubke <marco.bubke@theqtcompany.com>
parent 6a393afe
......@@ -28,9 +28,9 @@
**
****************************************************************************/
#include "activationsequencecontextprocessor.h"
#include "clangactivationsequencecontextprocessor.h"
#include "activationsequenceprocessor.h"
#include "clangactivationsequenceprocessor.h"
#include <cplusplus/BackwardsScanner.h>
#include <cplusplus/ExpressionUnderCursor.h>
......
......@@ -28,7 +28,7 @@
**
****************************************************************************/
#include "activationsequenceprocessor.h"
#include "clangactivationsequenceprocessor.h"
namespace ClangCodeModel {
namespace Internal {
......
......@@ -30,7 +30,7 @@
#include "clangassistproposalitem.h"
#include "completionchunkstotextconverter.h"
#include "clangcompletionchunkstotextconverter.h"
#include <cplusplus/MatchingText.h>
#include <cplusplus/Token.h>
......
......@@ -6,8 +6,8 @@ DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\"
DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\""
SOURCES += \
activationsequencecontextprocessor.cpp \
activationsequenceprocessor.cpp \
clangactivationsequencecontextprocessor.cpp \
clangactivationsequenceprocessor.cpp \
clangassistproposal.cpp \
clangassistproposalitem.cpp \
clangassistproposalmodel.cpp \
......@@ -16,6 +16,7 @@ SOURCES += \
clangcompletionassistinterface.cpp \
clangcompletionassistprocessor.cpp \
clangcompletionassistprovider.cpp \
clangcompletionchunkstotextconverter.cpp \
clangcompletioncontextanalyzer.cpp \
clangdiagnosticfilter.cpp \
clangdiagnosticmanager.cpp \
......@@ -24,17 +25,16 @@ SOURCES += \
clangfixitoperation.cpp \
clangfixitoperationsextractor.cpp \
clangfunctionhintmodel.cpp \
clanghighlightingmarksreporter.cpp \
clangmodelmanagersupport.cpp \
clangprojectsettings.cpp \
clangprojectsettingspropertiespage.cpp \
clangtextmark.cpp \
clangutils.cpp \
completionchunkstotextconverter.cpp \
highlightingmarksreporter.cpp
clangutils.cpp
HEADERS += \
activationsequencecontextprocessor.h \
activationsequenceprocessor.h \
clangactivationsequencecontextprocessor.h \
clangactivationsequenceprocessor.h \
clangassistproposal.h \
clangassistproposalitem.h \
clangassistproposalmodel.h \
......@@ -43,7 +43,9 @@ HEADERS += \
clangcompletionassistinterface.h \
clangcompletionassistprocessor.h \
clangcompletionassistprovider.h \
clangcompletionchunkstotextconverter.h \
clangcompletioncontextanalyzer.h \
clangconstants.h \
clangdiagnosticfilter.h \
clangdiagnosticmanager.h \
clangeditordocumentparser.h \
......@@ -51,14 +53,12 @@ HEADERS += \
clangfixitoperation.h \
clangfixitoperationsextractor.h \
clangfunctionhintmodel.h \
clanghighlightingmarksreporter.h \
clangmodelmanagersupport.h \
clangprojectsettings.h \
clangprojectsettingspropertiespage.h \
clangtextmark.h \
clangutils.h \
completionchunkstotextconverter.h \
constants.h \
highlightingmarksreporter.h
FORMS += clangprojectsettingspropertiespage.ui
......
......@@ -36,10 +36,10 @@ QtcPlugin {
}
files: [
"activationsequencecontextprocessor.cpp",
"activationsequencecontextprocessor.h",
"activationsequenceprocessor.cpp",
"activationsequenceprocessor.h",
"clangactivationsequencecontextprocessor.cpp",
"clangactivationsequencecontextprocessor.h",
"clangactivationsequenceprocessor.cpp",
"clangactivationsequenceprocessor.h",
"clangassistproposal.cpp",
"clangassistproposal.h",
"clangassistproposalitem.cpp",
......@@ -56,8 +56,11 @@ QtcPlugin {
"clangcompletionassistprocessor.h",
"clangcompletionassistprovider.cpp",
"clangcompletionassistprovider.h",
"clangcompletionchunkstotextconverter.cpp",
"clangcompletionchunkstotextconverter.h",
"clangcompletioncontextanalyzer.cpp",
"clangcompletioncontextanalyzer.h",
"clangconstants.h",
"clangdiagnosticfilter.cpp",
"clangdiagnosticfilter.h",
"clangdiagnosticmanager.cpp",
......@@ -72,6 +75,8 @@ QtcPlugin {
"clangfixitoperationsextractor.h",
"clangfunctionhintmodel.cpp",
"clangfunctionhintmodel.h",
"clanghighlightingmarksreporter.cpp",
"clanghighlightingmarksreporter.h",
"clangmodelmanagersupport.cpp",
"clangmodelmanagersupport.h",
"clangprojectsettings.cpp",
......@@ -83,11 +88,6 @@ QtcPlugin {
"clangtextmark.h",
"clangutils.cpp",
"clangutils.h",
"completionchunkstotextconverter.cpp",
"completionchunkstotextconverter.h",
"constants.h",
"highlightingmarksreporter.cpp",
"highlightingmarksreporter.h",
]
Group {
......
......@@ -30,8 +30,8 @@
#include "clangcodemodelplugin.h"
#include "clangconstants.h"
#include "clangprojectsettingspropertiespage.h"
#include "constants.h"
#ifdef WITH_TESTS
# include "test/clangcodecompletion_test.h"
......
INCLUDEPATH += $$PWD
SOURCES += $$PWD/completionchunkstotextconverter.cpp \
$$PWD/activationsequenceprocessor.cpp \
$$PWD/activationsequencecontextprocessor.cpp \
$$PWD/clangcompletioncontextanalyzer.cpp \
$$PWD/clangdiagnosticfilter.cpp \
$$PWD/clangfixitoperation.cpp \
$$PWD/highlightingmarksreporter.cpp
SOURCES += \
$$PWD/clangactivationsequencecontextprocessor.cpp \
$$PWD/clangactivationsequenceprocessor.cpp \
$$PWD/clangcompletionchunkstotextconverter.cpp \
$$PWD/clangcompletioncontextanalyzer.cpp \
$$PWD/clangdiagnosticfilter.cpp \
$$PWD/clangfixitoperation.cpp \
$$PWD/clanghighlightingmarksreporter.cpp
HEADERS += $$PWD/completionchunkstotextconverter.h \
$$PWD/activationsequenceprocessor.h \
$$PWD/activationsequencecontextprocessor.h \
$$PWD/clangcompletioncontextanalyzer.h \
$$PWD/clangdiagnosticfilter.h \
$$PWD/clangfixitoperation.h \
$$PWD/highlightingmarksreporter.h
HEADERS += \
$$PWD/clangactivationsequencecontextprocessor.h \
$$PWD/clangactivationsequenceprocessor.h \
$$PWD/clangcompletionchunkstotextconverter.h \
$$PWD/clangcompletioncontextanalyzer.h \
$$PWD/clangdiagnosticfilter.h \
$$PWD/clangfixitoperation.h \
$$PWD/clanghighlightingmarksreporter.h
......@@ -30,7 +30,7 @@
#include "clangassistproposalitem.h"
#include "activationsequenceprocessor.h"
#include "clangactivationsequenceprocessor.h"
#include "clangassistproposal.h"
#include "clangassistproposalmodel.h"
#include "clangcompletionassistprocessor.h"
......@@ -38,7 +38,7 @@
#include "clangeditordocumentprocessor.h"
#include "clangfunctionhintmodel.h"
#include "clangutils.h"
#include "completionchunkstotextconverter.h"
#include "clangcompletionchunkstotextconverter.h"
#include <utils/qtcassert.h>
......
......@@ -28,7 +28,7 @@
**
****************************************************************************/
#include "completionchunkstotextconverter.h"
#include "clangcompletionchunkstotextconverter.h"
#include <algorithm>
#include <functional>
......
......@@ -31,8 +31,8 @@
#include "clangcompletioncontextanalyzer.h"
#include "activationsequenceprocessor.h"
#include "activationsequencecontextprocessor.h"
#include "clangactivationsequencecontextprocessor.h"
#include "clangactivationsequenceprocessor.h"
#include <texteditor/codeassist/assistinterface.h>
......
......@@ -28,8 +28,8 @@
**
****************************************************************************/
#ifndef CONSTANTS_H
#define CONSTANTS_H
#ifndef CLANGCONSTANTS_H
#define CLANGCONSTANTS_H
namespace ClangCodeModel {
namespace Constants {
......@@ -41,4 +41,4 @@ const char CLANG_WARNING[] = "Clang.Warning";
} // namespace Constants
} // namespace ClangCodeModel
#endif // CONSTANTS_H
#endif // CLANGCONSTANTS_H
......@@ -32,9 +32,9 @@
#include "clangfixitoperation.h"
#include "clangfixitoperationsextractor.h"
#include "clanghighlightingmarksreporter.h"
#include "clangmodelmanagersupport.h"
#include "clangutils.h"
#include "highlightingmarksreporter.h"
#include <diagnosticcontainer.h>
#include <sourcelocationcontainer.h>
......
......@@ -30,7 +30,7 @@
#include "clangfunctionhintmodel.h"
#include "completionchunkstotextconverter.h"
#include "clangcompletionchunkstotextconverter.h"
#include <cplusplus/SimpleLexer.h>
......
......@@ -28,7 +28,7 @@
**
****************************************************************************/
#include "highlightingmarksreporter.h"
#include "clanghighlightingmarksreporter.h"
#include <cpptools/semantichighlighter.h>
......
......@@ -30,7 +30,7 @@
#include "clangmodelmanagersupport.h"
#include "constants.h"
#include "clangconstants.h"
#include "clangeditordocumentprocessor.h"
#include "clangutils.h"
......
......@@ -30,7 +30,7 @@
#include "clangtextmark.h"
#include "constants.h"
#include "clangconstants.h"
#include <coreplugin/coreconstants.h>
......
......@@ -29,7 +29,7 @@
****************************************************************************/
#include <activationsequencecontextprocessor.h>
#include <clangactivationsequencecontextprocessor.h>
#include <clangcodemodel/clangcompletionassistinterface.h>
......
......@@ -28,7 +28,7 @@
**
****************************************************************************/
#include <activationsequenceprocessor.h>
#include <clangactivationsequenceprocessor.h>
#include <cplusplus/Token.h>
......
......@@ -29,7 +29,7 @@
****************************************************************************/
#include <codecompletionchunk.h>
#include <completionchunkstotextconverter.h>
#include <clangcompletionchunkstotextconverter.h>
#include <gmock/gmock.h>
#include <gmock/gmock-matchers.h>
......
......@@ -31,7 +31,7 @@
#include <chunksreportedmonitor.h>
#include <clangtranslationunit.h>
#include <highlightingmarkcontainer.h>
#include <highlightingmarksreporter.h>
#include <clanghighlightingmarksreporter.h>
#include <projectpart.h>
#include <projects.h>
#include <translationunits.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment