From 1410bf3faf222d79b6789add5bd2b759d1abf22a Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 30 Nov 2015 09:43:50 +0100 Subject: [PATCH] Clang: Use "clang" prefix plugin files ...for consistency and to avoid future file name clashes. Change-Id: If595c8debfa1ceb01a1bb0ed34649fa513660503 Reviewed-by: Marco Bubke --- ...angactivationsequencecontextprocessor.cpp} | 4 +-- ...clangactivationsequencecontextprocessor.h} | 0 ...p => clangactivationsequenceprocessor.cpp} | 2 +- ...r.h => clangactivationsequenceprocessor.h} | 0 .../clangassistproposalitem.cpp | 2 +- src/plugins/clangcodemodel/clangcodemodel.pro | 20 ++++++------- src/plugins/clangcodemodel/clangcodemodel.qbs | 18 +++++------ .../clangcodemodel/clangcodemodelplugin.cpp | 2 +- .../clangcodemodelunittestfiles.pri | 30 ++++++++++--------- .../clangcompletionassistprocessor.cpp | 4 +-- ... clangcompletionchunkstotextconverter.cpp} | 2 +- ...=> clangcompletionchunkstotextconverter.h} | 0 .../clangcompletioncontextanalyzer.cpp | 4 +-- .../{constants.h => clangconstants.h} | 6 ++-- .../clangeditordocumentprocessor.cpp | 2 +- .../clangcodemodel/clangfunctionhintmodel.cpp | 2 +- ...cpp => clanghighlightingmarksreporter.cpp} | 2 +- ...ter.h => clanghighlightingmarksreporter.h} | 0 .../clangmodelmanagersupport.cpp | 2 +- src/plugins/clangcodemodel/clangtextmark.cpp | 2 +- ...activationsequencecontextprocessortest.cpp | 2 +- .../activationsequenceprocessortest.cpp | 2 +- .../completionchunkstotextconvertertest.cpp | 2 +- .../highlightingmarksreportertest.cpp | 2 +- 24 files changed, 57 insertions(+), 55 deletions(-) rename src/plugins/clangcodemodel/{activationsequencecontextprocessor.cpp => clangactivationsequencecontextprocessor.cpp} (98%) rename src/plugins/clangcodemodel/{activationsequencecontextprocessor.h => clangactivationsequencecontextprocessor.h} (100%) rename src/plugins/clangcodemodel/{activationsequenceprocessor.cpp => clangactivationsequenceprocessor.cpp} (99%) rename src/plugins/clangcodemodel/{activationsequenceprocessor.h => clangactivationsequenceprocessor.h} (100%) rename src/plugins/clangcodemodel/{completionchunkstotextconverter.cpp => clangcompletionchunkstotextconverter.cpp} (99%) rename src/plugins/clangcodemodel/{completionchunkstotextconverter.h => clangcompletionchunkstotextconverter.h} (100%) rename src/plugins/clangcodemodel/{constants.h => clangconstants.h} (95%) rename src/plugins/clangcodemodel/{highlightingmarksreporter.cpp => clanghighlightingmarksreporter.cpp} (99%) rename src/plugins/clangcodemodel/{highlightingmarksreporter.h => clanghighlightingmarksreporter.h} (100%) diff --git a/src/plugins/clangcodemodel/activationsequencecontextprocessor.cpp b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp similarity index 98% rename from src/plugins/clangcodemodel/activationsequencecontextprocessor.cpp rename to src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp index 1b03f0e5b75..0b19ce24aec 100644 --- a/src/plugins/clangcodemodel/activationsequencecontextprocessor.cpp +++ b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp @@ -28,9 +28,9 @@ ** ****************************************************************************/ -#include "activationsequencecontextprocessor.h" +#include "clangactivationsequencecontextprocessor.h" -#include "activationsequenceprocessor.h" +#include "clangactivationsequenceprocessor.h" #include #include diff --git a/src/plugins/clangcodemodel/activationsequencecontextprocessor.h b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h similarity index 100% rename from src/plugins/clangcodemodel/activationsequencecontextprocessor.h rename to src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h diff --git a/src/plugins/clangcodemodel/activationsequenceprocessor.cpp b/src/plugins/clangcodemodel/clangactivationsequenceprocessor.cpp similarity index 99% rename from src/plugins/clangcodemodel/activationsequenceprocessor.cpp rename to src/plugins/clangcodemodel/clangactivationsequenceprocessor.cpp index a7f4ea948d0..08f97558e7f 100644 --- a/src/plugins/clangcodemodel/activationsequenceprocessor.cpp +++ b/src/plugins/clangcodemodel/clangactivationsequenceprocessor.cpp @@ -28,7 +28,7 @@ ** ****************************************************************************/ -#include "activationsequenceprocessor.h" +#include "clangactivationsequenceprocessor.h" namespace ClangCodeModel { namespace Internal { diff --git a/src/plugins/clangcodemodel/activationsequenceprocessor.h b/src/plugins/clangcodemodel/clangactivationsequenceprocessor.h similarity index 100% rename from src/plugins/clangcodemodel/activationsequenceprocessor.h rename to src/plugins/clangcodemodel/clangactivationsequenceprocessor.h diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp index f44a2a8b285..f96128b9171 100644 --- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp @@ -30,7 +30,7 @@ #include "clangassistproposalitem.h" -#include "completionchunkstotextconverter.h" +#include "clangcompletionchunkstotextconverter.h" #include #include diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro index 181ac8a0b3a..436e15b6072 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.pro +++ b/src/plugins/clangcodemodel/clangcodemodel.pro @@ -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 diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs index cc734651edd..eccd34b53bb 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.qbs +++ b/src/plugins/clangcodemodel/clangcodemodel.qbs @@ -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 { diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp index 069923ff5f5..ea7aa9c3d1b 100644 --- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp +++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp @@ -30,8 +30,8 @@ #include "clangcodemodelplugin.h" +#include "clangconstants.h" #include "clangprojectsettingspropertiespage.h" -#include "constants.h" #ifdef WITH_TESTS # include "test/clangcodecompletion_test.h" diff --git a/src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri b/src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri index 1771e0e0c65..0515875a4ac 100644 --- a/src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri +++ b/src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri @@ -1,17 +1,19 @@ 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 diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index 70dab8f5586..2f6b17ba82e 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -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 diff --git a/src/plugins/clangcodemodel/completionchunkstotextconverter.cpp b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp similarity index 99% rename from src/plugins/clangcodemodel/completionchunkstotextconverter.cpp rename to src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp index 68e245f6368..43e6c86f76e 100644 --- a/src/plugins/clangcodemodel/completionchunkstotextconverter.cpp +++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp @@ -28,7 +28,7 @@ ** ****************************************************************************/ -#include "completionchunkstotextconverter.h" +#include "clangcompletionchunkstotextconverter.h" #include #include diff --git a/src/plugins/clangcodemodel/completionchunkstotextconverter.h b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h similarity index 100% rename from src/plugins/clangcodemodel/completionchunkstotextconverter.h rename to src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h diff --git a/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.cpp b/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.cpp index eaa2b3d90a6..f59b21db33b 100644 --- a/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.cpp +++ b/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.cpp @@ -31,8 +31,8 @@ #include "clangcompletioncontextanalyzer.h" -#include "activationsequenceprocessor.h" -#include "activationsequencecontextprocessor.h" +#include "clangactivationsequencecontextprocessor.h" +#include "clangactivationsequenceprocessor.h" #include diff --git a/src/plugins/clangcodemodel/constants.h b/src/plugins/clangcodemodel/clangconstants.h similarity index 95% rename from src/plugins/clangcodemodel/constants.h rename to src/plugins/clangcodemodel/clangconstants.h index 40192c06400..e02e9c72d31 100644 --- a/src/plugins/clangcodemodel/constants.h +++ b/src/plugins/clangcodemodel/clangconstants.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 diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp index f0744856079..a37595c5ee2 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -32,9 +32,9 @@ #include "clangfixitoperation.h" #include "clangfixitoperationsextractor.h" +#include "clanghighlightingmarksreporter.h" #include "clangmodelmanagersupport.h" #include "clangutils.h" -#include "highlightingmarksreporter.h" #include #include diff --git a/src/plugins/clangcodemodel/clangfunctionhintmodel.cpp b/src/plugins/clangcodemodel/clangfunctionhintmodel.cpp index d037186b995..0ce334975ff 100644 --- a/src/plugins/clangcodemodel/clangfunctionhintmodel.cpp +++ b/src/plugins/clangcodemodel/clangfunctionhintmodel.cpp @@ -30,7 +30,7 @@ #include "clangfunctionhintmodel.h" -#include "completionchunkstotextconverter.h" +#include "clangcompletionchunkstotextconverter.h" #include diff --git a/src/plugins/clangcodemodel/highlightingmarksreporter.cpp b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp similarity index 99% rename from src/plugins/clangcodemodel/highlightingmarksreporter.cpp rename to src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp index 6b3fc07996d..698f158c654 100644 --- a/src/plugins/clangcodemodel/highlightingmarksreporter.cpp +++ b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp @@ -28,7 +28,7 @@ ** ****************************************************************************/ -#include "highlightingmarksreporter.h" +#include "clanghighlightingmarksreporter.h" #include diff --git a/src/plugins/clangcodemodel/highlightingmarksreporter.h b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h similarity index 100% rename from src/plugins/clangcodemodel/highlightingmarksreporter.h rename to src/plugins/clangcodemodel/clanghighlightingmarksreporter.h diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index 1b66c067e94..42e27d3a6f4 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -30,7 +30,7 @@ #include "clangmodelmanagersupport.h" -#include "constants.h" +#include "clangconstants.h" #include "clangeditordocumentprocessor.h" #include "clangutils.h" diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp index dfb19059928..e93f8233f22 100644 --- a/src/plugins/clangcodemodel/clangtextmark.cpp +++ b/src/plugins/clangcodemodel/clangtextmark.cpp @@ -30,7 +30,7 @@ #include "clangtextmark.h" -#include "constants.h" +#include "clangconstants.h" #include diff --git a/tests/unit/unittest/activationsequencecontextprocessortest.cpp b/tests/unit/unittest/activationsequencecontextprocessortest.cpp index e69f8b97f13..6bde8b0065f 100644 --- a/tests/unit/unittest/activationsequencecontextprocessortest.cpp +++ b/tests/unit/unittest/activationsequencecontextprocessortest.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ -#include +#include #include diff --git a/tests/unit/unittest/activationsequenceprocessortest.cpp b/tests/unit/unittest/activationsequenceprocessortest.cpp index d5962cdc5a0..97eb7e2a020 100644 --- a/tests/unit/unittest/activationsequenceprocessortest.cpp +++ b/tests/unit/unittest/activationsequenceprocessortest.cpp @@ -28,7 +28,7 @@ ** ****************************************************************************/ -#include +#include #include diff --git a/tests/unit/unittest/completionchunkstotextconvertertest.cpp b/tests/unit/unittest/completionchunkstotextconvertertest.cpp index 8b41b44bb81..032124dfc52 100644 --- a/tests/unit/unittest/completionchunkstotextconvertertest.cpp +++ b/tests/unit/unittest/completionchunkstotextconvertertest.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/tests/unit/unittest/highlightingmarksreportertest.cpp b/tests/unit/unittest/highlightingmarksreportertest.cpp index bc23150d472..cd543dd35dc 100644 --- a/tests/unit/unittest/highlightingmarksreportertest.cpp +++ b/tests/unit/unittest/highlightingmarksreportertest.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include