feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangRefactoring: fix names collision

Browse Source 
Type in 'using' had the same name as it's templated base

Change-Id: I0c36e1da26930ebd5ed04b2892ec551294bc7111
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-10-24 13:45:07 +02:00
parent 050b4dd2f5
commit 4d90477e02
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangrefactoring/clangrefactoringplugin.cpp
View File

@@ -66,7 +66,7 @@ std::unique_ptr<ClangRefactoringPluginData> ClangRefactoringPlugin::d;
class ClangRefactoringPluginData class ClangRefactoringPluginData
{ {
public: public:
using QuerySqliteStatementFactory = QuerySqliteStatementFactory<Sqlite::Database, using QuerySqliteReadStatementFactory = QuerySqliteStatementFactory<Sqlite::Database,
Sqlite::ReadStatement>; Sqlite::ReadStatement>;
Sqlite::Database database{Utils::PathString{QDir::tempPath() + "/symbol.db"}}; Sqlite::Database database{Utils::PathString{QDir::tempPath() + "/symbol.db"}};
@@ -74,8 +74,8 @@ public:
ClangBackEnd::FilePathCaching filePathCache{database}; ClangBackEnd::FilePathCaching filePathCache{database};
RefactoringClient refactoringClient; RefactoringClient refactoringClient;
ClangBackEnd::RefactoringConnectionClient connectionClient{&refactoringClient}; ClangBackEnd::RefactoringConnectionClient connectionClient{&refactoringClient};
QuerySqliteStatementFactory statementFactory{database}; QuerySqliteReadStatementFactory statementFactory{database};
SymbolQuery<QuerySqliteStatementFactory> symbolQuery{statementFactory}; SymbolQuery<QuerySqliteReadStatementFactory> symbolQuery{statementFactory};
RefactoringEngine engine{connectionClient.serverProxy(), refactoringClient, filePathCache, symbolQuery}; RefactoringEngine engine{connectionClient.serverProxy(), refactoringClient, filePathCache, symbolQuery};
QtCreatorSearch qtCreatorSearch{*Core::SearchResultWindow::instance()}; QtCreatorSearch qtCreatorSearch{*Core::SearchResultWindow::instance()};