diff options
Diffstat (limited to 'src/plugins/clangrefactoring')
6 files changed, 49 insertions, 13 deletions
diff --git a/src/plugins/clangrefactoring/CMakeLists.txt b/src/plugins/clangrefactoring/CMakeLists.txt new file mode 100644 index 0000000000..1e20afad9b --- /dev/null +++ b/src/plugins/clangrefactoring/CMakeLists.txt @@ -0,0 +1,40 @@ +add_qtc_plugin(ClangRefactoring + CONDITION TARGET libclang + DEPENDS ClangSupport CPlusPlus + PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager + SOURCES ${TEST_SOURCES} + baseclangquerytexteditorwidget.cpp baseclangquerytexteditorwidget.h + clangqueryexamplehighlighter.cpp clangqueryexamplehighlighter.h + clangqueryexamplehighlightmarker.h + clangqueryexampletexteditorwidget.cpp clangqueryexampletexteditorwidget.h + clangqueryhighlighter.cpp clangqueryhighlighter.h + clangqueryhighlightmarker.h + clangqueryhoverhandler.cpp clangqueryhoverhandler.h + clangqueryprojectsfindfilter.cpp clangqueryprojectsfindfilter.h clangqueryprojectsfindfilter.ui + clangqueryprojectsfindfilterwidget.cpp clangqueryprojectsfindfilterwidget.h + clangquerytexteditorwidget.cpp clangquerytexteditorwidget.h + clangrefactoringplugin.cpp clangrefactoringplugin.h + editormanagerinterface.h + locatorfilter.cpp locatorfilter.h + projectpartproviderinterface.h + projectpartutilities.cpp projectpartutilities.h + qtcreatorclangqueryfindfilter.cpp qtcreatorclangqueryfindfilter.h + qtcreatoreditormanager.cpp qtcreatoreditormanager.h + qtcreatorrefactoringprojectupdater.cpp qtcreatorrefactoringprojectupdater.h + qtcreatorsearch.cpp qtcreatorsearch.h + qtcreatorsearchhandle.cpp qtcreatorsearchhandle.h + qtcreatorsymbolsfindfilter.cpp qtcreatorsymbolsfindfilter.h + querysqlitestatementfactory.h + refactoringclient.cpp refactoringclient.h + refactoringconnectionclient.cpp refactoringconnectionclient.h + refactoringengine.cpp refactoringengine.h + refactoringprojectupdater.cpp refactoringprojectupdater.h + searchhandle.cpp searchhandle.h + searchinterface.h + sourcelocations.h + symbol.h + symbolquery.h + symbolqueryinterface.h + symbolsfindfilter.cpp symbolsfindfilter.h + symbolsfindfilterconfigwidget.cpp symbolsfindfilterconfigwidget.h +) diff --git a/src/plugins/clangrefactoring/clangrefactoring.qbs b/src/plugins/clangrefactoring/clangrefactoring.qbs index af92d01aec..ec8c4c6a24 100644 --- a/src/plugins/clangrefactoring/clangrefactoring.qbs +++ b/src/plugins/clangrefactoring/clangrefactoring.qbs @@ -17,7 +17,6 @@ QtcPlugin { Depends { name: "ProjectExplorer" } Depends { name: "TextEditor" } - cpp.defines: base.concat("CLANGPCHMANAGER_LIB") cpp.includePaths: ["."] files: [ @@ -50,6 +49,8 @@ QtcPlugin { "qtcreatorclangqueryfindfilter.h", "qtcreatoreditormanager.cpp", "qtcreatoreditormanager.h", + "qtcreatorrefactoringprojectupdater.cpp", + "qtcreatorrefactoringprojectupdater.h", "qtcreatorsearch.cpp", "qtcreatorsearch.h", "qtcreatorsearchhandle.cpp", @@ -70,11 +71,11 @@ QtcPlugin { "searchinterface.h", "sourcelocations.h", "symbol.h", + "symbolquery.h", + "symbolqueryinterface.h", "symbolsfindfilter.cpp", "symbolsfindfilter.h", "symbolsfindfilterconfigwidget.cpp", "symbolsfindfilterconfigwidget.h", - "symbolquery.h", - "symbolqueryinterface.h" ] } diff --git a/src/plugins/clangrefactoring/locatorfilter.cpp b/src/plugins/clangrefactoring/locatorfilter.cpp index 15ecbb73d2..c8fcfcaec3 100644 --- a/src/plugins/clangrefactoring/locatorfilter.cpp +++ b/src/plugins/clangrefactoring/locatorfilter.cpp @@ -31,8 +31,6 @@ namespace ClangRefactoring { - - QList<Core::LocatorFilterEntry> LocatorFilter::matchesFor( QFutureInterface<Core::LocatorFilterEntry> &, const QString &searchTerm) { diff --git a/src/plugins/clangrefactoring/refactoringconnectionclient.cpp b/src/plugins/clangrefactoring/refactoringconnectionclient.cpp index a42ed38a16..e94e8a311f 100644 --- a/src/plugins/clangrefactoring/refactoringconnectionclient.cpp +++ b/src/plugins/clangrefactoring/refactoringconnectionclient.cpp @@ -48,8 +48,9 @@ RefactoringConnectionClient::RefactoringConnectionClient(RefactoringClientInterf , m_serverProxy(client) { m_processCreator.setTemporaryDirectoryPattern("clangrefactoringbackend-XXXXXX"); - m_processCreator.setArguments( - {connectionName(), Core::ICore::cacheResourcePath() + "/symbol-experimental-v1.db"}); + m_processCreator.setArguments({connectionName(), + Core::ICore::cacheResourcePath() + "/symbol-experimental-v1.db", + Core::ICore::resourcePath()}); stdErrPrefixer().setPrefix("RefactoringConnectionClient.stderr: "); stdOutPrefixer().setPrefix("RefactoringConnectionClient.stdout: "); diff --git a/src/plugins/clangrefactoring/refactoringprojectupdater.cpp b/src/plugins/clangrefactoring/refactoringprojectupdater.cpp index 8cfd5b942a..20a9fce730 100644 --- a/src/plugins/clangrefactoring/refactoringprojectupdater.cpp +++ b/src/plugins/clangrefactoring/refactoringprojectupdater.cpp @@ -30,9 +30,7 @@ namespace ClangRefactoring { -void RefactoringProjectUpdater::precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId, - const QString &, - long long) +void RefactoringProjectUpdater::precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId) { const QString projectPartName = fetchProjectPartName(projectPartId); diff --git a/src/plugins/clangrefactoring/refactoringprojectupdater.h b/src/plugins/clangrefactoring/refactoringprojectupdater.h index a9559ef94e..0986e35cb0 100644 --- a/src/plugins/clangrefactoring/refactoringprojectupdater.h +++ b/src/plugins/clangrefactoring/refactoringprojectupdater.h @@ -47,9 +47,7 @@ public: { } - void precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId, - const QString &pchFilePath, - long long lastModified) override; + void precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId) override; void precompiledHeaderRemoved(ClangBackEnd::ProjectPartId projectPartId) override; private: |