From 216f110385f4854c22229430b839b3245a255135 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 24 Nov 2015 11:17:18 +0100 Subject: [PATCH] Clang: Tests on MSVC2013: Fix file name clashes The following files conflicted: src\tools\clangbackend\ipcsource\translationunit.cpp src\libs\3rdparty\cplusplus\TranslationUnit.cpp src\libs\3rdparty\cplusplus\Type.cpp src\tools\clangbackend\ipcsource\type.cpp src\libs\3rdparty\cplusplus\Symbol.cpp src\plugins\clangcodemodel\symbol.cpp Change-Id: If7865570cd70e39e25cc8d508f771c8023288f0c Reviewed-by: Marco Bubke --- src/plugins/clangcodemodel/clangcodemodel.pro | 4 ++-- src/plugins/clangcodemodel/clangcodemodel.qbs | 4 ++-- .../clangcodemodel/{symbol.cpp => clangsymbol.cpp} | 2 +- .../clangcodemodel/{symbol.h => clangsymbol.h} | 0 src/plugins/clangcodemodel/index.h | 2 +- src/plugins/clangcodemodel/indexer.h | 2 +- .../ipcsource/clangbackendclangipc-source.pri | 12 ++++++------ src/tools/clangbackend/ipcsource/clangipcserver.h | 2 +- ...{translationunit.cpp => clangtranslationunit.cpp} | 2 +- .../{translationunit.h => clangtranslationunit.h} | 0 .../ipcsource/{type.cpp => clangtype.cpp} | 2 +- .../clangbackend/ipcsource/{type.h => clangtype.h} | 0 src/tools/clangbackend/ipcsource/codecompleter.cpp | 2 +- src/tools/clangbackend/ipcsource/codecompleter.h | 2 +- src/tools/clangbackend/ipcsource/cursor.h | 2 +- src/tools/clangbackend/ipcsource/sourcelocation.cpp | 2 +- src/tools/clangbackend/ipcsource/translationunits.h | 2 +- tests/unit/unittest/clangcodecompleteresultstest.cpp | 2 +- tests/unit/unittest/codecompletionsextractortest.cpp | 2 +- tests/unit/unittest/codecompletiontest.cpp | 2 +- tests/unit/unittest/cursortest.cpp | 2 +- tests/unit/unittest/diagnosticsettest.cpp | 2 +- tests/unit/unittest/diagnostictest.cpp | 2 +- tests/unit/unittest/fixittest.cpp | 2 +- tests/unit/unittest/highlightinginformationstest.cpp | 2 +- tests/unit/unittest/skippedsourcerangestest.cpp | 2 +- tests/unit/unittest/sourcelocationtest.cpp | 2 +- tests/unit/unittest/sourcerangetest.cpp | 2 +- tests/unit/unittest/translationunitstest.cpp | 2 +- tests/unit/unittest/translationunittest.cpp | 2 +- 30 files changed, 34 insertions(+), 34 deletions(-) rename src/plugins/clangcodemodel/{symbol.cpp => clangsymbol.cpp} (99%) rename src/plugins/clangcodemodel/{symbol.h => clangsymbol.h} (100%) rename src/tools/clangbackend/ipcsource/{translationunit.cpp => clangtranslationunit.cpp} (99%) rename src/tools/clangbackend/ipcsource/{translationunit.h => clangtranslationunit.h} (100%) rename src/tools/clangbackend/ipcsource/{type.cpp => clangtype.cpp} (99%) rename src/tools/clangbackend/ipcsource/{type.h => clangtype.h} (100%) diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro index e8578cbb7cf..3a73d66790d 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.pro +++ b/src/plugins/clangcodemodel/clangcodemodel.pro @@ -33,6 +33,7 @@ SOURCES += \ clangmodelmanagersupport.cpp \ clangprojectsettings.cpp \ clangprojectsettingspropertiespage.cpp \ + clangsymbol.cpp \ clangtextmark.cpp \ clangutils.cpp \ completionchunkstotextconverter.cpp \ @@ -46,7 +47,6 @@ SOURCES += \ semanticmarker.cpp \ sourcelocation.cpp \ sourcemarker.cpp \ - symbol.cpp \ unit.cpp \ unsavedfiledata.cpp \ utils.cpp \ @@ -76,6 +76,7 @@ HEADERS += \ clangmodelmanagersupport.h \ clangprojectsettings.h \ clangprojectsettingspropertiespage.h \ + clangsymbol.h \ clangtextmark.h \ clangutils.h \ completionchunkstotextconverter.h \ @@ -91,7 +92,6 @@ HEADERS += \ semanticmarker.h \ sourcelocation.h \ sourcemarker.h \ - symbol.h \ unit.h \ unsavedfiledata.h \ utils.h \ diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs index 858903aa776..26543eda86b 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.qbs +++ b/src/plugins/clangcodemodel/clangcodemodel.qbs @@ -143,6 +143,8 @@ QtcPlugin { "clangprojectsettingspropertiespage.cpp", "clangprojectsettingspropertiespage.h", "clangprojectsettingspropertiespage.ui", + "clangsymbol.cpp", + "clangsymbol.h", "clangtextmark.cpp", "clangtextmark.h", "clangutils.cpp", @@ -169,8 +171,6 @@ QtcPlugin { "sourcelocation.h", "sourcemarker.cpp", "sourcemarker.h", - "symbol.cpp", - "symbol.h", "unit.cpp", "unit.h", "unsavedfiledata.cpp", diff --git a/src/plugins/clangcodemodel/symbol.cpp b/src/plugins/clangcodemodel/clangsymbol.cpp similarity index 99% rename from src/plugins/clangcodemodel/symbol.cpp rename to src/plugins/clangcodemodel/clangsymbol.cpp index b37270c7453..a4c9a024f46 100644 --- a/src/plugins/clangcodemodel/symbol.cpp +++ b/src/plugins/clangcodemodel/clangsymbol.cpp @@ -28,7 +28,7 @@ ** ****************************************************************************/ -#include "symbol.h" +#include "clangsymbol.h" #include diff --git a/src/plugins/clangcodemodel/symbol.h b/src/plugins/clangcodemodel/clangsymbol.h similarity index 100% rename from src/plugins/clangcodemodel/symbol.h rename to src/plugins/clangcodemodel/clangsymbol.h diff --git a/src/plugins/clangcodemodel/index.h b/src/plugins/clangcodemodel/index.h index 6809e4676a6..357d136c6b8 100644 --- a/src/plugins/clangcodemodel/index.h +++ b/src/plugins/clangcodemodel/index.h @@ -31,7 +31,7 @@ #ifndef INDEX_H #define INDEX_H -#include "symbol.h" +#include "clangsymbol.h" #include #include diff --git a/src/plugins/clangcodemodel/indexer.h b/src/plugins/clangcodemodel/indexer.h index 5a1c435494d..dbe352ae58a 100644 --- a/src/plugins/clangcodemodel/indexer.h +++ b/src/plugins/clangcodemodel/indexer.h @@ -32,7 +32,7 @@ #define INDEXER_H #include "clang_global.h" -#include "symbol.h" +#include "clangsymbol.h" #include "unit.h" #include diff --git a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri index 93131082bf9..1724c5799c2 100644 --- a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri +++ b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri @@ -3,7 +3,6 @@ INCLUDEPATH += $$PWD HEADERS += $$PWD/clangipcserver.h \ $$PWD/codecompleter.h \ $$PWD/clangstring.h \ - $$PWD/translationunit.h \ $$PWD/translationunitisnullexception.h \ $$PWD/codecompletefailedexception.h \ $$PWD/clangcodecompleteresults.h \ @@ -27,16 +26,16 @@ HEADERS += $$PWD/clangipcserver.h \ $$PWD/translationunitalreadyexistsexception.h \ $$PWD/commandlinearguments.h \ $$PWD/cursor.h \ - $$PWD/type.h \ $$PWD/highlightinginformations.h \ $$PWD/highlightinginformation.h \ $$PWD/highlightinginformationsiterator.h \ - $$PWD/skippedsourceranges.h + $$PWD/skippedsourceranges.h \ + $$PWD/clangtranslationunit.h \ + $$PWD/clangtype.h SOURCES += $$PWD/clangipcserver.cpp \ $$PWD/codecompleter.cpp \ $$PWD/clangstring.cpp \ - $$PWD/translationunit.cpp \ $$PWD/translationunitisnullexception.cpp \ $$PWD/codecompletefailedexception.cpp \ $$PWD/clangcodecompleteresults.cpp \ @@ -59,7 +58,8 @@ SOURCES += $$PWD/clangipcserver.cpp \ $$PWD/translationunitalreadyexistsexception.cpp \ $$PWD/commandlinearguments.cpp \ $$PWD/cursor.cpp \ - $$PWD/type.cpp \ $$PWD/highlightinginformations.cpp \ $$PWD/highlightinginformation.cpp \ - $$PWD/skippedsourceranges.cpp + $$PWD/skippedsourceranges.cpp \ + $$PWD/clangtranslationunit.cpp \ + $$PWD/clangtype.cpp diff --git a/src/tools/clangbackend/ipcsource/clangipcserver.h b/src/tools/clangbackend/ipcsource/clangipcserver.h index bfb1313e64f..88daf5b4104 100644 --- a/src/tools/clangbackend/ipcsource/clangipcserver.h +++ b/src/tools/clangbackend/ipcsource/clangipcserver.h @@ -35,7 +35,7 @@ #include "projectpart.h" #include "projects.h" -#include "translationunit.h" +#include "clangtranslationunit.h" #include "translationunits.h" #include "unsavedfiles.h" diff --git a/src/tools/clangbackend/ipcsource/translationunit.cpp b/src/tools/clangbackend/ipcsource/clangtranslationunit.cpp similarity index 99% rename from src/tools/clangbackend/ipcsource/translationunit.cpp rename to src/tools/clangbackend/ipcsource/clangtranslationunit.cpp index cd880f0567d..ed9799652a4 100644 --- a/src/tools/clangbackend/ipcsource/translationunit.cpp +++ b/src/tools/clangbackend/ipcsource/clangtranslationunit.cpp @@ -28,7 +28,7 @@ ** ****************************************************************************/ -#include "translationunit.h" +#include "clangtranslationunit.h" #include "cursor.h" #include "clangstring.h" diff --git a/src/tools/clangbackend/ipcsource/translationunit.h b/src/tools/clangbackend/ipcsource/clangtranslationunit.h similarity index 100% rename from src/tools/clangbackend/ipcsource/translationunit.h rename to src/tools/clangbackend/ipcsource/clangtranslationunit.h diff --git a/src/tools/clangbackend/ipcsource/type.cpp b/src/tools/clangbackend/ipcsource/clangtype.cpp similarity index 99% rename from src/tools/clangbackend/ipcsource/type.cpp rename to src/tools/clangbackend/ipcsource/clangtype.cpp index a1f78e44eb2..b839a8dee39 100644 --- a/src/tools/clangbackend/ipcsource/type.cpp +++ b/src/tools/clangbackend/ipcsource/clangtype.cpp @@ -28,7 +28,7 @@ ** ****************************************************************************/ -#include "type.h" +#include "clangtype.h" #include "clangstring.h" #include "cursor.h" diff --git a/src/tools/clangbackend/ipcsource/type.h b/src/tools/clangbackend/ipcsource/clangtype.h similarity index 100% rename from src/tools/clangbackend/ipcsource/type.h rename to src/tools/clangbackend/ipcsource/clangtype.h diff --git a/src/tools/clangbackend/ipcsource/codecompleter.cpp b/src/tools/clangbackend/ipcsource/codecompleter.cpp index 3f581b5c1cb..99d0637a03e 100644 --- a/src/tools/clangbackend/ipcsource/codecompleter.cpp +++ b/src/tools/clangbackend/ipcsource/codecompleter.cpp @@ -34,7 +34,7 @@ #include "clangstring.h" #include "codecompletefailedexception.h" #include "codecompletionsextractor.h" -#include "translationunit.h" +#include "clangtranslationunit.h" #include diff --git a/src/tools/clangbackend/ipcsource/codecompleter.h b/src/tools/clangbackend/ipcsource/codecompleter.h index 2d2dc1abe0f..971f209c361 100644 --- a/src/tools/clangbackend/ipcsource/codecompleter.h +++ b/src/tools/clangbackend/ipcsource/codecompleter.h @@ -31,7 +31,7 @@ #ifndef CLANGBACKEND_CODECOMPLETER_H #define CLANGBACKEND_CODECOMPLETER_H -#include "translationunit.h" +#include "clangtranslationunit.h" #include diff --git a/src/tools/clangbackend/ipcsource/cursor.h b/src/tools/clangbackend/ipcsource/cursor.h index d4256401e5d..4b15e232823 100644 --- a/src/tools/clangbackend/ipcsource/cursor.h +++ b/src/tools/clangbackend/ipcsource/cursor.h @@ -31,7 +31,7 @@ #ifndef CLANGBACKEND_CURSOR_H #define CLANGBACKEND_CURSOR_H -#include "type.h" +#include "clangtype.h" #include diff --git a/src/tools/clangbackend/ipcsource/sourcelocation.cpp b/src/tools/clangbackend/ipcsource/sourcelocation.cpp index e04f44c7d88..92c5464d7f8 100644 --- a/src/tools/clangbackend/ipcsource/sourcelocation.cpp +++ b/src/tools/clangbackend/ipcsource/sourcelocation.cpp @@ -31,7 +31,7 @@ #include "sourcelocation.h" #include "clangstring.h" -#include "translationunit.h" +#include "clangtranslationunit.h" #include diff --git a/src/tools/clangbackend/ipcsource/translationunits.h b/src/tools/clangbackend/ipcsource/translationunits.h index a08d642d48b..abc0c4670f8 100644 --- a/src/tools/clangbackend/ipcsource/translationunits.h +++ b/src/tools/clangbackend/ipcsource/translationunits.h @@ -32,7 +32,7 @@ #define CLANGBACKEND_TRANSLATIONUNITS_H #include "clangfilesystemwatcher.h" -#include "translationunit.h" +#include "clangtranslationunit.h" #include diff --git a/tests/unit/unittest/clangcodecompleteresultstest.cpp b/tests/unit/unittest/clangcodecompleteresultstest.cpp index c91c80ec932..410d73dad7d 100644 --- a/tests/unit/unittest/clangcodecompleteresultstest.cpp +++ b/tests/unit/unittest/clangcodecompleteresultstest.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/codecompletionsextractortest.cpp b/tests/unit/unittest/codecompletionsextractortest.cpp index 42b5a6152b4..cf31413085b 100644 --- a/tests/unit/unittest/codecompletionsextractortest.cpp +++ b/tests/unit/unittest/codecompletionsextractortest.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/codecompletiontest.cpp b/tests/unit/unittest/codecompletiontest.cpp index 33a79d177be..3fbc7d0a203 100644 --- a/tests/unit/unittest/codecompletiontest.cpp +++ b/tests/unit/unittest/codecompletiontest.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/cursortest.cpp b/tests/unit/unittest/cursortest.cpp index e0e18c13083..c095122081e 100644 --- a/tests/unit/unittest/cursortest.cpp +++ b/tests/unit/unittest/cursortest.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/unit/unittest/diagnosticsettest.cpp b/tests/unit/unittest/diagnosticsettest.cpp index a3d89e5105d..e1271cbe075 100644 --- a/tests/unit/unittest/diagnosticsettest.cpp +++ b/tests/unit/unittest/diagnosticsettest.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/unit/unittest/diagnostictest.cpp b/tests/unit/unittest/diagnostictest.cpp index 01925a980df..bc81ba8d477 100644 --- a/tests/unit/unittest/diagnostictest.cpp +++ b/tests/unit/unittest/diagnostictest.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/fixittest.cpp b/tests/unit/unittest/fixittest.cpp index 6942bf6e323..4de92f3990f 100644 --- a/tests/unit/unittest/fixittest.cpp +++ b/tests/unit/unittest/fixittest.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/highlightinginformationstest.cpp b/tests/unit/unittest/highlightinginformationstest.cpp index 8e5ee4f0ee0..39238d8f7a8 100644 --- a/tests/unit/unittest/highlightinginformationstest.cpp +++ b/tests/unit/unittest/highlightinginformationstest.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/unit/unittest/skippedsourcerangestest.cpp b/tests/unit/unittest/skippedsourcerangestest.cpp index b37b8726909..33506efb334 100644 --- a/tests/unit/unittest/skippedsourcerangestest.cpp +++ b/tests/unit/unittest/skippedsourcerangestest.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/unit/unittest/sourcelocationtest.cpp b/tests/unit/unittest/sourcelocationtest.cpp index 9213d9359c3..4cbab547627 100644 --- a/tests/unit/unittest/sourcelocationtest.cpp +++ b/tests/unit/unittest/sourcelocationtest.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/sourcerangetest.cpp b/tests/unit/unittest/sourcerangetest.cpp index b517c423804..1e18225fb5a 100644 --- a/tests/unit/unittest/sourcerangetest.cpp +++ b/tests/unit/unittest/sourcerangetest.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/translationunitstest.cpp b/tests/unit/unittest/translationunitstest.cpp index 0b19ecdf62d..9c84b4973ed 100644 --- a/tests/unit/unittest/translationunitstest.cpp +++ b/tests/unit/unittest/translationunitstest.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/translationunittest.cpp b/tests/unit/unittest/translationunittest.cpp index 4bc2d110611..12b0137a6e1 100644 --- a/tests/unit/unittest/translationunittest.cpp +++ b/tests/unit/unittest/translationunittest.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include