From 4d90477e02be27e083c35f526cac5187fe39e4ed Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Tue, 24 Oct 2017 13:45:07 +0200
Subject: [PATCH] ClangRefactoring: fix names collision

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

Change-Id: I0c36e1da26930ebd5ed04b2892ec551294bc7111
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/clangrefactoring/clangrefactoringplugin.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/clangrefactoring/clangrefactoringplugin.cpp b/src/plugins/clangrefactoring/clangrefactoringplugin.cpp
index 152b548162e..44931dd5985 100644
--- a/src/plugins/clangrefactoring/clangrefactoringplugin.cpp
+++ b/src/plugins/clangrefactoring/clangrefactoringplugin.cpp
@@ -66,16 +66,16 @@ std::unique_ptr<ClangRefactoringPluginData> ClangRefactoringPlugin::d;
 class ClangRefactoringPluginData
 {
 public:
-    using QuerySqliteStatementFactory = QuerySqliteStatementFactory<Sqlite::Database,
-                                                                    Sqlite::ReadStatement>;
+    using QuerySqliteReadStatementFactory = QuerySqliteStatementFactory<Sqlite::Database,
+                                                                        Sqlite::ReadStatement>;
 
     Sqlite::Database database{Utils::PathString{QDir::tempPath() + "/symbol.db"}};
     ClangBackEnd::RefactoringDatabaseInitializer<Sqlite::Database> databaseInitializer{database};
     ClangBackEnd::FilePathCaching filePathCache{database};
     RefactoringClient refactoringClient;
     ClangBackEnd::RefactoringConnectionClient connectionClient{&refactoringClient};
-    QuerySqliteStatementFactory statementFactory{database};
-    SymbolQuery<QuerySqliteStatementFactory> symbolQuery{statementFactory};
+    QuerySqliteReadStatementFactory statementFactory{database};
+    SymbolQuery<QuerySqliteReadStatementFactory> symbolQuery{statementFactory};
     RefactoringEngine engine{connectionClient.serverProxy(), refactoringClient, filePathCache, symbolQuery};
 
     QtCreatorSearch qtCreatorSearch{*Core::SearchResultWindow::instance()};